diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2d8e06a..4529891 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2933,8 +2933,6 @@
             <intent-filter android:priority="60">
                 <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.system" />
             <meta-data android:name="com.android.settings.summary"
                        android:resource="@string/summary_empty"/>
             <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
@@ -3077,9 +3075,17 @@
             android:permission="android.permission.DUMP"
             android:enabled="@bool/config_has_help" />
 
-        <activity android:name=".applications.defaultapps.AutofillPickerActivity"
-                android:taskAffinity=""
-                android:noHistory="true">
+        <activity android:name=".applications.autofill.AutofillPickerActivity"
+                android:excludeFromRecents="true"
+                android:launchMode="singleInstance"
+                android:exported="false">
+        </activity>
+
+        <activity android:name=".applications.autofill.AutofillPickerTrampolineActivity"
+                android:theme="@android:style/Theme.NoDisplay"
+                android:excludeFromRecents="true"
+                android:launchMode="singleInstance"
+                android:label="@string/autofill_app">
             <intent-filter android:priority="1">
                 <action android:name="android.settings.REQUEST_SET_AUTOFILL_SERVICE" />
                 <category android:name="android.intent.category.DEFAULT" />
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index e9b2b0f..63b7e48 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -16,7 +16,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:importantForAutofill="noExcludeDescendants">
 
     <include layout="@layout/confirm_lock_background_base" />
 
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 8230ed2..2bfc470 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -14,12 +14,15 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:importantForAutofill="noExcludeDescendants">
 
-    <include layout="@layout/confirm_lock_password_base"
+    <include
+        layout="@layout/confirm_lock_password_base"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal" />
 </FrameLayout>
diff --git a/res/layout/confirm_lock_password_base.xml b/res/layout/confirm_lock_password_base.xml
index 22726be..6942863 100644
--- a/res/layout/confirm_lock_password_base.xml
+++ b/res/layout/confirm_lock_password_base.xml
@@ -16,7 +16,8 @@
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent"
+    android:importantForAutofill="noExcludeDescendants">
 
     <include layout="@layout/confirm_lock_background_base" />
 
diff --git a/res/layout/confirm_lock_password_internal.xml b/res/layout/confirm_lock_password_internal.xml
index 02d28b2..0652e7e 100644
--- a/res/layout/confirm_lock_password_internal.xml
+++ b/res/layout/confirm_lock_password_internal.xml
@@ -19,7 +19,8 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:icon="@drawable/ic_lock"
-    android:layout="@layout/suw_glif_blank_template">
+    android:layout="@layout/suw_glif_blank_template"
+    android:importantForAutofill="noExcludeDescendants">
 
     <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
         android:id="@+id/topLayout"
diff --git a/res/layout/enable_accessibility_service_dialog_content.xml b/res/layout/enable_accessibility_service_dialog_content.xml
index 3ca40ac..f212eb1 100644
--- a/res/layout/enable_accessibility_service_dialog_content.xml
+++ b/res/layout/enable_accessibility_service_dialog_content.xml
@@ -18,6 +18,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:textDirection="locale"
     android:scrollbarStyle="outsideOverlay"
     android:gravity="top">
 
diff --git a/res/layout/horizontal_preference.xml b/res/layout/horizontal_preference.xml
index b5871d9..9358cff 100644
--- a/res/layout/horizontal_preference.xml
+++ b/res/layout/horizontal_preference.xml
@@ -16,11 +16,12 @@
 -->
 
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:orientation="horizontal"
-    android:paddingTop="1dp"
     android:paddingStart="@dimen/preference_no_icon_padding_start"
     android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
 
diff --git a/res/layout/preference_category_material_settings.xml b/res/layout/preference_category_material_settings.xml
index de53ce2..5a1043d 100644
--- a/res/layout/preference_category_material_settings.xml
+++ b/res/layout/preference_category_material_settings.xml
@@ -43,7 +43,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="60dp"
+        android:paddingStart="56dp"
         android:orientation="vertical">
         <TextView
             android:id="@android:id/title"
diff --git a/res/layout/styled_switch_bar.xml b/res/layout/styled_switch_bar.xml
new file mode 100644
index 0000000..dd61907
--- /dev/null
+++ b/res/layout/styled_switch_bar.xml
@@ -0,0 +1,31 @@
+<?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.
+-->
+
+<!-- For use in a LayoutPreference -->
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_height="0px"
+              android:layout_width="match_parent"
+              android:layout_weight="1" >
+
+    <com.android.settings.widget.SwitchBar
+        android:id="@+id/switch_bar"
+        android:layout_height="?android:attr/actionBarSize"
+        android:layout_width="match_parent"
+        android:paddingStart="0dp"
+        android:background="@drawable/switchbar_background"
+        android:theme="?attr/switchBarTheme"
+    />
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 8024a5d..61a6476 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Geen"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Geen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 8a53d6e..8b915d6 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ontkoppel?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Dit sal jou verbinding met &lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt; beëindig."</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Jy het nie toestemming om Bluetooth-instellings te verander nie."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Naby toestelle kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sien met Bluetooth-instellings oop."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Nabye toestelle kan <xliff:g id="DEVICE_NAME">%1$s</xliff:g> sien as Bluetooth-instellings oop is."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ontkoppel <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Uitsaai"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Dekativeer profiel?"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Rekeninge"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ligging"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Rekeninge"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sekuriteit en ligging"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripsie en eiebewyse"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Foon is geënkripteer"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Foon is geënkripteer"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Sluitskermvoorkeure"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privaatheid"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Gedeaktiveer deur administrateur"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sekuriteitstatus"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Skermslot, vingerafdruk"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skermslot"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vingerafdruk"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Bestuur vingerafdrukke"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gebruik vingerafdruk vir"</string>
@@ -667,11 +666,11 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> wil Wi-Fi afskakel"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Laat dataruiling toe wanneer die tablet aan \'n ander toestel raak"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Laat data-ruilprogram toe wanneer die foon aan \'n ander toestel raak"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Laat dataruiling toe wanneer die foon aan \'n ander toestel raak"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Skakel NFC aan"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC ruil data uit tussen hierdie toestel en ander nabygeleë toestelle of teikens, soos byvoorbeeld betaalterminale, toeganglesers en interaktiewe advertensies of merkers."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Gereed om program-inhoud te stuur via NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Gereed om programinhoud te stuur via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Af"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Onbeskikbaar omdat NFC afgeskakel is"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Stel in kennis wanneer \'n publieke netwerk van hoë gehalte beskikbaar is"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Skakel Wi-Fi outomaties aan"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi sal weer aanskakel naby gestoorde netwerke van hoë gehalte, soos jou tuisnetwerk"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nie beskikbaar nie want Wi-Fi-skandering is afgeskakel"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vermy swak verbindings"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Moenie \'n Wi-Fi-netwerk gebruik tensy dit \'n goeie internetverbinding het nie"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Gebruik net netwerke wat \'n goeie internetverbinding het"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Stel Wi‑Fi op"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetmasker"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresse"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Gestoorde netwerke"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-instellings"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi se gevorderde instellngs is nie vir hierdie gebruiker beskikbaar nie"</string>
@@ -963,7 +961,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"Helderheid"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Verstel die helderheid van die skerm"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliseer helderheidsvlak vir die beskikbare lig"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimeer helderheidsvlak volgens beskikbare lig"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Af"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Voorkeurhelderheid is baie laag"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Voorkeurhelderheid is laag"</string>
@@ -1017,21 +1015,20 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Af"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Skakel sluimerskerm aan om te beheer wat gebeur wanneer die foon gedok is en/of slaap."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Wanneer om te begin"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Huidige sluimerskerm"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Begin nou"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lig op om wakker te maak"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Skerm vir inkomende kennisgewing"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Stemmingvertoning"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Maak skerm wakker wanneer jy kennisgewings ontvang"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettertipegrootte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Maak teks groter of kleiner"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM-kaart se sluitinstellings"</string>
-    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM-kaart-slot"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM-kaartslot"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Af"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Gesluit"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaart-slot"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaartslot"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Sluit SIM-kaart"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Vereis PIN om tablet te gebruik"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Benodig PIN om foon te gebruik"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Stelsel"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Verken <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Ander sluit in gedeelde lêers wat deur programme gestoor is, lêers wat van die internet of Bluetooth afgelaai is, Android-lêers en so aan. \n\nTik op Verken om die sigbare inhoud van hierdie <xliff:g id="NAME">^1</xliff:g> te sien."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Stelsel sluit lêers in wat gebruik word om die Android-weergawe <xliff:g id="VERSION">%s</xliff:g> te laat loop"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Stelsel sluit lêers in wat gebruik word om Android-weergawe <xliff:g id="VERSION">%s</xliff:g> te laat loop"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> het dalk foto\'s, musiek, programme of ander data gestoor wat <xliff:g id="SIZE">^2</xliff:g> se bergingspasie gebruik. \n\nSkakel oor na <xliff:g id="USER_1">^1</xliff:g> om besonderhede te bekyk."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Stel jou <xliff:g id="NAME">^1</xliff:g> op"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gebruik as draagbare berging"</string>
@@ -1367,7 +1364,7 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ligging vir werkprofiel"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Hoë akkuraatheid"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterybesparend"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterybesparing"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Net toestel"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ligging af"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Programvlak-toestemmings"</string>
@@ -1381,9 +1378,9 @@
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Gebruik Wi-Fi, Bluetooth of mobiele netwerke om ligging te bepaal"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Gebruik GPS om ligging te bepaal"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skandeer"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi soek tans"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-opsporing"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Verbeter ligging deur stelselprogramme en -dienste toe te laat om Wi-Fi-netwerke enige tyd te bespeur."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth soek tans"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-opsporing"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Verbeter ligging deur stelselprogramme en -dienste toe te laat om Bluetooth-toestelle enige tyd te bespeur."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi- en mobielenetwerk-ligging"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Laat programme Google se liggingsdiens gebruik om jou ligging vinniger te beraam. Anonieme liggingsdata sal ingesamel word en aan Google gestuur word."</string>
@@ -1513,7 +1510,7 @@
     </plurals>
     <string name="clear_uri_btn_text" msgid="8575655132961012158">"Maak toegang skoon"</string>
     <string name="controls_label" msgid="7611113077086853799">"Kontroles"</string>
-    <string name="force_stop" msgid="7435006169872876756">"Dwing stop"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Forseer stop"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Totaal"</string>
     <string name="application_size_label" msgid="7376689739076506885">"Programgrootte"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB-berging-program"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Winkel"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Programbesonderhede"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Program is vanaf <xliff:g id="APP_STORE">%1$s</xliff:g> geïnstalleer"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Meer inligting oor <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Programwerkinge"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Loop tans"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nooit gebruik nie)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Kortpadsleutelshelper"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Wys beskikbare kortpaaie"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Verstek"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Muis/spoorbord"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Wyserspoed"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Speletjiekontroleerder"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Gebruik vibreerder"</string>
@@ -1863,7 +1860,7 @@
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Jy moet jou patroon bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Jy moet jou PIN bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Jy moet jou wagwoord bevestig, want as <xliff:g id="SERVICE">%1$s</xliff:g> aangeskakel is, beïnvloed dit datakodering."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Neem jou handelinge waar"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Jou handelinge waarneem"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Ontvang kennisgewings wanneer jy met \'n program omgaan."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Stop <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"As jy op OK tik, sal <xliff:g id="SERVICE">%1$s</xliff:g> stop."</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Skermgebruik sedert battery volgelaai is"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skermverbruik"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skandering van mobiele netwerk"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> gelede"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Programgebruik sedert battery volgelaai is (<xliff:g id="TIME">%1$s</xliff:g> gelede)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> gelede"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Programgebruik sedert battery volgelaai is (<xliff:g id="TIME">^1</xliff:g> gelede)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hoe lank skerm aan was sedert battery volgelaai is"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Toestelgebruik sedert battery volgelaai is"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batterygebruik sedert uitgeprop"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Selgereedheid"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobiele netwerk se bystandmodus"</string>
     <string name="power_phone" msgid="5392641106474567277">"Stemoproepe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ledig"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Foon ledig"</string>
@@ -1978,7 +1975,7 @@
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Totale batterykapasiteit"</string>
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Berekende kraggebruik"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Waargenome kraggebruik"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"Dwing stop"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Forseer stop"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Programinligting"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Program-instellings"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Skerminstellings"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Batterygebruik is \'n benadering van kraggebruik en sluit nie elke bron van batterydreinering in nie. Diverse is die verskil tussen die berekende benaderde kraggebruik en die werklike waargenome dreinering van die battery."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oorberekende kragverbruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Vir %1$s gebruik"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> lank gebruik"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruik deur <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van algehele batterygebruik"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ontleding sedert battery laas volgelaai is"</string>
@@ -2029,7 +2026,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android-bedryfstelsel"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediabediener"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Programoptimering"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Batteryspaarder"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Batterybespaarder"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Skakel outomaties aan"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nooit"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"met battery <xliff:g id="PERCENT">%1$s</xliff:g> vol"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Steminvoering- en -uitvoeringsinstellings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Stemsoektog"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-sleutelbord"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Spraak"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Steminvoerinstellings"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Steminvoer"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Steminvoerdienste"</string>
@@ -2344,7 +2340,7 @@
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Stel"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Stel dataverbruik-waarskuwing"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Stel dataverbruik-limiet"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Stel dataverbruiklimiet"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Beperk datagebruik"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Jou tablet sal mobiele data afskakel wanneer dit die limiet wat jy gestel het, bereik het.\n\nOorweeg dit om \'n konserwatiewe limiet te stel omdat die datagebruik deur jou tablet gemeet word terwyl jou diensverskaffer die gebruik dalk anders bereken."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Jou foon sal mobiele data afskakel wanneer dit die limiet wat jy gestel het, bereik het.\n\nOorweeg dit om \'n konserwatiewe limiet te stel omdat die datagebruik deur jou foon gemeet word terwyl jou diensverskaffer die gebruik dalk anders bereken."</string>
@@ -2450,9 +2446,9 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Het eiebewys verwyder: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Geen gebruikereiebewyse is geïnstalleer nie"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Speltoetser"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Voer jou huidige wagwoord vir volle rugsteun hier in"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Voer jou huidige wagwoord vir volledige rugsteun hier in"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Voer \'n nuwe wagwoord vir volledige rugsteune hier in"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Voer weer jou nuwe wagwoord vir volle rugsteun hier in"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Voer weer jou nuwe wagwoord vir volledige rugsteun hier in"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Stel rugsteunwagwoord op"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Kanselleer"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Bykomende stelselopdaterings"</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Gebruik verstek"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Altyd"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Behalwe wanneer \'n ander betalingprogram oop is"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Betaal by \'n Tik en betaal-terminaal met:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Betaal by \'n Tik en Betaal-terminaal met:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Betaling by \'n terminaal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Stel \'n betalingprogram op. Hou dan bloot die agterkant van jou foon naby enige terminaal met die kontaklose simbool."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Het dit"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kennisgewingvolume"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Foonluitoon"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Verstekkennisgewing-klank"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Klank deur program verskaf"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Verstekkennisgewingklank"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Verstekwekkerklank"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreer ook vir oproepe"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Ander klanke"</string>
@@ -2753,7 +2751,7 @@
       <item quantity="one">1 outomatiese reël is aangeskakel</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Moenie steur nie\"-voorkeure"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"\'Net prioriteit\' laat toe"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"\'Net prioriteit\'-toelatings"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Outomatiese reëls"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Stel \"Moenie steur nie\"-reëls"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Beperk klanke en vibrasies op sekere tye"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hoe wil jy hê moet profielkennisgewings wys wanneer jou toestel gesluit is?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profielkennisgewings"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Kennisgewings"</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_blocked" msgid="7938180808339386300">"Moet nooit kennisgewings wys nie"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Laag: Geen klank of visuele onderbreking nie"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Medium: Geen klank nie"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Hoog: Maak geluid"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Dringend: Maak geluid en spring op skerm op"</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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Kennisgewingassistent"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokkeer tans hierdie program se kennisgewings om op hierdie toestel te verskyn"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokkeer tans hierdie kategorie kennisgewings om op hierdie toestel te verskyn"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorieë"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Ander"</string>
     <string name="no_channels" msgid="3077375508177744586">"Hierdie program het nie enige kennisgewings geplaas nie"</string>
@@ -2940,9 +2941,9 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Verander tot <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> na net wekkers"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Verander na onderbreek altyd"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokkeer wanneer skerm aan is"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie steur nie, op die skerm opspring of verskyn"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie Steur Nie, op die skerm opspring of verskyn"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokkeer wanneer skerm af is"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie steur nie, die skerm laat aanskakel of die kennisgewinglig laat flikker"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Verhoed dat kennisgewings wat stilgemaak is deur Moenie Steur Nie, die skerm laat aanskakel of die kennisgewinglig laat flikker"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Verhoed kennisgewings wat deur \'Moenie steur nie\' stilgemaak is om op die skerm te verskyn"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Af"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Wanneer skerm aan is"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Bly in huidige oriëntasie"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Begin veilig"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Gaan voort"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Jy kan hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan eers oproepe, boodskappe en kennisgewings, insluitend wekkers, ontvang nadat dit begin het. \n\nDit help om data op verlore of gesteelde toestelle te beskerm."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Jy kan hierdie toestel verder beskerm deur jou patroon te vereis voordat dit begin. Die toestel kan eers oproepe, boodskappe en kennisgewings, insluitend wekkers, ontvang nadat dit begin het. \n\nDit help om data op verlore of gesteelde toestelle te beskerm."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Jy kan hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan eers oproepe, boodskappe en kennisgewings, insluitend wekkers, ontvang nadat dit begin het. \n\nDit help om data op verlore of gesteelde toestelle te beskerm."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Bykomend tot die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou PIN te vereis voor dit begin. Totdat die toestel begin, kan dit nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Bykomend tot die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou patroon te vereis voor dit begin. Totdat die toestel begin, kan dit nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Bykomend tot die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou wagwoord te vereis voor dit begin. Totdat die toestel begin, kan dit nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang nie.\n\nDit help om data op verlore of gesteelde toestelle te beskerm."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Vereis PIN om toestel te begin"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Vereis patroon om toestel te begin"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Vereis wagwoord om toestel te begin"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nee, dankie"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nee, dankie"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nee, dankie"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Jy kan hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n PIN om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Jy kan hierdie toestel verder beskerm deur jou patroon te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n patroon om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Jy kan hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n wagwoord om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Benewens die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou PIN te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n PIN om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Benewens die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou patroon te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n patroon om jou toestel te begin?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Benewens die gebruik van jou vingerafdruk om jou toestel te ontsluit, kan jy hierdie toestel verder beskerm deur jou wagwoord te vereis voordat dit begin. Die toestel kan nie oproepe, boodskappe of kennisgewings, insluitend wekkers, ontvang voordat dit begin nie. \n\nDit help om data op verlore of gesteelde toestelle te beskerm. Vereis \'n wagwoord om jou toestel te begin&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nee"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vereis PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vereis patroon?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vereis wagwoord?"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Programme met toestemming"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Nee"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Installeer onbekende programme"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Installeer onbekende apps"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installeer programme uit onbekende bronne"</string>
     <string name="write_settings" msgid="4797457275727195681">"Verander stelselinstellings"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"skryf wysig stelselinstellings"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Hierdie toestemming laat \'n program toe om stelselinstellings te verander."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ja"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nee"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Laat programinstallerings toe"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Toegelaat"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nie toegelaat nie"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Laat van hierdie bron af toe"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dubbeldraai vir kamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Maak die kameraprogram oop deur jou pols twee keer vinnig te draai"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Druk aan/af-skakelaar 2 keer vir kamera"</string>
@@ -3289,7 +3286,7 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Herselflaai toestel om telefonie-monitorverandering toe te pas"</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">"Mobieldatagebruik"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Mobieledatagebruik"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi-datagebruik"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet-datagebruik"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3300,8 +3297,8 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g>-datawaarskuwing"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g>-datawaarskuwing / <xliff:g id="ID_2">%2$s</xliff:g>-datalimiet"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringsiklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Maandelikse siklus begin op die <xliff:g id="ID_1">%1$s</xliff:g> van elke maand"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Maandeliks vanaf <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"Maandelikse siklus begin op die <xliff:g id="ID_1">%1$s</xliff:g>e van elke maand"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Maandeliks vanaf <xliff:g id="ID_1">%1$s</xliff:g>e"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Netwerkbeperkinge"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> beperkings</item>
@@ -3321,7 +3318,7 @@
       <item quantity="one">1 program word toegelaat om onbeperkte data te gebruik wanneer Databespaarder aan is</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Databespaarder"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Onbeperkte toegang tot data"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Onbeperkte datatoegang"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Agtergronddata is afgeskakel"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Aan"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Af"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Gekoppel aan"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kitsinstellings-ontwikkelaarteëls"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Ons is hier om te help"</string>
@@ -3462,7 +3460,7 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubbeltik om na tablet te kyk"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dubbeltik om na toestel te kyk"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Dubbeltik op jou skerm om jou kennisgewings vinnig na te gaan."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tel op om na foon te kyk"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tel foon op om te kyk"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tel op om na tablet te kyk"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Tel op om na toestel te kyk"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Tel jou foon op om jou kennisgewings vinnig na te gaan."</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(gedeaktiveer vir gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Outovuldiens"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"outomaties, invul, outovul"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Maak <xliff:g id="APP_NAME_0">%1$s</xliff:g> jou outovulprogram? <xliff:g id="APP_NAME_1">%1$s</xliff:g> sal jou skerm kan lees en velde in ander programme kan invul."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Maak seker dat jy hierdie program vertrou&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Outovul&gt;%1$s&lt;/xliff:g&gt; gebruik wat op jou skerm is om te bepaal wat outomaties ingevul kan word."</string>
     <string name="device_theme" msgid="4571803018917608588">"Toesteltema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Verstek"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Bergingbestuurder: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index f727197..2e991b8 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ምንም የለም"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"ሲም"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"የለም"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 84e2aaf..652ebd5 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"መለያዎች"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"አካባቢ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"መለያዎች"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"ደህንነት እና አካባቢ"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ምስጠራ እና ምስክርነቶች"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ስልክ ተመስጥሯል"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ስልክ ተመስጥሯል"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"የማያ ገጽ ቁልፍ ምርጫዎች"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"የእኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ግላዊነት"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"በአስተዳዳሪ ተሰናክሏል"</string>
     <string name="security_status_title" msgid="5848766673665944640">"የደህንነት ሁኔታ"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"የጣት አሻራዎችን ያስተዳድሩ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"የጣት አሻራን ይጠቀሙ ለ"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"የWi‑Fi ቅኝት ስለጠፋ አይገኝም"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"የ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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"የንዑስ አውታር ጭንብል"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"ዲኤንኤስ"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"የIPv6 አድራሻዎች"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"የተቀመጡ አውታረ መረቦች"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ቅንብሮች"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"የላቁ የWi‑Fi ቅንብሮች ለዚህ ተጠቃሚ አይገኙም"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ጠፍቷል"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ስልኩ ሲተከል እና/ወይም ሲተኛ ምን እንደሚከሰት ለመቆጣጠር የገጽ ማያ ማቆያን ያብሩ።"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"መቼ እንደሚጀመር"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"የአሁኑ ማያ ገጽ ማሳረፊያ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"አሁን ጀምር"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ቅንብሮች"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ለማንቃት ያንሱ"</string>
-    <string name="doze_title" msgid="5389406335828323273">"የገቢ ማሳወቂያ ማያ ገጽ"</string>
+    <string name="doze_title" msgid="2259176504273878294">"ከባቢያዊ ማሳያ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ማሳወቂያዎችን ሲቀበሉ ማያ ገጽን አንቃ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"የቁምፊ መጠን"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ጽሑፍ ያተልቁ ወይም ያሳንሱ"</string>
@@ -1615,6 +1612,7 @@
     <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="instant_app_details_summary" msgid="4529934403276907045">"በ<xliff:g id="APP_STORE">%1$s</xliff:g> ላይ ተጨማሪ መረጃ"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"መተግበሪያ ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"ሩጫ"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(በጭራሽ ስራ ላይ ያልዋለ)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"የቁልፍ ሰሌዳ ኣቋራጮች አጋዥ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"የሚገኙ አቋራጮችን አሳይ"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ነባሪ"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"መዳፊት/ትራክፓድ"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"የጠቋሚ ፍጥነት"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"የጨዋታ መቆጣጠሪያ"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"ነዛሪ ተጠቀም"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ኃይሉ ሙሉ ከነበረበት ጊዜ ጀምሮ ያለው የማያ ገጽ አጠቃቀም"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"የማያ ገጽ ፍጆታ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"የተንቀሳቃሽ ስልክ አውታረ መረብ ቅኝት"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"ከ<xliff:g id="TIME">%1$s</xliff:g> በፊት"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"ከሙሉ ኃይል ጊዜ ጀምሮ ያለው የመተግበሪያ አጠቃቀም (ከ<xliff:g id="TIME">%1$s</xliff:g> በፊት)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"ከ<xliff:g id="TIME">^1</xliff:g> በፊት"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"ከሙሉ ኃይል ጊዜ ጀምሮ ያለው የመተግበሪያ አጠቃቀም (ከ<xliff:g id="TIME">^1</xliff:g> በፊት)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ማያ ገጹ በርቶ የቆየበት ጊዜ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ሙሉ ኃይል ከነበረበት ጊዜ ጀምሮ ያለው የመሣሪያ አጠቃቀም"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ከተነቀለ ጀምሮ የባትሪ ጥቅም"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"ካሜራ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ብሉቱዝ"</string>
-    <string name="power_cell" msgid="6596471490976003056">"ስልክ ሲጠባበቅ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"የተንቀሳቃሽ ስልክ አውታረ መረብ በመጠባበቅ ላይ"</string>
     <string name="power_phone" msgid="5392641106474567277">"የድምፅ ጥሪዎች"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ስራ ፈትጡባዊ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ስልክ ሥራ የፈታበት"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"የባትሪ አጠቃቀም ማለት ተቀራራቢ ጥቅም ላይ የዋለ የሃይል መጠን ሲሆን ሁሉንም ባትሪ ሃይል የሚፈጁ መንስኤዎች አያካትትም። የተውጣጣ ማለት በተሰላው ተቀራራቢ የሃይል አጠቃቀምና በአጠቃላይ ባለቀው የባትሪ መጠን መካከል ያለው ልዩነት ነው።"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ከመጠን በላይ የተቆጠረ የሃይል አጠቃቀም"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"ለ%1$s ጥቅም ላይ የሚውል"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"ለ<xliff:g id="TIME">^1</xliff:g> ጥቅም ላይ ውሏል"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"የድምፅ ግቤት &amp; ውፅአት ቅንብሮች"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"የድምፅ ፍለጋ"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"የAndroid ቁልፍ ሰሌዳ"</string>
-    <string name="voice_category" msgid="1430370497125803904">"ንግግር"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"የድምጽ ግቤት ቅንብሮች"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"የድምፅ ግቤት"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"የድምጽ ግቤት አገልግሎቶች"</string>
@@ -2450,9 +2446,9 @@
     <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="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ሙሉ የይለፍቃል ምትኬህን እዚህ ዳግም ተይብ።"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"ሙሉ የይለፍቃል መጠባበቂያዎን እዚህ ያስገቡ።"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"ለሙሉ መጠባበቂያ አዲስ የይለፍ ቃል እዚህ ያስገቡ"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ሙሉ የይለፍቃል ምትኬዎን እዚህ ዳግም ይተይቡ።"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"የመጠባበቂያ ይለፍቃል አዘጋጅ"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ይቅር"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ተጨማሪ የስርዓት አዘምኖች"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"የማሳወቂያ ድምጽ መጠን"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ነባሪ የማሳወቂያ ድምጽ"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"በመተግበሪያ የቀረበ ድምጽ"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"ነባሪ የማሳወቂያ ድምጽ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ነባሪ የማንቂያ ድምጽ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"እንዲሁም ለጥሪዎችም ንዘር"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ሌሎች ድምጾች"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"ማሳወቂያዎችን በጭራሽ አታሳይ"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"ዝቅተኛ፦ ምንም የድምፅ ወይም ምስላዊ ማቋረጥ የለም"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"መካከለኛ፦ ምንም ድምፅ የለም"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ከፍተኛ፦ ድምፅ ፍጠር"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"አስቸኳይ፦ ድምፅ ፍጠር እና በማያ ገጽ ላይ ብቅ አድርግ"</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="6585849855452076626">"ድምፅ ይፍቀዱ"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ድምፅ አታሰማ፣ አትንዘር ወይም እነዚህን ማሳወቂያዎች ወደ የአሁኑ ማያ ገጽ አታሳይ።"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"የማሳወቂያ ረዳት"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"የአትረብሽ መዳረሻ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ምንም የተጫኑ መተግበሪያዎች የተጠየቀው አትረብሽ መዳረሻ የላቸውም"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android የዚህ መተግበሪያ ማሳወቂያዎች በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android የዚህ መተግበሪያ ምድብ በዚህ መሣሪያ ላይ እንዳይታይ እያገደ ነው"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ምድቦች"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ሌላ"</string>
     <string name="no_channels" msgid="3077375508177744586">"ይህ መተግበሪያ ምንም ማሳወቂያዎችን አልለጠፈም"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"በአሁኑ አቀማመጠ-ገጽ ላይ ቆይ"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ደህንነቱ የተጠበቀ አጀማመር"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ቀጥል"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"ይህን መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ይበልጥ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ፣ ማንቂያዎችን ጨምሮ ጥሪዎችን፣ መልዕክቶችን ወይም ማሳወቂያዎችን መቀበል አይችልም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል።"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"ይህን መሣሪያ ከመጀመሩ በፊት የእርስዎን ስርዓተ-ጥለት እንዲጠይቅ በማድረግ ይበልጥ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ፣ ማንቂያዎችን ጨምሮ ጥሪዎችን፣ መልዕክቶችን ወይም ማሳወቂያዎችን መቀበል አይችልም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል።"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"ይህን መሣሪያ ከመጀመሩ በፊት የእርስዎን የይለፍ ቃል እንዲጠይቅ በማድረግ ይበልጥ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ፣ ማንቂያዎችን ጨምሮ ጥሪዎችን፣ መልዕክቶችን ወይም ማሳወቂያዎችን መቀበል አይችልም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል።"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ማንቂያዎችን ጨምሮ ጥሪዎችን፣ መልዕክቶችን ወይም ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል።"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ስርዓተ ጥለት እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ማንቂያዎችን ጨምሮ ጥሪዎችን፣ መልዕክቶችን ወይም ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል።"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ማንቂያዎችን ጨምሮ ጥሪዎችን፣ መልዕክቶችን ወይም ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል።"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"መሣሪያ ለመጀመር ፒን ጠይቅ"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"መሣሪያ ለመጀመር ስርዓተ-ጥለት ጠይቅ"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"መሣሪያ ለመጀመር የይለፍ ቃል ጠይቅ"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"አይ፣ አመሰግናለሁ"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"አይ፣ አመሰግናለሁ"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"አይ፣ አመሰግናለሁ"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ተጨማሪ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ፒን ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ስርዓተ-ጥለት እንዲጠይቅ በማድረግ ተጨማሪ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ስርዓተ-ጥለት ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን የይለፍ ቃል እንዲጠይቅ በማድረግ ተጨማሪ ጥበቃ ሊያደርጉለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችሉም። \n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር የይለፍ ቃል ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ፒን እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ፒን ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ስርዓተ-ጥለት እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር ስርዓተ-ጥለት ይጠየቅ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"መሣሪያዎን ለማስከፈት የጣት አሻራዎን ከመጠቀም ባሻገር ይህ መሣሪያ ከመጀመሩ በፊት የእርስዎን ይለፍ ቃል እንዲጠይቅ በማድረግ ደህንነቱን ይበልጥ ሊያስጠብቁለት ይችላሉ። መሣሪያው እስከሚጀምር ድረስ ጥሪዎችን፣ መልእክቶችን ወይም ማንቂያዎችን ጨምሮ ማሳወቂያዎችን መቀበል አይችልም።\n\nይህ በጠፉ ወይም በተሰረቁ መሣሪያዎች ላይ ላለ ውሂብ ጥበቃ ለማድረግ ያግዛል። መሣሪያዎን ለማስጀመር የይለፍ ቃል ይጠየቅ&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"አዎ"</string>
+    <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>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"አዎ"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"የለም"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"የመተግበሪያ መጫን ፍቀዶ"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"ይፈቀዳል"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"አይፈቀድም"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ለካሜራ የኃይል አዝራሩን ሁለቴ ይጫኑ"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"ከዚህ ጋር ተገናኝቷል"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"የፈጣን ቅንብሮች ገንቢ ሰድሮች"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"እርስዎን ለመርዳት እዚህ እንገኛለን"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ለተጠቃሚ <xliff:g id="USER">%s</xliff:g> ተሰናክሏል)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"የራስ-ሙላ አገልግሎት"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ራስ-ሰር፣ ሙላ፣ ራስ-ሙላ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> የራስዎ የራስ-ሙላ መተግበሪያ ይሁን? <xliff:g id="APP_NAME_1">%1$s</xliff:g> የእርስዎን ማያ ገጽ ማንበብና በሌሎች መተግበሪያዎች ውስጥ ያሉ መስኮችን መሙላት ይችላል።"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ይህን መተግበሪያ የሚያምኑት መሆንዎን ያረጋግጡ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ራስ-ሙላ&gt;%1$s&lt;/xliff:g&gt; ምን በራስ መሞላት እንደሚችል ለማወቅ በማያ ገጽዎ ላይ ያለውን ነገር ይጠቀማል።"</string>
     <string name="device_theme" msgid="4571803018917608588">"የመሣሪያ ገጽታ"</string>
     <string name="default_theme" msgid="7085644992078579076">"ነባሪ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"የማከማቻ አስተዳዳሪ፦ <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 4e21147..61ee07c 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="8166647333858618801">"صغير"</item>
     <item msgid="6986443533756848935">"الإعداد الافتراضي"</item>
     <item msgid="38373998008112077">"كبير"</item>
-    <item msgid="7635254317531872272">"أكبر مستوى"</item>
+    <item msgid="7635254317531872272">"الأكبر"</item>
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"بدون"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"‏شريحة SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'‎"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"لا شيء"</item>
     <item msgid="6189918678874123056">"بروتوكول مصادقة كلمات المرور"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 962193a..d071f42 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -239,7 +239,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"‏جارٍ فحص بطاقة SD للوسائط..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"‏وحدة تخزين USB التي تم تحميلها للقراءة فقط."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"‏بطاقة SD تم تحميلها للقراءة فقط."</string>
-    <string name="skip_label" msgid="47510779345218297">"تخطٍ"</string>
+    <string name="skip_label" msgid="47510779345218297">"تخطي"</string>
     <string name="next_label" msgid="4693520878012668114">"التالي"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"اللغات"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"تفضيلات اللغة"</string>
@@ -328,7 +328,7 @@
     <string name="owner_info_settings_title" msgid="5530285568897386122">"رسالة شاشة التأمين"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"تمكين الأدوات"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"تم تعطيل الإعداد بواسطة المشرف"</string>
-    <string name="owner_info_settings_summary" msgid="7472393443779227052">"لا أحد"</string>
+    <string name="owner_info_settings_summary" msgid="7472393443779227052">"بدون"</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">"‏جهاز Android الخاص بهاني مثلاً"</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"معلومات المستخدم"</string>
@@ -337,20 +337,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"الحسابات"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"الموقع"</string>
     <string name="account_settings_title" msgid="626177544686329806">"الحسابات"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"الأمان والموقع"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"التشفير وبيانات الاعتماد"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"تم تشفير الهاتف"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"تم تشفير الهاتف"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"تفضيلات شاشة القفل"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"‏تعيين موقعي، إلغاء تأمين الشاشة، تأمين شريحة SIM، تأمين تخزين الاعتماد"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"الخصوصية"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"تم تعطيل الإعداد بواسطة المشرف"</string>
     <string name="security_status_title" msgid="5848766673665944640">"حالة الأمان"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"إدارة بصمات الإصبع"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"استخدام بصمة الإصبع في"</string>
@@ -372,15 +371,15 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"كل ما عليك فعله هو لمس مستشعر بصمات الإصبع لإلغاء قفل هاتفك أو للسماح بإجراء عمليات الشراء أو لتسجيل الدخول إلى التطبيقات. وعليك توخي الحذر عند إضافة بصمة الإصبع لأشخاص آخرين؛ فأي بصمة من هذه البصمات يمكن أن تؤدي إلى تنفيذ أي إجراء من الإجراءات السابق ذكرها.\n\nملاحظة: يمكن أن تكون بصمة إصبعك أقل أمانًا من استخدام نقش أو رقم تعريف شخصي قوي."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"إلغاء"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"متابعة"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"تخطٍ"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"تخطي"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"إضافة بصمة إصبع"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز اللوحي في حال فقده أو سرقته أو محو بياناته."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز في حال فقده أو سرقته أو محو بياناته."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بإمكانك منع الآخرين من استخدام هذا الجهاز في حال فقدانه أو سرقته أو محو البيانات عنه."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الهاتف في حال فقده أو سرقته أو محو بياناته."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز اللوحي في حال فقده أو سرقته."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بإمكانك منع الآخرين من استخدام هذا الجهاز اللوحي في حال فقدانه أو سرقته."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الجهاز في حال فقده أو سرقته."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"لن يتم تنشيط ميزات حماية الجهاز، ولن يكون بمقدورك منع الآخرين من استخدام هذا الهاتف في حال فقده أو سرقته."</string>
-    <string name="skip_anyway_button_label" msgid="2323522873558834513">"تخطٍ على أية حال"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"التخطي على أي حال"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"رجوع"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"العثور على المستشعر"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"ضع مستشعر بصمات الإصبع على الجزء الخلفي لهاتفك."</string>
@@ -470,7 +469,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"تغيير تأمين الشاشة"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"‏تغيير أو تعطيل النقش أو رمز PIN أو أمان كلمة المرور"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"اختيار طريقة لتأمين الشاشة"</string>
-    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"لا شيء"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"بدون"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"التمرير السريع"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"بدون تأمين"</string>
@@ -488,7 +487,7 @@
     <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>
-    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"لا شيء"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"بدون"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"مرر سريعًا"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"نقش"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"‏رمز PIN"</string>
@@ -616,16 +615,16 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> تطبيق نشط</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> تطبيق نشط</item>
     </plurals>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"الوكلاء المعتمدون"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"خدمات منح الثقة"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"للاستخدام، عليك تعيين قفل الشاشة أولاً"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"ليس هناك أي وكلاء معتمدين"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
-      <item quantity="zero"><xliff:g id="COUNT">%d</xliff:g> وكيل معتمد نشط</item>
-      <item quantity="two">وكيلان (<xliff:g id="COUNT">%d</xliff:g>) معتمدان نشطان</item>
-      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> وكلاء معتمدين نشطين</item>
-      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> وكيلاً معتمدًا نشطًا</item>
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> وكيل معتمد نشط</item>
-      <item quantity="one">وكيل واحد معتمد نشط</item>
+      <item quantity="zero"><xliff:g id="COUNT">%d</xliff:g> خدمة ناشطة لمنح الثقة</item>
+      <item quantity="two">خدمتان (<xliff:g id="COUNT">%d</xliff:g>) ناشتطان لمنح الثقة</item>
+      <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> خدمات ناشطة لمنح الثقة</item>
+      <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> خدمة ناشطة لمنح الثقة</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> خدمة ناشطة لمنح الثقة</item>
+      <item quantity="one">خدمة واحدة ناشطة لمنح الثقة</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"بلوتوث"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"تشغيل البلوتوث"</string>
@@ -736,6 +735,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏غير متاح لأنه تم إيقاف فحص شبكات Wi‑Fi"</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>
@@ -861,11 +861,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"‏تهيئة 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"قناع الشبكة الفرعية"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"نظام أسماء النطاقات"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏عناوين IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"الشبكات المحفوظة"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"‏إعدادات IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"‏إعدادات Wi‑Fi المتقدمة ليست متاحة لهذا المستخدم."</string>
@@ -1063,15 +1061,14 @@
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"أثناء الإرساء"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"أبدًا"</string>
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"إيقاف"</string>
-    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"للتحكم في ما يحدث عند إرساء الهاتف و/أو السكون، يمكنك تشغيل شاشة التوقف."</string>
-    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"عند البدء"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"للتحكم في ما يحدث عند إرساء الهاتف و/أو دخوله حالة السكون، عليك تشغيل شاشة التوقف."</string>
+    <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"وقت البدء"</string>
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"شاشة التوقف الحالية"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"البدء الآن"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"إعدادات"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"الرفع لتنبيه الجهاز"</string>
-    <string name="doze_title" msgid="5389406335828323273">"شاشة الإشعارات الواردة"</string>
+    <string name="doze_title" msgid="2259176504273878294">"عرض المحيط"</string>
     <string name="doze_summary" msgid="3846219936142814032">"تنشيط الشاشة عند تلقي إشعارات"</string>
     <string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"يمكنك تكبير النص أو تصغيره."</string>
@@ -1256,7 +1253,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"النظام"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"استكشاف <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="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_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_wizard_init_title" msgid="5085400514028585772">"إعداد <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"الاستخدام كوحدة تخزين محمولة"</string>
@@ -1290,7 +1287,7 @@
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"تبدو <xliff:g id="NAME_0">^1</xliff:g> بطيئًة، \n\nيمكنك المتابعة إلا أنه قد تتعثر التطبيقات التي تم نقلها إلى هذا الموقع وربما تستغرق عمليات نقل البيانات وقتًا طويلاً. \n\nيمكنك استخدام <xliff:g id="NAME_1">^1</xliff:g> أسرع للحصول على أداء أفضل."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"حالة البطارية"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"مستوى البطارية"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"‏أسماء نقاط الوصول (APN)"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"أسماء نقاط الوصول"</string>
     <string name="apn_edit" msgid="1354715499708424718">"تعديل نقطة الدخول"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"لم يتم التعيين"</string>
     <string name="apn_name" msgid="4115580098369824123">"الاسم"</string>
@@ -1332,14 +1329,14 @@
     <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_network_title" msgid="4557113742173895074">"إعادة تعيين إعدادات الشبكة"</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>
     <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="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>
@@ -1371,7 +1368,7 @@
     <string name="master_clear_progress_title" msgid="5194793778701994634">"جارٍ محو البيانات"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"يرجى الانتظار..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"اعدادات المكالمات"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"إعداد البريد الصوتي، اعادة توجيه المكالمة، انتظار المكالمة، معرف المتصل"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"إعداد البريد الصوتي، إعادة توجيه المكالمة، انتظار المكالمة، معرّف المتصل"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏ربط USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"نقطة اتصال محمولة"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ربط البلوتوث"</string>
@@ -1675,6 +1672,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(لم يسبق الاستخدام مطلقًا)"</string>
@@ -1720,8 +1718,8 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"الخدمة <xliff:g id="COMP_NAME">%1$s</xliff:g> قيد الاستخدام."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"الموفر <xliff:g id="COMP_NAME">%1$s</xliff:g> قيد الاستخدام."</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"هل تريد إيقاف خدمة النظام؟"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"في حالة إيقاف هذه الخدمة، ربما تتوقف بعض ميزات الجهاز اللوحي عن العمل بشكل صحيح حتى توقف تشغيلها، ثم تشغلها مرة أخرى."</string>
-    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"في حالة إيقاف هذه الخدمة، ربما تتوقف بعض ميزات الهاتف عن العمل بشكل صحيح حتى توقف تشغيلها، ثم تشغلها مرة أخرى."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"في حالة إيقاف هذه الخدمة، قد تتوقف بعض ميزات الجهاز اللوحي عن العمل بشكل صحيح حتى توقف تشغيلها، ثم تشغلها مرة أخرى."</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"في حالة إيقاف هذه الخدمة، قد تتوقف بعض ميزات الهاتف عن العمل بشكل صحيح حتى توقف تشغيلها، ثم تشغلها مرة أخرى."</string>
     <string name="language_settings" msgid="8758655933029560944">"اللغات والإدخال"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"اللغات والإدخال"</string>
     <string name="input_assistance" msgid="7577795275222555487">"المساعدة في الإدخال"</string>
@@ -1751,7 +1749,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"مساعد اختصارات لوحة المفاتيح"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"عرض الاختصارات المتاحة"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"افتراضي"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"الماوس/لوحة اللمس"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"سرعة المؤشر"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"وحدة التحكم في الألعاب"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"استخدام الاهتزاز"</string>
@@ -1828,7 +1825,7 @@
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"الخدمات التي تم تنزيلها"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"إعدادات تجريبية"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"إن تطبيق قارئ الشاشة مُصمَّم في الأساس من أجل الأشخاص المصابين بالعمى وضعف البصر."</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"إن تطبيق قارئ الشاشة مُصمَّم في الأساس من أجل الأشخاص الكفيفين والذين يعانون من ضعف في النظر."</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"يمكنك النقر على بيانات على شاشتك لتتم قراءتها بصوت عالٍ"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"التسميات التوضيحية"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"التكبير"</string>
@@ -1943,7 +1940,7 @@
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد النقش."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد رقم التعريف الشخصي."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"نظرًا لأن تشغيل <xliff:g id="SERVICE">%1$s</xliff:g> يؤثر في تشفير البيانات، يجب تأكيد كلمة المرور."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"ملاحظة الإجراءات"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"ملاحظة أفعالك"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"تلقي إشعارات عند التفاعل مع تطبيق."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"هل تريد إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"يؤدي النقر على \"موافق\" إلى إيقاف <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
@@ -1999,15 +1996,15 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"استخدام الشاشة منذ الشحن الكامل"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"استهلاك الشاشة"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"البحث عن شبكات الجوال"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"قبل <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"استخدام التطبيق منذ الشحن الكامل (قبل <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"قبل <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"استخدام التطبيق منذ الشحن الكامل (قبل <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"مقدار وقت تشغيل الشاشة منذ الشحن الكامل"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"استخدام الجهاز منذ الشحن الكامل"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استخدام البطارية عند فصل الطاقة"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"استخدام البطارية منذ إعادة التعيين"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> على البطارية"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> منذ عدم التوصيل"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"شحن"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"جاري الشحن"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"الشاشة قيد التشغيل"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"‏GPS (نظام تحديد المواقع العالمي) على"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"تشغيل الكاميرا"</string>
@@ -2031,7 +2028,7 @@
     <string name="power_camera" msgid="4976286950934622605">"الكاميرا"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"بلوتوث"</string>
-    <string name="power_cell" msgid="6596471490976003056">"استعداد الخلية"</string>
+    <string name="power_cell" msgid="3392999761958982492">"وضع الاستعداد لشبكة الجوّال"</string>
     <string name="power_phone" msgid="5392641106474567277">"المكالمات الصوتية"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"الجهاز اللوحي خامل"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"الهاتف خامل"</string>
@@ -2091,10 +2088,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"يُعد استخدام طاقة البطارية قيمة تقريبية لاستخدام الطاقة لا تشمل جميع مصادر استهلاك طاقة البطارية. كما يُعرف الاستخدام المتنوّع للطاقة بأنه الفارق بين الحساب التقريبي لاستخدام الطاقة والاستهلاك الفعلي المرصود في البطارية."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"استخدام زائد عن الحد للطاقة"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> مللي أمبير في الساعة"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"‏مستخدمة لمدة %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"تم استخدامه لمدة <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_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_detail_foreground" msgid="3350401514602032183">"أثناء الاستخدام النشط"</string>
@@ -2163,7 +2160,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"إعدادات الإدخال الصوتي والاستماع"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"البحث الصوتي"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"‏لوحة مفاتيح Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"الكلام"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"إعدادات الإدخال الصوتي"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"الإدخال الصوتي"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"خدمات الإدخال الصوتي"</string>
@@ -2280,7 +2276,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"غير متصل"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"إضافة شبكة"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"تحديث القائمة"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"تخطٍ"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"تخطي"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"التالي"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"رجوع"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"تفاصيل الشبكة"</string>
@@ -2657,7 +2653,7 @@
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"في أحد الأجهزة الطرفية للتوصيل والدفع، يمكنك الدفع باستخدام:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"الدفع في محطة"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"يمكنك إعداد تطبيق للدفع، وبعد ذلك لن يلزمك سوى توصيل الجزء الخلفي من الهاتف بأي جهاز طرفي يحتوي على رمز عدم التلامس."</string>
-    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"أعي ذلك"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"حسنًا"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"المزيد..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"هل تريد تعيينه كتفضيل؟"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"هل تريد استخدام <xliff:g id="APP">%1$s</xliff:g> دائمًا عند التوصيل والدفع؟"</string>
@@ -2825,7 +2821,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏علامة NFC ليست قابلة للكتابة. الرجاء استخدام علامة مختلفة."</string>
     <string name="default_sound" msgid="8821684447333687810">"الصوت الافتراضي"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"مستوى صوت الرنين على <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"مستوى الصوت، الاهتزام، الرجاء عدم الإزعاج"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"مستوى الصوت، الاهتزاز، \"عدم الإزعاج\""</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"تم تعيين الرنين على اهتزاز"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"تم تعيين الرنين على صامت"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"مستوى صوت الرنين على ۸۰٪"</string>
@@ -2835,6 +2831,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"مستوى صوت الإشعارات"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"صوت الإشعار الافتراضي"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"صوت صادر عن تطبيق"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"صوت الإشعار الافتراضي"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"صوت التنبيه الافتراضي"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"الاهتزاز أيضًا مع المكالمات"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"أصوات أخرى"</string>
@@ -2887,19 +2885,20 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"الإشعارات"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"متقدمة"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"إشعارات العمل"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"وميض"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"وميض الضوء"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"على شاشة التأمين"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"عرض كل محتوى الإشعارات"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"إخفاء المحتوى المهم للإشعارات"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"إخفاء المحتوى المهم في الإشعارات"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"عدم عرض إشعارات على الإطلاق"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"ما الطريقة التي تريد عرض الإشعارات بها عندما يكون الجهاز مقفولاً؟"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"الإشعارات"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"عرض كل محتوى إشعارات العمل"</string>
-    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"إخفاء المحتوى المهم لإشعارات العمل"</string>
+    <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"إخفاء المحتوى المهم في إشعارات العمل"</string>
     <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="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_blocked" msgid="7938180808339386300">"عدم عرض الإشعارات"</string>
@@ -2907,10 +2906,10 @@
     <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_min_summary" msgid="8233873580287975662">"منخفض: بدون تنبيه صوتي أو مرئي"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"متوسط: بدون تنبيه صوتي"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"مرتفع: إصدار تنبيه صوتي"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"عاجل: إصدار تنبيه صوتي والظهور بسرعة على الشاشة"</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="6585849855452076626">"السماح بالصوت"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"لا يُسمح بإصدار تنبيه صوتي أو بالاهتزاز أو بعرض هذه الإشعارات بسرعة على الشاشة الحالية."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"مساعد الإشعار"</string>
@@ -2948,6 +2947,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"الوصول إلى إعداد \"عدم الإزعاج\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"لم تطلّب أي تطبيقات مثبّتة حق الوصول إلى إعداد \"عدم الإزعاج\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"‏يحول Android دون ظهور إشعارات هذا التطبيق على هذا الجهاز"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"‏يحول Android دون ظهور فئة الإشعارات هذه على هذا الجهاز"</string>
     <string name="notification_channels" msgid="5346841743182627500">"الفئات"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"غير ذلك"</string>
     <string name="no_channels" msgid="3077375508177744586">"لم ينشر هذا التطبيق أي إشعارات"</string>
@@ -2986,7 +2987,7 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"حساس"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"تم"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"الأهمية"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"وميض"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"وميض الضوء"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"اهتزاز"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"صوت"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"حذف"</string>
@@ -3033,7 +3034,7 @@
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"من أي شخص"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"من جهات الاتصال فقط"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"من جهات الاتصال المميزة بنجمة فقط"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"لا أحد"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"بدون"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"التنبيهات"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"التذكيرات"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"الأحداث"</string>
@@ -3082,11 +3083,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"تشغيل"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"إيقاف"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"تثبيت الشاشة"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"عند تشغيل هذا الإعداد، يمكنك استخدام تثبيت الشاشة للإبقاء على عرض الشاشة الحالية إلى أن يتم إلغاء التثبيت.\n\nلاستخدام تثبيت الشاشة:\n\n1- تأكد من تشغيل تثبيت الشاشة.\n\n2- افتح الشاشة المراد تثبيتها.\n\n3- انقر على \"نظرة عامة\".\n\n4- مرر سريعًا للأعلى ثم انقر على رمز التثبيت."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"عند تشغيل هذا الإعداد، يمكنك استخدام تثبيت الشاشة للإبقاء على عرض الشاشة الحالية إلى أن يتم إلغاء التثبيت.\n\nلاستخدام تثبيت الشاشة:\n\n1- تأكد من تشغيل تثبيت الشاشة.\n\n2- افتح الشاشة المراد تثبيتها.\n\n3- انقر على \"نظرة عامة\".\n\n4- مرر اصبعك سريعًا للأعلى ثم انقر على رمز التثبيت."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"المطالبة بنقش إلغاء القفل قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"مطالبة برقم تعريف قبل إزالة التثبيت"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"المطالبة بكلمة المرور قبل إزالة التثبيت"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"قفل الجهاز عند إزالة التثبيت"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"إقفال الجهاز عند إزالة التثبيت"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"تتم إدارة الملف الشخصي للعمل هذا بواسطة:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"يديرها <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(تجريبي)"</string>
@@ -3097,18 +3098,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"الاحتفاظ بالاتجاه الحالي"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"تأمين بدء التشغيل"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"متابعة"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"يمكنك إضافة المزيد من الحماية إلى هذا الجهاز عن طريق اشتراط إدخال رقم التعريف الشخصي قبل بدء تشغيله. وإلى أن يتم بدء تشغيل الجهاز، لا يمكن للجهاز استقبال مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات. \n\nويساعد هذا في حماية البيانات على الأجهزة  المفقودة أو المسروقة."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"يمكنك إضافة المزيد من الحماية إلى هذا الجهاز عن طريق اشتراط إدخال النقش قبل بدء تشغيله. وإلى أن يتم بدء تشغيل الجهاز، لا يمكن للجهاز استقبال مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات. \n\nويساعد هذا في حماية البيانات على الأجهزة  المفقودة أو المسروقة."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"يمكنك إضافة المزيد من الحماية إلى هذا الجهاز عن طريق اشتراط إدخال كلمة المرور قبل بدء تشغيله. وإلى أن يتم بدء تشغيل الجهاز، لا يمكن للجهاز استقبال مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات. \n\nويساعد هذا في حماية البيانات على الأجهزة  المفقودة أو المسروقة."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل الجهاز، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال رقم التعريف الشخصي قبل تشغيله. ويتعذر على الجهاز - إلى أن يتم تشغيله - استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا على حماية البيانات على الأجهزة المفقودة أو المسروقة."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل الجهاز، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال النمط قبل بدء تشغيله. ويتعذر على الجهاز - إلى أن يتم تشغيله - استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا على حماية البيانات على الأجهزة المفقودة أو المسروقة."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل الجهاز، يمكنك رفع مستوى حماية هذا الجهاز من خلال طلب إدخال كلمة المرور قبل بدء تشغيله. ويتعذر على الجهاز - إلى أن يتم تشغيله - استقبال المكالمات أو الرسائل أو الإشعارات بما في ذلك التنبيهات.\n\nيساعد هذا على حماية البيانات على الأجهزة المفقودة أو المسروقة."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"يلزم رقم التعريف الشخصي حتى يبدأ تشغيل الجهاز"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"يلزم نمط حتى يبدأ تشغيل الجهاز"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"يلزم كلمة المرور حتى يبدأ تشغيل الجهاز"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"لا، شكرًا"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"لا، شكرًا"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"لا، شكرًا"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال رقم التعريف الشخصي قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال رقم التعريف الشخصي لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال النقش قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات. \n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال النقش لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال كلمة المرور قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات. \n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة المرور لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال رقم التعريف الشخصي قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال رقم التعريف الشخصي لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال النقش قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال النقش لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"بالإضافة إلى استخدام بصمة إصبعك لإلغاء قفل جهازك، يمكنك حماية هذا الجهاز أكثر من خلال طلب إدخال كلمة المرور قبل تشغيله. وإلى أن يتم تشغيل الجهاز، لا يمكن تلقي مكالمات أو رسائل أو إشعارات، بما في ذلك التنبيهات.\n\nوهذا يساعد على حماية البيانات على الأجهزة المفقودة أو المسروقة. هل تريد طلب إدخال كلمة المرور لبدء تشغيل الجهاز؟"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"نعم"</string>
+    <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>
@@ -3248,7 +3245,7 @@
     <string name="high_power_prompt_title" msgid="6358673688590282655">"هل تريد السماح بتشغيل التطبيق في الخلفية دائمًا؟"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"قد يؤدي السماح بتشغيل تطبيق <xliff:g id="APP_NAME">%1$s</xliff:g> في الخلفية دائمًا إلى تقليل عمر البطارية. \n\nيمكنك تغيير هذا الإعداد لاحقًا من الإعدادات &gt; التطبيقات والإشعارات."</string>
     <string name="battery_summary" msgid="8044042095190688654">"تم استخدام <xliff:g id="PERCENTAGE">%1$s</xliff:g> منذ آخر شحن كامل"</string>
-    <string name="battery_power_management" msgid="5571519699679107523">"إدارة الصلاحية"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"إدارة الطاقة"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"لم يتم استخدام البطارية منذ آخر شحن كامل"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"إعدادات التطبيق"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"إظهار أداة ضبط واجهة مستخدم النظام"</string>
@@ -3352,9 +3349,9 @@
     <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_trusted" msgid="6857780460845250885">"نعم"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"لا"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"السماح بعمليات تثبيت التطبيق"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"مسموح به"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"غير مسموح به"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"اضغط على زر التشغيل مرتين لتشغيل الكاميرا"</string>
@@ -3362,7 +3359,7 @@
     <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_summary" msgid="6445488991799015407">"يمكنك تصغير العناصر المعروضة على الشاشة أو تكبيرها، علما بأنه ربما يتغير موضع بعض التطبيقات على الشاشة."</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>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"تكبير"</string>
@@ -3386,7 +3383,7 @@
       <item quantity="other">إيقاف الإشعارات في <xliff:g id="COUNT">%d</xliff:g> تطبيق</item>
       <item quantity="one">إيقاف الإشعارات في تطبيق واحد</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"تشغيل لكل التطبيقات"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"تشغيلها لكلّ التطبيقات"</string>
     <string name="apps_summary" msgid="193158055537070092">"تم تثبيت <xliff:g id="COUNT">%1$d</xliff:g> تطبيق"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"٢٤ تطبيقًا مثبَّتًا"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> مستخدمة - <xliff:g id="FREE_SPACE">%2$s</xliff:g> فارغة"</string>
@@ -3435,8 +3432,8 @@
     <string name="suggestions_title" msgid="7280792342273268377">"الاقتراحات"</string>
     <string name="suggestions_summary" msgid="2509040178581728056">"أكثر من <xliff:g id="ID_1">%1$d</xliff:g>"</string>
     <string name="suggestion_remove" msgid="904627293892092439">"إزالة"</string>
-    <string name="color_temperature" msgid="2070126836910615605">"درجة حرارة لون رائعة"</string>
-    <string name="color_temperature_desc" msgid="4793729830226404052">"استخدم ألوان أكثر روعة للشاشة"</string>
+    <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="ota_disable_automatic_update" msgid="2319639631655915050">"تحديثات النظام التلقائية"</string>
@@ -3535,11 +3532,11 @@
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"لا يحتوي ترتيب العناصر على هذا المفتاح."</string>
     <string name="special_access" msgid="3458780842491881155">"وصول خاص إلى التطبيقات"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="zero">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات المقيدة</item>
-      <item quantity="two">يمكن لتطبيقين (<xliff:g id="COUNT">%d</xliff:g>) استخدام البيانات المقيدة</item>
-      <item quantity="few">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيقات استخدام البيانات المقيدة</item>
-      <item quantity="many">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيقًا استخدام البيانات المقيدة</item>
-      <item quantity="other">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات المقيدة</item>
+      <item quantity="zero">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات غير المقيدة</item>
+      <item quantity="two">يمكن لتطبيقين (<xliff:g id="COUNT">%d</xliff:g>) استخدام البيانات غير المقيدة</item>
+      <item quantity="few">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيقات استخدام البيانات غير المقيدة</item>
+      <item quantity="many">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيقًا استخدام البيانات غير المقيدة</item>
+      <item quantity="other">يمكن لـ <xliff:g id="COUNT">%d</xliff:g> تطبيق استخدام البيانات غير المقيدة</item>
       <item quantity="one">يمكن لتطبيق واحد استخدام البيانات غير المقيدة</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"هل تريد فعلًا مسح بيانات المستخدم والتحويل إلى تشفير الملفات؟"</string>
@@ -3556,7 +3553,8 @@
     <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_connected_summary" msgid="8733997010923307915">"تم الاتصال بـ"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"فئات مطوّري البرامج في الإعدادات السريعة"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"نحن هنا لمساعدتك"</string>
@@ -3644,7 +3642,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"للاطلاع على الإشعارات سريعًا، يمكنك حمل هاتفك."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"للاطلاع على الإشعارات سريعًا، يمكنك حمل جهازك اللوحي."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"للاطلاع على الإشعارات سريعًا، يمكنك حمل جهازك."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"تمرير بصمة الإصبع سريعًا للوصول إلى الإشعارات"</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>
@@ -3785,7 +3783,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(تم التعطيل للمستخدم <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"خدمة الملء التلقائي"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ملء، تعبئة، ملء تلقائي"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"هل تريد تعيين <xliff:g id="APP_NAME_0">%1$s</xliff:g> تطبيق الملء الافتراضي؟ سيكون بإمكان <xliff:g id="APP_NAME_1">%1$s</xliff:g> قراءة شاشتك وملء الحقول في التطبيقات الأخرى."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"‏&lt;b&gt;تأكد من أنك تثق بهذا التطبيق&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; يستخدم البيانات المعروضة على الشاشة لتحديد ما يمكن ملؤه تلقائيًا."</string>
     <string name="device_theme" msgid="4571803018917608588">"مظهر الجهاز"</string>
     <string name="default_theme" msgid="7085644992078579076">"افتراضي"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"إدارة سعة التخزين: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 8ee0e5d..0f5d59e 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Heç biri"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Heç biri"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 8cccafc..8b65815 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hesablar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Yer"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hesablar"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Təhlükəsizlik və Məkan"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Şifrələmə və kredensiallar"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon şifrələnib"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon şifrələnib"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Ekran kilidi tərcihləri"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Məkanım\'ı, ekranı kiliddən çıxarmanı, hesab yaddaş kilidini ayarlayın,"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Məxfilik"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Admin tərəfindən deaktiv edildi"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Təhlükəsizlik statusu"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Ekran kilidi, barmaq izi"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekran kilidi"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Barmaq izi"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Barmaq izlərini idarə edin"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Bunun üçün barmaq izi istifadə edin:"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Yüksək keyfiyyətli ictimai şəbəkə əlçatan olduqda bildirin"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi\'ı avtomatik olaraq aktiv edin"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi daxili şəbəkə kimi yüksək keyfiyyətli yadda saxlanmış şəbəkələrin yaxınlığında yenidən aktiv ediləcək"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi skanı deaktiv olduğuna görə əlçatmazdır"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Keyfiyyətsiz bağlantıdan çəkinin"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Yaxşı İnternet bağlantısı yoxdursa, Wi-Fi şəbəkəsi istifadə etmə"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Yalnız keyfiyyətli internet bağlantısı olan şəbəkələri istifadə edin"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi-Fi konfiqurasiya edin"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alt şəbəkə maskası"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ünvanları"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saxlanmış şəbəkələr"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ayarları"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Təkmilləşmiş Wi‑Fi ayarları bu istifadəçi üçün əlçatmazdır"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Qapalı"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Telefon doklanmış və/və ya yatan zaman baş verənlərə nəzarət edin, ekran qoruyucunu aktiv edin."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Başlama vaxtı"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Cari ekran qoruyucu"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"İndi başlayın"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ayarlar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik parlaqlıq"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Oyatmaq üçün qaldırın"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Gələn bildiriş ekranı"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ətraf mühit displeyi"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirişlər aldığınız zaman ekran oyansın"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Şrift ölçüsü"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Mətni kiçildin və ya böyüdün"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Mağaza"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Tətbiq məlumatları"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Tətbiq <xliff:g id="APP_STORE">%1$s</xliff:g> bölməsindən yükləndi"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> haqqında ətraflı məlumat"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Tətbiq əməliyyatları"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Proses gedir"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Heç vaxt istifadə olunmayıb)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Klaviatura qısa yolları köməkçisi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Əlçatan qısayolları göstərin"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Defolt"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kursor sürəti"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Oyun Kontrolleri"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Vibrator istifadə edin"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Tam doldurmadan sonrakı ekran istifadəsi"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın enerji sərfiyyatı"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil şəbəkənin skan edilməsi"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> əvvəl"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Tam doldurmadan sonrakı tətbiq istifadəsi (<xliff:g id="TIME">%1$s</xliff:g> əvvəl)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> əvvəl"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Tam doldurmadan sonrakı tətbiq istifadəsi (<xliff:g id="TIME">^1</xliff:g> əvvəl)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Dam doldurmadan sonra ekranın vaxtı miqdarı aktiv edilib"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tam doldurmadan sonrakı cihaz istifadəsi"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Elektrik şəbəkəsindən çıxarılandan sonra batareya istifadəsi"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Şəbəkə ilə bağlantı"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobil şəbəkə gözləmə rejimi"</string>
     <string name="power_phone" msgid="5392641106474567277">"Səs çağrıları"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet boşdadır"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inaktivdir"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Enerji istifadəsi haqqında məlumat təxminidir və enerjinin sərf olunduğu hər sahəni əks etmir. Müxtəlif istifadə haqqında məlumat təxmini hesablanmış enerji istifadəsi və batareyada müşahidə olunan hazırkı enerji istifadəsi arasındakı fərqdir."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Artıq hesablanmış enerji istifadəsi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s qədər istifadə edilib"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> üçün istifadə olundu"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadə etdi"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya istifadəsi"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sonuncu tam doldurmadan sonrakı istifadə problemi"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Səs daxiletməsi və çıxış parametrləri"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Səsli axtarış"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android klaviatura"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Nitq"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Səs daxiletməsi parametrləri"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Səs daxiletməsi"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Səs daxiletmə xidmətləri"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildiriş səsi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zəng səsi"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Varsayılan bildiriş səsi"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Tətbiq səs təmin etdi"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Defolt bildiriş səsi"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Defolt zəngli saat səsi"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Həmçinin, zənglər üçün vibrasiya olsun"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Digər səslər"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Cihazınız kilidləndiyi zaman profil bildirişlərinin necə göstərilməsini istəyirsiniz?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profil bildirişləri"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Bildirişlər"</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_blocked" msgid="7938180808339386300">"Bildirişləri heç vaxt göstərməyin"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Aşağı: Səs və ya vizual kəsinti yoxdur"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Orta: Səs yoxdur"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Yüksək: Səs çıxarın"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Mühüm: Səs çıxarın və ekrana qışqırın"</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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Bildiriş köməkçisi"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu tətbiq bildirişinin bu cihazda görünməsini blok edir"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bu kateqoriyalı bildirişin bu cihazda görünməsini blok edir"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kateqoriyalar"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Digər"</string>
     <string name="no_channels" msgid="3077375508177744586">"Bu tətbiq heç bir bildiriş paylaşmayıb"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"İndiki orientasiyada qalın"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Təhlükəsiz başlama"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Davam et"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Cihazı işə salmadan öncə PIN kodunun daxil edilməsini tələb edərək, onu qoruya bilərsiniz. Cihaz işə başlamadan öncə zəng, mesaj, bildiriş, xəbərdarlıq qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Cihazı işə salmadan öncə modelin daxil edilməsini tələb edərək, onu qoruya bilərsiniz. Cihaz işə başlamadan öncə zəng, mesaj, bildiriş, xəbərdarlıq qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Cihazı işə salmadan öncə parolun daxil edilməsini tələb edərək, onu qoruya bilərsiniz. Cihaz işə başlamadan öncə zəng, mesaj, bildiriş, xəbərdarlıq qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Cihazınızı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə PIN kod tələb edərək, onu qoruya bilərsiniz. Cihaz işə başlamadan öncə zəng, mesaj, bildiriş, xəbərdarlıq qəbul edə bilməz. \n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Cihazınızı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə modelin daxil edilməsini tələb edərək, onu qoruya bilərsiniz. Cihaz işə başlamadan öncə zəng, mesaj, bildiriş, xəbərdarlıq qəbul edə bilməz. \n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Cihazınızı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə parolun daxil edilməsini tələb edərək, onu qoruya bilərsiniz. Cihaz işə başlamadan öncə zəng, mesaj, bildiriş, xəbərdarlıq qəbul edə bilməz. \n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Cihazı işə salmaq üçün PIN tələb olunsun"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Cihazı işə salmaq üçün model tələb olunsun"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Cihazı işə salmaq üçün parol tələb olunsun"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Yox, çox sağ olun"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Yox, çox sağ olun"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Yox, çox sağ olun"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Cihazı işə salmadan öncə PIN tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz. \n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün PIN tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Cihazı işə salmadan öncə model tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz. \n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün model tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Cihazı işə salmadan öncə parol tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz. \n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə PIN tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün PIN tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə model tələb edərək, onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün model tələb edilsin?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Cihazı kiliddən çıxarmaq üçün barmaq izi istifadə etməkdən əlavə, cihazı işə salmadan öncə parol tələb edərək onu qoruya bilərsiniz. Cihaz işə salınmadan öncə siqnallar da daxil olmaqla zəng, mesaj və ya bildiriş qəbul edə bilməz.\n\nBu, itirilmiş və ya oğurlanmış cihazlarda datanı qorumağa yardım edir. Cihazı işə salmaq üçün parol tələb edin&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Bəli"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Xeyr"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PİN  tələb edirsiniz?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Model tələb edirsiniz?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Parol tələb edirsiniz?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Bu icazə tətbiqə sistem ayarlarını dəyişdirməyə imkan verir."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Bəli"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Xeyr"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Bəli"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Xeyr"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Tətbiq quraşdırmalarına icazə verin"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"İcazə verilib"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"İcazə verilməyib"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Bu mənbədən icazə verin"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera üçün iki dəfə burun"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Biləyinizi iki dəfə buraraq kamera tətbiqini açın"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera üçün qidalanma düyməsini iki dəfə basın"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Qoşulub:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Sürətli ayarlar üzrə developer xanaları"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Yardım üçün buradayıq"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> üçün deaktiv edildi)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Avtodoldurma xidməti"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"avtomatik, doldurmaq, avtomatik doldurmaq"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> avtomatik doldurma tətbiqi olsun? <xliff:g id="APP_NAME_1">%1$s</xliff:g> ekranınızı oxuya və digər tətbiqlərdə sahələri doldura biləcək."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Bu tətbiqə etibar etdiyinizə əmin olun&lt;b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=tətbiq_adı nümunə=Google Avtodoldurma &gt;%%1$s&lt;/xliff:g&gt; nəyin avtomatik doldurula biləcəyini müəyyən etmək üçün ekrandakılardan istifadə edir."</string>
     <string name="device_theme" msgid="4571803018917608588">"Cihaz teması"</string>
     <string name="default_theme" msgid="7085644992078579076">"Defolt"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Yaddaş Meneceri: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 58386fd..7e1c9bd 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -171,16 +171,18 @@
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_peap_phase2_entries">
-    <item msgid="2577747762745812488">"Nijedno"</item>
+    <item msgid="2577747762745812488">"Ništa"</item>
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ništa"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ništa"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index cd8a7e9..03f72e6 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -322,7 +322,7 @@
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Poruka na zaključanom ekranu"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogući vidžete"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Administrator je onemogućio"</string>
-    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nijedno"</string>
+    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Ništa"</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">"Npr. Jocin Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Podaci o korisniku"</string>
@@ -331,20 +331,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Nalozi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Nalozi"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Bezbednost i lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrovanje i akreditivi"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon je šifrovan"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je šifrovan"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Podešavanja zaključanog ekrana"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja SIM kartice i zaključavanja akreditiva skladišta"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Podešavanje Moje lokacije, otključavanja ekrana, zaključavanja skladišta akreditiva"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administrator je onemogućio"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Bezbednosni status"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Zaključavanje ekrana, otisak prsta"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaključavanje ekrana"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravljaj otis. prstiju"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Koristi otis. prsta za"</string>
@@ -579,7 +578,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Otkaži"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Sledeće"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Podešavanje je dovršeno."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacije za administratore uređaja"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Apl. za administratora uređaja"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Nema aktivnih aplikacija"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> aktivna aplikacija</item>
@@ -703,6 +702,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Obavesti me kad god je dostupna javna mreža visokog kvaliteta"</string>
     <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_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>
@@ -825,11 +825,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurišite 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adrese"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Sačuvane mreže"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP podešavanja"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Napredna podešavanja Wi‑Fi mreže nisu dostupna za ovog korisnika"</string>
@@ -1029,17 +1027,16 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Da biste kontrolisali šta se dešava kada je telefon na baznoj stanici i/ili u stanju spavanja, uključite čuvar ekrana."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kada početi"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni čuvar ekrana"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Započni odmah"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Podešavanja"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatski nivo osvetljenosti"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podigni za aktivaciju"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Ekran dolaznog obaveštenja"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambijentalni ekran"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudite ekran kada primite obaveštenja"</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">"Podešavanja zaključavanja SIM kartice"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Zaključavanje SIM kartice"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Zaključavanje SIM kartice"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Isključeno"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Zaključano"</string>
@@ -1217,7 +1214,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Ostalo obuhvata deljene datoteke koje su sačuvale aplikacije, datoteke preuzete sa Interneta ili Bluetooth-a, Android datoteke i tako dalje. \n\nDa biste videli vidljivi sadržaj na uređaju <xliff:g id="NAME">^1</xliff:g>, dodirnite Istraži."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem obuhvata datoteke koje se koriste za pokretanje verzije Android-a <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem obuhvata datoteke koje se koriste za pokretanje verzije 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> možda ima sačuvane slike, muziku, aplikacije ili druge podatke, koji zauzimaju <xliff:g id="SIZE">^2</xliff:g> memorijskog prostora. \n\nDa biste pogledali detalje, pređite na <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Podesite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Koristi kao prenosivu memoriju"</string>
@@ -1290,7 +1287,7 @@
     <string name="error_mcc_not3" msgid="4560171714156251661">"Polje MCK mora da sadrži 3 cifre."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC polje mora da sadrži 2 ili 3 cifre."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Vraćanje podrazumevanih podešavanja naziva pristupne tačke."</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Ponovo postavi podrazumevano"</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>
@@ -1630,6 +1627,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Prodavnica"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalji o aplikaciji"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana iz prodavnice <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Više informacija na <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacije aplikacija"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Aktivno"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikada nije korišćeno)"</string>
@@ -1706,7 +1704,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomoć za tasterske prečice"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaz dostupnih prečica"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Podrazumevano"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Miš/dodirna tabla"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontroler za igre"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Koristi vibraciju"</string>
@@ -1793,7 +1790,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Uvećajte prikaz na ekranu"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite 3 puta da biste zumirali"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite dugme da biste zumirali"</string>
-    <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 uvećavate tastaturu ili traku za navigaciju."</string>
+    <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>
@@ -1809,7 +1806,7 @@
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombinujte kanale kada puštate audio sadržaj"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Odlaganje dodira i zadržavanja"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inverzija boja"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može da utiče na učinak"</string>
+    <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>
@@ -1876,14 +1873,14 @@
     <string name="color_yellow" msgid="9112680561610873529">"Žuta"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Želite li da koristite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba da:"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> treba:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Pošto aplikacija skriva zahtev za dozvolu, Podešavanja ne mogu da verifikuju odgovor."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ako uključite <xliff:g id="SERVICE">%1$s</xliff:g>, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Pošto ste uključili uslugu pristupačnosti, uređaj neće koristiti zaključavanje ekrana da bi poboljšao šifrovanje podataka."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite šablon."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Pošto uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifrovanje podataka, treba da potvrdite lozinku."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Prati vaše radnje"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"da prati vaše radnje"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Dobija obaveštenja kada ostvarujete interakciju sa aplikacijom."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Želite li da zaustavite <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Ako dodirnete Potvrdi, zaustavićete <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
@@ -1936,8 +1933,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Korišćenje ekrana od potpunog punjenja"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za ekran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilnih mreža"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pre <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Korišćenje aplikacije od potpunog punjenja (pre <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pre <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Korišćenje aplikacije od potpunog punjenja (pre <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena tokom kojeg je ekran bio uključen od potpunog punjenja"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Korišćenje uređaja od potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Korišćenje baterije nakon isključivanja"</string>
@@ -1968,7 +1965,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Stanje pripravnosti telefona"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Stanje pripravnosti mobilne mreže"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet je u stanju mirovanja"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
@@ -2028,14 +2025,14 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Potrošnja baterije je približna vrednost potrošnje energije i ne obuhvata svaki izvor pražnjenja baterije. Raznovrsna potrošnja predstavlja razliku između izračunate približne potrošnje baterije i stvarne potrošnje zabeležene za bateriju."</string>
     <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="4383512863007718804">"Koristi se %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Koristi se <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_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_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>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> ukupne potrošnje aplikacija (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Od potpunog punjenja"</string>
@@ -2100,7 +2097,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Podešavanja glasovnog unosa i izlaza"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovna pretraga"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android tastatura"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Govor"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Podešavanja glasovnog unosa"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Glasovni unos"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Usluge glasovnog unosa"</string>
@@ -2190,7 +2186,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Deaktiviraj ovu aplikaciju za administratora uređaja"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Deinstaliraj aplikaciju"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Deaktiviraj i deinstaliraj"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacije za administratore uređaja"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacije za administratora"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Nema dostupnih aplikacija za administratora uređaja"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Lični"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Posao"</string>
@@ -2275,7 +2271,7 @@
     <string name="preference_change_password_title" msgid="8955581790270130056">"Promeni lozinku"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Podešavanja naloga"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Ukloni nalog"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"Dodavanje naloga"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Dodajte nalog"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Završi"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Želite li da uklonite nalog?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Uklanjanjem ovog naloga izbrisaćete sve poruke, kontakte i druge podatke sa tableta!"</string>
@@ -2359,16 +2355,16 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Uključiti autom. sinh. podataka?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Sve promene koje unesete u naloge na vebu će automatski biti kopirane na tablet.\n\nNeki nalozi mogu i automatski da kopiraju na veb sve promene koje unesete na tabletu. Tako funkcioniše Google nalog."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Sve promene koje unesete u naloge na vebu će automatski biti kopirane na telefon.\n\nNeki nalozi mogu i automatski da kopiraju na veb sve promene koje unesete na telefonu. Tako funkcioniše Google nalog."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključiti autom. sinh. podataka?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Na ovaj način će se smanjiti potrošnja podataka i baterije, ali biće potrebno da ručno sinhronizujete svaki nalog da biste prikupili nedavne informacije. Nećete primati ni obaveštenja kada dođe do ažuriranja."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključujete auto-sinh. podataka?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"To će se smanjiti potrošnju podataka i baterije, ali biće potrebno da ručno sinhronizujete svaki nalog da biste prikupili nedavne informacije. Nećete primati ni obaveštenja kada dođe do ažuriranja."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum vraćanja ciklusa potrošnje na početne vrednosti"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum svakog meseca:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Podesi"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Podešavanje upozorenja o korišćenju podataka"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Podešavanje ograničenja za korišćenje podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje potrošnje podataka"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri tablet, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite neko uobičajeno ograničenje."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri telefon, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite neko uobičajeno ograničenje."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tablet će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri tablet, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite niže ograničenje."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon će isključiti mobilne podatke čim dostigne ograničenje koje ste podesili.\n\nPošto potrošnju podataka meri telefon, a mobilni operater može drugačije da računa potrošnju, razmislite o tome da podesite niže ograničenje."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Želite li da ograničite pozadinske podatke?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ako ograničite mobilne pozadinske podatke, neke aplikacije i usluge neće funkcionisati ako niste povezani sa Wi-Fi-jem.\n\nOvo podešavanje utiče na sve korisnike na ovom tabletu."</string>
@@ -2473,7 +2469,7 @@
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Provera pravopisa"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ovde unesite trenutnu lozinku za pravljenje rezervne kopije čitavog sistema"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ovde unesite novu lozinku za pravljenje rezervnih kopija čitavog sistema"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Unesite novu lozinku za rezervnu kopiju čitavog sistema"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Unesite ponovo novu lozinku za rezervnu kopiju čitavog sistema"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Postavi lozinku rezervne kopije"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Otkaži"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatna ažuriranja sistema"</string>
@@ -2562,7 +2558,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Istorija poziva će biti deljena sa ovim korisnikom."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Uključiti telefonske pozive i SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Istorija poziva i SMS-ova će se deliti sa ovim korisnikom."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Informacije o hitnom slučaju"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Informacije za hitni slučaj"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Informacije i kontakti za <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Dozvole za aplikacije i sadržaj"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikacije sa ograničenjima"</string>
@@ -2596,9 +2592,9 @@
     <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>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Prijem obaveštenja o ekstremnoj opasnosti po život i svojinu"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Prijem obaveštenja o ekstremnoj opasnosti po život i imovinu"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Ozbiljne opasnosti"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Prijem obaveštenja o ozbiljnoj opasnosti po život i svojinu"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Prijem obaveštenja o ozbiljnoj opasnosti po život i imovinu"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER obaveštenja"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Prijem objava o kidnapovanju dece"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Ponavljanje"</string>
@@ -2757,6 +2753,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Jačina zvuka za obaveštenja"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Zvuk zvona telefona"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Podrazumevani zvuk obaveštenja"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvuk aplikacije"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Podrazumevani zvuk obaveštenja"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Podrazumevani zvuk alarma"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvukovi"</string>
@@ -2819,6 +2817,7 @@
     <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="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>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikada ne prikazuj obaveštenja"</string>
@@ -2826,10 +2825,10 @@
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuka"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Emituje se zvučni signal"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Emituje se zvučni signal i prikazuje se na ekranu"</string>
-    <string name="notification_importance_min_summary" msgid="8233873580287975662">"Nizak prioritet: bez zvuka ili vizuelnog obaveštenja"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Srednji prioritet: bez zvuka"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Visok prioritet: emituje se zvučni signal"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Hitno: emituje se zvučni signal i prikazuje se na ekranu"</string>
+    <string name="notification_importance_min_title" msgid="6974673091137544803">"Nizak"</string>
+    <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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obaveštenja"</string>
@@ -2864,6 +2863,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikazivanje obaveštenja ove aplikacije na ovom uređaju"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikazivanje ove kategorije obaveštenja na ovom uređaju"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije postavila nijedno obaveštenje"</string>
@@ -3001,18 +3002,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Zadrži aktuelni položaj"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Bezbedno pokretanje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Možete dodatno da zaštitite ovaj uređaj tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme. \n\nNa taj način štitite podatke na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Možete dodatno da zaštitite ovaj uređaj tako što ćete ga podesiti da traži šablon pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme. \n\nNa taj način štitite podatke na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Možete dodatno da zaštitite ovaj uređaj tako što ćete ga podesiti da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme. \n\nNa taj način štitite podatke na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite ako ga podesite tako da traži PIN pre pokretanja. Dok se uređaj ne pokrene, on ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo pomaže u zaštiti podataka na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite ako ga podesite tako da traži šablon pre pokretanja. Dok se uređaj ne pokrene, on ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo pomaže u zaštiti podataka na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite ako ga podesite tako da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, on ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo pomaže u zaštiti podataka na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Zahtevaj PIN za pokretanje uređaja"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Zahtevaj šablon za pokretanje uređaja"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Zahtevaj lozinku za pokretanje uređaja"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ne, hvala"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Možete dodatno da zaštitite ovaj uređaj tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme. \n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati PIN pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Možete dodatno da zaštitite ovaj uređaj tako što ćete ga podesiti da traži šablon pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme. \n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati šablon pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Možete dodatno da zaštitite uređaj tako što ćete ga podesiti da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke ili obaveštenja, uključujući alarme. \n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati lozinku pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži PIN pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati PIN pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži šablon pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati šablon pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Pored toga što možete da otključavate uređaj otiskom prsta, možete dodatno da ga zaštitite tako što ćete ga podesiti da traži lozinku pre pokretanja. Dok se uređaj ne pokrene, ne može da prima pozive, poruke niti obaveštenja, uključujući alarme.\n\nTo omogućava zaštitu podataka na izgubljenim ili ukradenim uređajima. Zahtevati lozinku pri pokretanju uređaja?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Tražiti PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Tražiti šablon?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Tražiti lozinku?"</string>
@@ -3227,7 +3224,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije sa dozvolom"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Instalirajte nepoznate aplikacije"</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>
@@ -3241,9 +3238,9 @@
     <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_trusted" msgid="6857780460845250885">"Da"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ne"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Dozvoli instaliranje aplikacija"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Dozvoljeno"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nije dozvoljeno"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Pritisnite dugme za napajanje dvaput za kameru"</string>
@@ -3259,7 +3256,7 @@
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Zdravo, Petre!"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Hoćeš li da se ispričamo uz kafu danas?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Zvuči odlično. Znam dobro mesto u blizini."</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Važi. Znam dobro mesto u blizini."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Savršeno!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Uto 18:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Uto 18:01"</string>
@@ -3327,7 +3324,7 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Restartujte uređaj da biste primenili promenu TelephonyMonitor-a"</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 mobilnih podataka"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobil. podataka"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Potrošnja Wi-Fi podataka"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Potrošnja podataka na eternetu"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3433,7 +3430,8 @@
     <string name="premium_sms_warning" msgid="9086859595338944882">"Premijum SMS-ovi mogu da koštaju i povećaće račune kod mobilnog operatera. Ako omogućite dozvolu za neku aplikaciju, moći ćete da šaljete premijum SMS-ove pomoću te aplikacije."</string>
     <string name="premium_sms_access" msgid="4660047004791638305">"Pristup premijum SMS-ovima"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Nije vidljivo drugim uređajima"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Povezano sa"</string>
+    <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan je sa uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan je sa više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Režim demonstracije za korisnički interfejs sistema"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brza podešavanja"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Tu smo da pomognemo"</string>
@@ -3506,7 +3504,7 @@
     <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>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Dvaput dodirnite ekran da biste brzo pregledali obaveštenja."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite telefon da biste ga proverili"</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>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Uzmite telefon da biste brzo pregledali obaveštenja."</string>
@@ -3632,7 +3630,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Želite li da <xliff:g id="APP_NAME_0">%1$s</xliff:g> bude aplikacija za automatsko popunjavanje? <xliff:g id="APP_NAME_1">%1$s</xliff:g> će moći da čita sadržaj ekrana i da popunjava polja u drugim aplikacijama."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Uverite se da je ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; koristi sadržaj ekrana za utvrđivanje podataka koji mogu automatski da se popune."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
     <string name="default_theme" msgid="7085644992078579076">"Podrazumevana"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menadžer memorijskog prostora: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index 515b875..6cbe699 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Няма"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Няма"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0f61f7c..b3364e1 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -333,20 +333,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Уліковыя запісы"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Месцазнаходжанне"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Уліковыя запісы"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Бяспека і месцазнаходжанне"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шыфраванне і ўліковыя даныя"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Тэлефон зашыфраваны"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Тэлефон зашыфраваны"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Параметры блакіроўкі экрана"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаць Маё месцазнаходжанне, разблакаванне экрана, блакаванне SIM-карты, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устанавіць маё месцазнаходжанне, разблакаванне экрана, блакаванне сховішча ўліковых дадзеных"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Прыватнасць"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Адключана адміністратарам"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Стан бяспекі"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Кірав. адбіт. пальцаў"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Выкарыст. адбітак для"</string>
@@ -368,12 +367,12 @@
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Далей"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Прапусціць"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Дадаць адбітак пальца"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтага планшэта ў выпадку страты, кражы або скіду налад."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтай прылады ў выпадку страты, крадзяжу або сцірання інфармацыі."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтага тэлефона ў выпадку страты, крадзяжу або сцірання інфармацыі."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Абарона прылады не будзе актываваная. Калі вы згубіце свой планшэт, яго ўкрадуць ці сатруць усе даныя, ім змогуць карыстацца іншыя людзі."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Абарона прылады не будзе актываваная. Калі вы згубіце сваю прыладу, яе ўкрадуць ці сатруць усе даныя, ёй змогуць карыстацца іншыя людзі."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Абарона прылады не будзе актываваная. Калі вы згубіце свой тэлефон, яго ўкрадуць ці сатруць усе даныя, ім змогуць карыстацца іншыя людзі."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтага планшэта ў выпадку страты або крадзяжу."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтай прылады ў выпадку страты або крадзяжу."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функцыі Абароны прылады не будуць актываваны. Вы не зможаце прадухіліць выкарыстанне гэтага тэлефона ў выпадку страты або крадзяжу."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Абарона прылады не будзе актываваная. Калі вы згубіце сваю прыладу ці яе ўкрадуць, ёй змогуць карыстацца іншыя людзі."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Абарона прылады не будзе актываваная. Калі вы згубіце свой тэлефон ці яго ўкрадуць, ім змогуць карыстацца іншыя людзі."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Усё роўна прапусціць"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Знайдзіце сэнсар"</string>
@@ -649,7 +648,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Пашыраныя налады"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Пашыраны Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Калі Bluetooth уключаны, ваша прылада можа звязвацца з іншымі прыладамі з Bluetooth, якія знаходзяцца побач."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Для паляпшэння дакладнасці вызначэння месцазнаходжання сістэмныя дадаткі і службы могуць знаходзіць прылады Bluetooth. Вы можаце змяніць гэта ў <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>наладах сканіравання<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</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>
     <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>
@@ -688,12 +687,12 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> хоча ўключыць Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> хоча адключыць Wi-Fi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</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_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 Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Гатовы перадаваць змесцiва прыкладанняў з дапамогай прылад NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Гатовы да абмену данымі па NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Выключана"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недаступна, таму што NFC выключаная"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -714,6 +713,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недаступна, паколькі выключана сканіраванне Wi‑Fi"</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>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Канфігурацыя 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска падсеткі"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-адрасы"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Захаваныя сеткі"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Налады IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Пашыраныя налады Wi-Fi не даступныя для гэтага карыстальніка"</string>
@@ -871,11 +869,11 @@
     <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">"Iгнараваць гэту групу?"</string>
-    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Партатыўная кропка доступу Wi-Fi"</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_checkbox_text_summary" msgid="5347703013899354452">"Выкарыстоўваць мабільнае падключэнне для працы сеткі Wi‑Fi"</string>
     <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Не абагульваць падключэнне да інтэрнэту гэтага планшэта праз хот-спот"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Не абагульваць падключэнне да інтэрнэту гэтага тэлефона праз хот-спот"</string>
+    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Няма доступу да інтэрнэту гэтага тэлефона праз кропку доступу"</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>
@@ -1042,17 +1040,16 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Выключана"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Каб кантраляваць тое, што адбываецца, калі тэлефон прыстыкаваны і/або знаходзіцца ў рэжыме сну, уключыце экранную застаўку."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Калі пачынаць"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Бягучая экранная застаўка"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Пачаць"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Налады"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Абуджэнне пры падняцці"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Экран уваходнага апавяшчэння"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Функцыя Ambient display"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Абуджаць экран, калі вы атрымліваеце апавяшчэнні"</string>
     <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>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Налады блакіроўкі SIM-карты"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Блакіроўка SIM-карты"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Адключана"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Заблакіравана"</string>
@@ -1064,7 +1061,7 @@
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Патрабаваць PIN-код для выкарыстання тэлефону"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Змена PIN-коду SIM-карты"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN-код SIM-карты"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Блакаванне SIM-карты"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Блакіроўка SIM-карты"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Разблакаваць SIM-карту"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Стары PIN-код SIM-карты"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Новы PIN-код SIM-карты"</string>
@@ -1190,7 +1187,7 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Iгнараваць"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Наладзіць"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Агляд"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"Вызваліце месца"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Вызваліць месца"</string>
     <string name="storage_menu_manage" msgid="5914482953856430780">"Кіраванне сховішчам"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"USB-падключэнне да кампутара"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Падключыцца як"</string>
@@ -1231,7 +1228,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Сістэмныя файлы"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Праглядзець <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Раздзел \"Іншае\" ўключае абагуленыя файлы, захаваныя праграмамі, файлы, спампаваныя з інтэрнэту або па Bluetooth, файлы 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_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_wizard_init_title" msgid="5085400514028585772">"Наладжванне сховішча <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Выкарыстоўваць у якасці партатыўнага сховішча"</string>
@@ -1349,11 +1346,11 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Партатыўная кропка доступу"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-мадэм"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Мадэм"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Хот-спот і мадэм"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Кропка доступу і мадэм"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Хот-спот і мадэм уключаны"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Хот-спот уключаны"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Мадэм"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Немагчыма выкарыстоўваць мадэм або партатыўныя хот-споты, калі ўключана Эканомія трафіка"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"У рэжыме эканоміі трафіку нельга падключацца да кропак доступу"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-мадэм"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB падлучаны, выберыце, каб уключыць мадэм"</string>
@@ -1371,7 +1368,7 @@
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Абагул. падкл. да інт. гэтага тэл. для прыл. (<xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>) па 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_off_subtext" product="tablet" msgid="1889565070769307732">"Не абаг. падкл. гэт. планш. да інтэр. па Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Не абаг. падкл. гэт. тэл. да інтэрн. па Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Няма доступу да інтэрнэту праз Bluetooth"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Немагчыма злучыцца"</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>
@@ -1379,7 +1376,7 @@
     <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="sms_application_title" msgid="4903928270533250448">"Дадатак для SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Праграма для SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Змяніць праграму для SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Выкарыстоўваць <xliff:g id="NEW_APP">%1$s</xliff:g> замест <xliff:g id="CURRENT_APP">%2$s</xliff:g> у якасці дадатку для SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Выкарыстоўваць <xliff:g id="NEW_APP">%s</xliff:g> у якасці вашага дадатку для SMS?"</string>
@@ -1411,9 +1408,9 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Выкарыстоўваць GPS для вызначэння месцазнаходжання"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Сканіраванне"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Сканіраванне Wi-Fi"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным дадаткам і службам знаходзіць сеткі Wi-Fi у любы час."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным праграмам і службам знаходзіць сеткі Wi-Fi у любы час."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Сканіраванне Bluetooth"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным дадаткам і службам знаходзіць прылады Bluetooth у любы час."</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Палепшыце функцыю вызначэння месцазнаходжання, дазволіўшы сістэмным праграмам і службам знаходзіць прылады Bluetooth у любы час."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Месцазнаходжанне Wi-Fi і мабiльнай сеткi"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Дазв. дадаткам выкар. службу вызнач. месцазн., каб знах. вас хутчэй. Ананiмныя даныя пра месцазн. будуць збiр. i адпр. у Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Месцазнаходжанне вызначаецца праз Wi-Fi"</string>
@@ -1518,7 +1515,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Аднолькава з блакіроўкай экрана прылады"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Кіраванне прыкладаннямі"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Кіраванне ўсталяванымi прыкладаннямi і iх выдаленне"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Звесткі пра праграму"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Звесткі пра праграмы"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Кіраванне прыкладаннямі, налады шляхоў хуткага доступу"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Налады прыкладання"</string>
     <string name="install_applications" msgid="4872012136210802181">"Невядомыя крыніцы"</string>
@@ -1527,7 +1524,7 @@
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Ваш тэлефон і асабістыя даныя больш уразлівыя для нападаў невядомых праграм. Пры ўсталёўцы праграм з гэтай крыніцы вы згаджаецеся, што несяце адказнасць за любыя пашкоджанні тэлефона ці страту даных, якія могуць адбыцца ў выніку выкарыстання гэтых праграм."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Пашыраныя налады"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Уключыць дадатковыя параметры налад"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Звесткі пра прыкладанне"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Звесткі пра праграмы"</string>
     <string name="storage_label" msgid="8700867073480107253">"Захоўванне"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Адкрываць па змаўчанні"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Па змаўчанні"</string>
@@ -1587,7 +1584,7 @@
     <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>
+    <string name="no_applications" msgid="7336588977497084921">"Няма праграм."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Унутраная памяць"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"унутраная памяць"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB-назапашвальнік"</string>
@@ -1631,7 +1628,7 @@
     <string name="system_package" msgid="1352722848400644991">"Абнаўленні сістэмы нельга ўсталёўваць на знешнія носьбіты."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Праграму адміністратара прылады нельга ўсталёўваць на знешнія носьбіты"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Спынiць прымусова?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Калі вы прымусова спынiце прыкладанне, яно можа дрэнна працаваць."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Прымусовае спыненне дзейнасці праграмы можа прывесці да збою."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Не атрымалася перамясціць дадатак. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Пераважнае месца ўсталявання"</string>
@@ -1646,6 +1643,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Крама"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Звесткi пра праграму"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Праграма ўсталявана з <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Не выкарыстоўваецца)"</string>
@@ -1670,7 +1668,7 @@
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"Працэсаў: <xliff:g id="NUMPROCESS">%1$d</xliff:g>; службаў: <xliff:g id="NUMSERVICES">%2$d</xliff:g>"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Памяць прылады"</string>
-    <string name="running_processes_header_footer" msgid="723908176275428442">"Выкарыстанне аператыўнай памяці дадаткамі"</string>
+    <string name="running_processes_header_footer" msgid="723908176275428442">"Выкарыстанне аператыўнай памяці праграмамі"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Сістэма"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Праграмы"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Свабодна"</string>
@@ -1722,7 +1720,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Даведка пра спалучэнні клавіш"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Паказаць даступныя спалучэнні клавіш"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Стандартная"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Мыш/трэкпад"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Хуткасць указальніка"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Прылада кiравання гульнёй"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Выкарыстанне вібратара"</string>
@@ -1748,7 +1745,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Рэдагаваць слова"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Рэдагаваць"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Выдаліць"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"У карыстальніцкім слоўніку няма ніводнага слова. Каб дадаць слова, дакраніце да кнопкі \"Дадаць\" (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"У карыстальніцкім слоўніку няма ніводнага слова. Дадаваць словы можна з дапамогай кнопкі \"Дадаць\" (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Для ўсіх моў"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Іншыя мовы..."</string>
     <string name="testing" msgid="6584352735303604146">"Праверка"</string>
@@ -1812,14 +1809,14 @@
     <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="6752037184140789970">"Хуткі доступ"</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="6488524140219209763">"Каб выкарыстоўваць функцыю спецыяльных магчымасцей, калі яна ўключаная, націсніце і ўтрымлівайце на працягу 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>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Нац. на кнопку сілкавання зав. выклік"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ВЫКЛ завяршае выклік"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Вялікі ўказальнік мышы"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Монафанія"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Аб\'ядноўваць каналы пры прайграванні аўдыя"</string>
@@ -1897,15 +1894,15 @@
     <string name="color_yellow" msgid="9112680561610873529">"Жоўты"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Пурпурны"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Выкарыстоўваць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"Неабходна: <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> патрабуе:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Паверх запыту дазволу адлюстроўваецца дадатак, таму ваш адказ не можа быць правераны ў Наладах."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Калі вы ўключыце <xliff:g id="SERVICE">%1$s</xliff:g>, прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Вы ўключылі службу доступу, таму ваша прылада не будзе выкарыстоўваць блакіроўку экрана для паляпшэння шыфравання даных."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой графічны ключ."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой PIN-код."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Уключэнне <xliff:g id="SERVICE">%1$s</xliff:g> уплывае на шыфраванне даных, таму вы павінны пацвердзіць свой пароль."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Назірайце за сваімi дзеяннямi"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Атрымлівайце апавяшчэннi падчас узаемадзеяння з дадаткам."</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Сачыць за вашымі дзеяннямі"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Атрымліваць інфармацыю пра тое, якія дзеянні вы выконваеце ў праграме."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Спыніць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Служба <xliff:g id="SERVICE">%1$s</xliff:g> спынiцца, калi вы краняце кнопку «ОК»."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Няма ўсталяваных службаў"</string>
@@ -1955,11 +1952,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Праграма можа працаваць у фонавым рэжыме, калі не выкарыстоўваецца"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Праца праграмы ў фонавым рэжыме абмежавана, калі праграмай не карыстаюцца"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"У праграмы няма дазволу на працу ў фонавым рэжыме"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Выкар-нне экрана з моманту поўн. зарадкі"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Выкарыстанне экрана пасля поўнай зарадкі"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Расход зараду на падсвечванне экрана"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканіраванне мабільнай сеткі"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> таму"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Спажыванне праграмамі з моманту поўнай зарадкі (<xliff:g id="TIME">%1$s</xliff:g> таму)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> таму"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Спажыванне праграмамі з моманту поўнай зарадкі (<xliff:g id="TIME">^1</xliff:g> таму)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Колькасць часу, калі экран быў уключаны, з моманту поўнай зарадкі"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Выкарыстанне прылады з моманту поўнай зарадкі"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Выкарыстанне акумулятару з моманту адключэння"</string>
@@ -1979,7 +1976,7 @@
     <string name="awake" msgid="387122265874485088">"Час з моманту ўключэння прылады"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi у тэрмін"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi у тэрмiн"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Пашыраныя параметры выкарыстання зараду"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Звесткі пра выкарыстанне зараду"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Падрабязнасці гісторыі"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Спажыванне зараду"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Падрабязнасці выкарыстання"</string>
@@ -1990,7 +1987,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Рэжым чакання тэлефона"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Сетка мабільнай сувязі ў рэжыме чакання"</string>
     <string name="power_phone" msgid="5392641106474567277">"Галасавыя выклікі"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшэт у рэжыме чакання"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Тэлефон у рэжыме чакання"</string>
@@ -2022,7 +2019,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Разлічанае спажыванне энергіі"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Фактычнае спажыванне энергіі"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Прымусовае спыненне"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Звесткі пра прыкладанне"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Звесткі пра праграмы"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Налады прыкладання"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Налады экрана"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"налады Wi-Fi"</string>
@@ -2050,7 +2047,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Значэнне выкарыстання энергіі з\'яўляецца прыблізным і не ўключае ў сябе ўсе крыніцы выкарыстання энергіі. Іншае – гэта розніца паміж вылічаным прыблізным значэннем выкарыстання энергіі і фактычным выкарыстаннем."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Няўлічанае спажыванне энергіі"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАг"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Выкарыстоўваецца %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Выкарыстана на працягу <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>
@@ -2122,7 +2119,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Налады галасавога ўводу і вываду"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Галасавы пошук"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Клавіятура Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Гаворка"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Настройкі галасавога ўводу"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Галасавы ўвод"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Службы галасавога ўводу"</string>
@@ -2212,7 +2208,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Дэактываваць гэту праграму адміністратара прылады"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Выдалiць праграму"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Дэактываваць і выдаліць"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Праграмы адміністратара прылады"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Праграмы адміністратара"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Няма даступных праграм адміністратара прылады"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Персанальныя"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Рабочыя"</string>
@@ -2327,7 +2323,7 @@
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Трафік праграм"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Улік даных аператара можа адрознівацца ад уліку вашай прылады."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Выкарыстанне памяці"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ІНФАРМАЦЫЯ ПРА ДАДАТАК"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"ЗВЕСТКІ ПРА ПРАГРАМЫ"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Мабільная перадача даных"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Усталяваць ліміт даных"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цыкл выкарыст. дадзеных"</string>
@@ -2366,7 +2362,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Маб. вер."</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Няма"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мабільныя дадзеныя"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мабільная перадача даных"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Дадзеныя 2G-3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Дадзеныя 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"На пярэднім плане:"</string>
@@ -2381,16 +2377,16 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Уключыць аўтасінхр. даных?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваны ў памяць планшэта.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены, якія вы робіце ў планшэце, на вэб-сайт. Уліковы запіс Google працуе такім чынам."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Любыя змены, унесеныя ва ўліковы запіс на вэб-сайце, будуць аўтаматычна скапіраваныя ў памяць тэлефона.\n\nНекаторыя ўліковыя запісы таксама могуць аўтаматычна капіраваць любыя змены, якія вы робіце ў тэлефоне, на вэб-сайт. Уліковы запіс Google працуе такім чынам."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхр. даных?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Гэта дасць магчымасць захаваць трафік і зарад акумулятара, але вам трэба будзе сінхранiзаваць кожны ўліковы запіс уручную, каб збіраць свежую інфармацыю. І вы не будзеце атрымліваць апавяшчэнні, калі з\'явяцца абнаўленні."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Адключыць аўтасінхранізацыю?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Гэта дапаможа захоўваць трафік і зарад акумулятара. Аднак вам трэба будзе сінхранізаваць кожны ўліковы запіс уручную, каб збіраць свежую інфармацыю. Вы таксама не будзеце атрымліваць апавяшчэнні пра абнаўленні."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Дата скіду цыкла выкарыстання"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Дата кожнага месяца:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Задаць"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Усталяваць папярэджанне аб выкарыстанні дадзеных"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Усталяваць ліміт выкарыстання дадзеных"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Абмежаванне выкарыстання дадзеных"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Усталяваць ліміт выкарыстання даных"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Абмежаванне выкарыстання даных"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Калі ліміт, які вы ўсталявалі, будзе дасягнуты, планшэт выключыць мабільную перадачу даных.\n\nПаколькі выкарыстанне даных можа ўлічвацца вашым тэлефонам і вашым аператарам па-рознаму, мы рэкамендуем усталяваць больш ці менш нізкі ліміт."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Калі ліміт, які вы ўсталявалі, будзе дасягнуты, тэлефон выключыць мабільную перадачу даных.\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>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Калі вы абмяжоўваеце мабільную перадачу даных у фоне, некаторыя праграмы і сэрвісы не будуць працаваць, пакуль вы не падключыцеся да Wi‑Fi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Калі вы абмяжоўваеце мабільную перадачу даных у фоне, некаторыя праграмы і сэрвісы не будуць працаваць, пакуль вы не падключыцеся да Wi‑Fi.\n\nГэта налада ўплывае на ўсіх карыстальнікаў гэтага планшэта."</string>
@@ -2495,7 +2491,7 @@
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Праверка правапiсу"</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="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Пацвердзіце пароль"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Пазначце пароль рэзервовага капіравання"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Скасаваць"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дадатк. абнаўл. сістэмы"</string>
@@ -2588,7 +2584,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Гэты карыстальнік атрымае доступ да гісторыі выклікаў."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Уключыць тэлефонныя выклікі і SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Гэты карыстальнік атрымае доступ да гісторыі выклікаў і SMS."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Інфармацыя для экстранных сітуацый"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Даныя для экстранных сітуацый"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Інфармацыя і кантакты карыстальніка <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дазволіць прыкладанні і змесціва"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Прыкладанні з абмежаваннямі"</string>
@@ -2599,13 +2595,13 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Аплата дотыкам"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Як гэта працуе"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Плаціце ў крамах з дапамогай свайго тэлефона"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Аплата па змаўчанні"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Стандартны спосаб аплаты"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Не задана"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> – <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <string name="nfc_payment_use_default" msgid="3234730182120288495">"Выкарыстоўваць дадатак па змаўчанні"</string>
+    <string name="nfc_payment_use_default" msgid="3234730182120288495">"Выкарыстоўваць стандартную праграму"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Заўсёды"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"За выключэннем выпадкаў, калі адкрыты іншы плацежны дадатак"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Плаціць з дапамогай наступнага дадатку ў тэрміналах бескантактных плацяжоў:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Пры бескантактнай аплаце выкарыстоўваць:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Аплата ў тэрмінале"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Наладзьце плацежны дадатак. Затым проста прыкладзіце тэлефон задняй часткай да любога тэрмінала з сімвалам бескантактнай аплаты."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Зразумела"</string>
@@ -2653,8 +2649,8 @@
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Дазволіць змяненне спалучэнняў і параметраў Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Дазволіць абмен данымі, калі гэта <xliff:g id="DEVICE_NAME">%1$s</xliff:g> дакранаецца да іншай прылады NFC"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Дазволіць абмен дадзенымі, калі планшэт дакранаецца да іншай прылады"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Дазволіць абмен дадзенымі, калі тэлефон дакранаецца да іншай прылады"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Дазволіць абмен данымі пры спалучэнні планшэта з іншымі прыладамі"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Дазволіць абмен данымі пры спалучэнні тэлефона з іншымі прыладамі"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Месцазнаходжанне"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Дазволіць прыкладанню выкарыстоўваць вашу інфармацыю аб месцазнаходжанні"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Назад"</string>
@@ -2784,6 +2780,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Гучнасць апавяшчэнняў"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодыя тэлефона"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Стандартны гук апавяшчэння"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Гук з праграмы"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Стандартны гук апавяшчэння"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Стандартны сігнал будзільніка"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Уключыць вібрацыю для выклікаў"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Іншыя гукі"</string>
@@ -2816,7 +2814,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Толькі будзільнікі"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Поўная цішыня"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Блакіроўка візуальн. умяшанняў"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Блакіроўка візуальных апавяшчэнняў"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Гукі працоўнага профілю"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Выкар. гукі асабістага профілю"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"У працоўным і асабістым профілях гукі аднолькавыя"</string>
@@ -2837,7 +2835,7 @@
     <string name="notification_pulse_title" msgid="1905382958860387030">"Мігценне святла"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На экране блакіроўкі"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Паказваць усё змесціва ў апавяшчэннях"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Хаваць канфідэнцыяльнае змесціва ў апавяшчэннях"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Хаваць асабовае змесціва ў апавяшчэннях"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Ніколі не паказваць апавяшчэнні"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Як павінны паказвацца апавяшчэнні, калі прылада заблакіравана?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Апавяшчэнні"</string>
@@ -2847,6 +2845,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Ніколі не паказваць апавяшчэнні"</string>
@@ -2854,10 +2853,10 @@
     <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_min_summary" msgid="8233873580287975662">"Нізкая важнасць: без гуку ці візуальнага перапынення"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Сярэдняя важнасць: без гуку"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Высокая важнасць: прайграваць гук"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Тэрміновыя: прайграваць гук і паказваць на экране"</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="6585849855452076626">"Дазволіць прайграванне гуку"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Не прайграваць гук, не вібрыраваць і не паказваць гэтыя апавяшчэнні хутка ў полі зроку на бягучым экране."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Памочнік па апавяшчэннях"</string>
@@ -2869,13 +2868,13 @@
       <item quantity="many">%d дадаткаў могуць чытаць апавяшчэнні</item>
       <item quantity="other">%d дадатку могуць чытаць апавяшчэнні</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"Запытаў ад усталяваных дадаткаў на доступ да апавяшчэнняў не паступала."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"Няма праграм з доступам да платных SMS."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Адкрыць доступ да апавяшчэнняў для <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"Праграма <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> атрымае доступ да ўсіх апавяшчэнняў, у тым ліку асабістай інфармацыі, такой як кантакты і тэкст паведамленняў, якія вы атрымліваеце. Яна таксама зможа адхіляць апавяшчэнні і актываваць у іх кнопкі дзеянняў. \n\nГэта таксама дасwm праграме магчымасць уключаць і выключаць рэжым \"Не турбаваць\", а таксама змяняць звязаныя з ім налады."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Калі вы адключыце доступ да апавяшчэнняў для <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, доступ да рэжыму \"Не турбаваць\" можа быць таксама адключаны."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Адключыць"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Скасаваць"</string>
-    <string name="vr_listeners_title" msgid="1318901577754715777">"Службы-памочнікі віртуальнай рэальнасці (VR)"</string>
+    <string name="vr_listeners_title" msgid="1318901577754715777">"Дапаможныя VR-сэрвісы"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"Усталяваныя праграмы не запытвалі выканання ў якасці службы-памочніка віртуальнай рэальнасці (VR)."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Дазволіць сэрвісу віртуальнай рэальнасці (VR) доступ да <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> зможа выконвацца, калі вы выкарыстоўваеце праграмы ў рэжыме віртуальнай рэальнасці."</string>
@@ -2893,6 +2892,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ да рэжыму «Не турбаваць»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Запытаў доступу да рэжыму «Не турбаваць» ад усталяваных дадаткаў не паступала"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка дадаткаў..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android блакіруе апавяшчэнні ад дадзенай праграмы на гэтай прыладзе"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android блакіруе дадзеную катэгорыю апавяшчэнняў на гэтай прыладзе"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Катэгорыі"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Іншае"</string>
     <string name="no_channels" msgid="3077375508177744586">"Гэта праграма не размяшчала ніякіх апавяшчэнняў"</string>
@@ -2974,14 +2975,14 @@
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Ад усіх"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Толькі ад кантактаў"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Толькі ад кантактаў, пазначаных зоркай"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"Няма"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ні ад каго"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Будзільнікі"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Напаміны"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Падзеі"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Усе абаненты"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Выбраныя выклікі"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Паўторныя выклікі"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Калі адзін і той жа чалавек тэлефануе вам другі раз за наступную колькасць хвілін: <xliff:g id="MINUTES">%d</xliff:g>, дазволіць гэты выклік"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Калі адзін і той жа чалавек тэлефануе вам другі раз за <xliff:g id="MINUTES">%d</xliff:g> хвілін, дазволіць гэты выклік"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Уключыць аўтаматычна"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Ніколі"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Кожную ноч"</string>
@@ -3005,9 +3006,9 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Пераключыцца на рэжым «толькі будзільнікі» да <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Уключыць усе апавяшчэнні"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Блакіраваць, калі экран уключаны"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Прадухіліць кароткі паказ або ўсплыванне апавяшчэнняў, паказ якіх адключаны ў рэжыме «Не турбаваць»"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Не паказваць на экране апавяшчэнні, адключаныя ў рэжыме \"Не турбаваць\""</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Блакіраваць, калі экран выключаны"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Прадухіліць уключэнне экрана або пульсацыю індыкатара апавяшчэнняў для апавяшчэнняў, паказ якіх адключаны ў рэжыме «Не турбаваць»"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Не ўключаць экран і светлавы індыкатар для апавяшчэнняў, адключаных у рэжыме \"Не турбаваць\""</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Не дазваляць уключэнне экрана для апавяшчэнняў, паказ якіх адключаны ў рэжыме «Не турбаваць»"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Выключана"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Калі экран уключаны"</string>
@@ -3034,18 +3035,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Захоўваць бягучую арыентацыю"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Бяспечны запуск"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Далей"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод PIN-кода пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод графічнага ключа пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод пароля пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод PIN-кода пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод узору пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць гэту прыладу яшчэ надзейней, задаўшы ўвод пароля пры яе запуску. Пакуль прылада не запусціцца, яна не будзе прымаць выклікі, паведамленні або апавяшчэнні, а таксама на ёй не будуць працаваць функцыі будзільніка. \n\nГэта дапамагае абараніць даныя у выпадку страты ці крадзяжу прылады."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Патрабаваць PIN-код пры запуску прылады"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Патрабаваць узор для запуску прылады"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Патрабаваць пароль для запуску прылады"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Не, дзякуй"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Не, дзякуй"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Не, дзякуй"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання PIN-кода пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання ўзору пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць узор для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Вы можаце абараніць сваю прыладу яшчэ надзейней, наладзіўшы функцыю патрабавання пароля пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка. \n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання PIN-кода пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць PIN-код для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання ўзору пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць узор для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"У дадатак да выкарыстання адбітка пальца для разблакіроўкі прылады, вы можаце абараніць прыладу, наладзіўшы функцыю патрабавання пароля пры запуску. Пакуль прылада не запушчана, на ёй нельга прымаць выклікі, паведамленні або апавяшчэнні, а таксама не працуе функцыя будзільніка.\n\nГэта дапамагае абараніць даныя на страчаных або ўкрадзеных прыладах. Запытваць пароль для запуску вашай прылады?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Так"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Запытваць PIN-код?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Патрабаваць узор?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Запытваць пароль?"</string>
@@ -3116,7 +3113,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Пашыраныя"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Канфігурацыя дадаткаў"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Невядомы дадатак"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"Дазволы дадатку"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Дазволы праграм"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Праграмы, якія выкарыстоўваюць <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Краніце, каб абудзіць"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Дакраніцеся двойчы ў любым месцы экрана, каб абудзіць прыладу"</string>
@@ -3138,20 +3135,20 @@
     <string name="default_apps_title" msgid="1660450272764331490">"Стандартныя"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Стандартныя для працы"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Памочнік і галасавы ўвод"</string>
-    <string name="default_assist_title" msgid="8868488975409247921">"Дадатак-памочнік"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"Праграма-памочнік"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Зрабіць <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> вашым памочнікам?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Памочніку будзе даступна інфармацыя пра дадаткі, якія выкарыстоўваюцца ў вашай сістэме, у тым ліку інфармацыя, бачная на вашым экране і даступная ў дадатках."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Згаджаюся"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Адмовіцца"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Выбраць галасавы ўвод"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Дадатак-браўзер"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Браўзер"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Няма браўзера па змаўчанні"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Дадатак для выклікаў"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Праграма для званкоў"</string>
     <string name="default_app" msgid="6864503001385843060">"(Стандартная)"</string>
-    <string name="system_app" msgid="9068313769550747372">"(Сістэмныя)"</string>
+    <string name="system_app" msgid="9068313769550747372">"(Сістэмная)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Стандартныя сістэмныя)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Памяць дадаткаў"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Доступ да даных аб выкарыст."</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="app_usage_preference" msgid="7065701732733134991">"Перавагі выкарыстання дадатку"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Доступ да даных аб выкарыстанні дазваляе дадатку адсочваць, якія іншыя дадаткі вы выкарыстоўваеце і як часта, а таксама атрымліваць даныя пра вашага аператара, моўныя налады і іншую інфармацыю."</string>
@@ -3215,7 +3212,7 @@
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Дазволіць праграме-памочніку доступ да відарыса на экране"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Падсвечванне экрана"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Падсвечваць краі экрана, калі праграма-памочнік атрымлівае доступ да тэксту на экране або на здымке экрана"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"Дадаткі-памочнікі могуць дапамагаць вам на аснове інфармацыі з экрана, які вы праглядаеце. Пэўныя дадаткі падтрымліваюць як службы запуску, так і службы галасавога ўводу, каб забяспечыць вам комплексную дапамогу."</string>
+    <string name="assist_footer" msgid="1982791172085896864">"Праграмы-памочнікі працуюць з інфармацыяй на экране. Для вашай зручнасці некаторыя з іх падтрымліваюць панэль запуску і галасавы ўвод."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Сяр. знач. выкарыстання памяці"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Максімальнае выкарыст. памяці"</string>
     <string name="memory_usage" msgid="1781358557214390033">"Выкарыстанне памяці"</string>
@@ -3229,12 +3226,12 @@
     <string name="total_memory" msgid="2017287600738630165">"Уся памяць"</string>
     <string name="average_used" msgid="5338339266517245782">"Сярэдняе значэнне (%)"</string>
     <string name="free_memory" msgid="4003936141603549746">"Свабодна"</string>
-    <string name="memory_usage_apps" msgid="5650192998273294098">"Выкарыстанне памяці дадаткамі"</string>
+    <string name="memory_usage_apps" msgid="5650192998273294098">"Выкарыстанне памяці праграмамі"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> дадатак выкарыстоўваў памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> дадаткі выкарыстоўвалі памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="many"><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>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> праграма выкарыстоўвала памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> праграмы выкарыстоўвалі памяць за апошнія <xliff:g id="DURATION_1">%2$s</xliff:g></item>
+      <item quantity="many"><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="memory_maximum_usage" msgid="6513785462055278341">"Максімальнае выкарыстанне"</string>
@@ -3280,9 +3277,9 @@
     <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_trusted" msgid="6857780460845250885">"Так"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Не"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Дазволіць усталёўку праграм"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Дазволена"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Забаронена"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Каб адкр. кам., двойчы кран. кнопку сіл."</string>
@@ -3367,18 +3364,18 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Каб змены ў сродку адсочвання тэлефаніі былі прыменены, трэба перазагрузіць прыладу"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аўтаматычныя абнаўленні сістэмы"</string>
     <string name="usage" msgid="2977875522080448986">"Выкарыстанне"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Выкарыстанне мабільнай перадачы даных"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Выкарыстанне мабільнага трафіку"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Выкарыстанне трафіку Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Выкарыстанне даных Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> мабільнага трафіка"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> мабільнага трафіку"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> трафіку Wi-Fi"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> трафіку Ethernet"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"Папярэджанне пра трафік - <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Папярэджанне пра трафік - <xliff:g id="ID_1">%1$s</xliff:g> / Ліміт трафіку - <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Разліковы цыкл"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Штомесячны цыкл пачынаецца <xliff:g id="ID_1">%1$s</xliff:g> кожнага месяца"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"Штомесячны цыкл пачынаецца <xliff:g id="ID_1">%1$s</xliff:g> чысла кожнага месяца"</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Штомесячна пачынаючы з <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Сеткавыя абмежаванні"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
@@ -3409,7 +3406,7 @@
     <string name="data_saver_off" msgid="6892309031162738794">"Выключана"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Неабмежаваная перадача даных"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Не абмяжоўваць перадачу даных пры ўключанай Эканоміі трафіку"</string>
-    <string name="home_app" msgid="4066188520886810030">"Праграма Галоўнай старонкі"</string>
+    <string name="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>
@@ -3423,7 +3420,7 @@
     <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="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>
@@ -3472,11 +3469,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Падтрымка"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Найменшая шырыня"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Запыты ад усталяваных праграм на прэміум SMS-доступ не паступалі"</string>
+    <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="premium_sms_access" msgid="4660047004791638305">"Доступ да платных SMS"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Не бачная для іншых прылад"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Падключана да"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Пліткі хуткіх налад для распрацоўшчыкаў"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Мы радыя дапамагчы"</string>
@@ -3546,16 +3544,16 @@
     <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>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip-камера"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Змена камеры"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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="2521630136233865893">"Каб хутка праверыць апавяшчэнні, двойчы дакраніцеся да экрана."</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="8696432220086951466">"Каб хутка праверыць апавяшчэнні, вазьміце свой тэлефон у рукі."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Каб хутка праверыць апавяшчэнні, вазьміце тэлефон у рукі."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Каб хутка праверыць апавяшчэнні, вазьміце свой планшэт у рукі."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Каб хутка праверыць апавяшчэнні, вазьміце сваю прыладу ў рукі."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Правядзіце пальцам, каб убачыць апавяшчэнні"</string>
@@ -3607,7 +3605,7 @@
       <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="enterprise_privacy_location_access" msgid="4158197200885270634">"Дазволы месцазнаходжання"</string>
+    <string name="enterprise_privacy_location_access" msgid="4158197200885270634">"Доступ да геаданых"</string>
     <string name="enterprise_privacy_microphone_access" msgid="5717375623568864441">"Дазволы мікрафона"</string>
     <string name="enterprise_privacy_camera_access" msgid="4858146118537519375">"Дазволы камеры"</string>
     <string name="enterprise_privacy_enterprise_set_default_apps" msgid="3288495615791128724">"Стандартныя праграмы"</string>
@@ -3685,7 +3683,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(адключана для карыстальніка <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Сэрвіс аўтазапаўнення"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"аўтаматычнае, запаўненне, аўтазапаўненне"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Зрабіць праграму <xliff:g id="APP_NAME_0">%1$s</xliff:g> вашай праграмай для аўтазапаўнення? <xliff:g id="APP_NAME_1">%1$s</xliff:g> зможа счытваць тое, што ў вас на экране, і запаўняць палі ў іншых праграмах."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Упэўніцеся, што давяраеце гэтай праграме&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Аўтазапаўненне Google&gt;%1$s&lt;/xliff:g&gt; выкарыстоўвае тое, што знаходзіцца на вашым экране, каб вызначыць, што можна запоўніць аўтаматычна."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тэма прылады"</string>
     <string name="default_theme" msgid="7085644992078579076">"Стандартная"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджар сховішча: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 884c92e..297e349 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Няма"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM карта"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Няма"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index eb124bc..f4421b2 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Профили"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Профили"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Сигурност и местоположение"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифроване и идентификационни данни"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Телефонът е шифрован"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Предпочитания за заключения екран"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефонът е шифрован"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Предпочитания за закл. екран"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Поверителност"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Деактивирано от администратора"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Състояние на сигурността"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Отпечатъци: Управл."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Oтпечатък: Ползване за"</string>
@@ -441,7 +440,7 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Защитете устройството си"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Използване на отпечатък"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Отключване с отпечатъка ви"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Закл. на екрана: Избор"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Заключване на екрана"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Служ. опция за заключ.: Избор"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Защита на таблета"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Защита на устройството"</string>
@@ -460,7 +459,7 @@
     <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>
-    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Прекарване на пръст"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"С бързо плъзгане"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Без защита"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Фигура"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Средна защита"</string>
@@ -477,7 +476,7 @@
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Можете да отключвате телефона си посредством отпечатъка си. От съображения за сигурност трябва да зададете резервна опция за заключване на екрана."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Деакт. от админ., правила за шифроване или хранил. за идент. данни"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Няма"</string>
-    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Прекарване на пръст"</string>
+    <string name="unlock_set_unlock_mode_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>
@@ -665,7 +664,7 @@
     <string name="link_speed" msgid="8896664974117585555">"%1$d Мб/с"</string>
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> иска да включи Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> иска да изключи Wi-Fi"</string>
-    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</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">"Включване на КБП"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Не е налице, защото сканирането за Wi‑Fi е изключено"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Конфигуриране на 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Подмрежова маска"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адреси"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Запазени мрежи"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Настройки за IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Разширените настройки за Wi-Fi не са налице за този потребител"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Изкл."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"За да контролирате какво се случва, когато телефонът е свързан с докинг станция и/или е в спящ режим, включете скрийнсейвъра."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Кога да стартира функцията"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Текущ скрийнсейвър"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Стартиране сега"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Събуждане при повдигане"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Екран за входящи известия"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Дисплей, открояващ важни неща"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Включване на екрана при получаване на известия"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Уголемяване или намаляване на текст"</string>
@@ -1037,7 +1034,7 @@
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Изискване на PIN за употреба на телефона"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Изискване на PIN за работа с таблета"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Изискване на PIN за употреба на телефона"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Промяна на PIN за SIM карта"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Промяна на ПИН за SIM карта"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"ПИН код за SIM карта"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Заключване на SIM картата"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Отключване на SIM картата"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"App Store"</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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Никога не е използвано)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Помощник за клавишни комбинации"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Показване на наличните клавишни комбинации"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"По подразбиране"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Мишка/тракпад"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Скорост на курсора"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Контролер за игри"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Използване на у-вото за вибрация"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ползване на екрана след пълно зареждане"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Консумация от екрана"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканиране за мобилни мрежи"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Преди <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Използване от приложенията след пълно зареждане (преди <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Преди <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Използване от приложенията след пълно зареждане (преди <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Колко време е бил включен екранът след последното пълно зареждане"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Използване на устройството след пълно зареждане"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батерията след изключването"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"В режим на готовност"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Режим на готовност на мобилната мрежа"</string>
     <string name="power_phone" msgid="5392641106474567277">"Гласови обаждания"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблетът е неактивен"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефонът не се използва"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Данните за използването на батерията са приблизителни и не включват всеки източник, който я изтощава. Разходът на енергия за други цели представлява разликата между изчислената приблизителна стойност и действителното наблюдавано изразходване на батерията."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Отчетено в повече захранване"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мАч"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Използвано в продължение на %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Използвано за <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"Използван капацитет от <xliff:g id="APP">%2$s</xliff:g>: <xliff:g id="PERCENT">%1$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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Настройки за въвеждане и синтезиране на глас"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Гласово търсене"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Клавиатура на Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Говор"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Настройки за гласово въвеждане"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Гласово въвеждане"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Услуги за гласово въвеждане"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Сила на звука при известие"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Стандартен звук за известяване"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Звук от приложението"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Стандартен звук за известяване"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Стандартен звук за будилника"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибриране и при обаждания"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Други звуци"</string>
@@ -2752,7 +2750,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> автоматични правила са включени</item>
       <item quantity="one">1 автоматично правило е включено</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Предпочитания за режима „Не безпокойте“"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Режим „Не безпокойте“"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Само приоритетни прекъсвания"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автомат. правила"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Правила за „Не безпокойте“"</string>
@@ -2761,7 +2759,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Само будилници"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Пълна тишина"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Визуални предупреждения: Блокиране"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Виз. предупрежд.: Блокиране"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Звуци за служебния потребителски профил"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Използване на звуците за личния потребителски профил"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Звуците за служебния и личния потребителски профил са едни и същи"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Без показване на известия"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Малка важност: Без звук или визуално прекъсване"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Средна важност: Без звук"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Голяма важност: Възпроизвеждане на звук"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Неотложна важност: Възпроизвеждане на звук и показване на известието на екрана"</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="6585849855452076626">"Разрешаване на звуковия сигнал"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Без издаване на звук, вибриране или показване на тези известия на текущия екран."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Помощник за известия"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Достъп до „Не безпокойте“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Никое инсталирано приложение не е заявило достъп до „Не безпокойте“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android блокира показването на известията от това приложение на устройството"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android блокира показването на тази категория с известия на устройството"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категории"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Други"</string>
     <string name="no_channels" msgid="3077375508177744586">"Това приложение не е публикувало известия"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Оставане в текущата ориентация"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Надеждно стартиране"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Напред"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да могат да се получават обаждания, съобщения или известия. Будилниците също няма да работят. \n\nФункцията помага за защита на данните на загубени или откраднати устройства."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете фигурата ви да се изисква при стартиране. Преди въвеждането й няма да могат да се получават обаждания, съобщения или известия. Будилниците също няма да работят. \n\nФункцията помага за защита на данните на загубени или откраднати устройства."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането й няма да могат да се получават обаждания, съобщения или известия. Будилниците също няма да работят. \n\nФункцията помага за защита на данните на загубени или откраднати устройства."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"В допълнение към отключването посредством отпечатък можете да осигурите на устройството си втора защита, като изисквате ПИН код при стартиране. Преди въвеждането му няма да могат да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nТова помага за защита на данните на изгубени или откраднати устройства."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"В допълнение към отключването посредством отпечатък можете да осигурите на устройството си втора защита, като изисквате фигура при стартиране. Преди въвеждането й няма да могат да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nТова помага за защита на данните на изгубени или откраднати устройства."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"В допълнение към отключването посредством отпечатък можете да осигурите на устройството си втора защита, като изисквате парола при стартиране. Преди въвеждането й няма да могат да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nТова помага за защита на данните на изгубени или откраднати устройства."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Да се изисква ПИН код за стартиране на устройството"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Да се изисква фигура за стартиране на устройството"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Да се изисква парола за стартиране на устройството"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Не, благодаря"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Не, благодаря"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Не, благодаря"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете фигурата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"В допълнение към отключването посредством отпечатък можете да осигурите допълнителен защитен слой за това устройство, като зададете ПИН кодът ви да се изисква при стартиране. Преди въвеждането му няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"В допълнение към отключването посредством отпечатък можете да осигурите допълнителен защитен слой за това устройство, като зададете фигурата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"В допълнение към отключването посредством отпечатък можете да осигурите допълнителен защитен слой за това устройство, като зададете паролата ви да се изисква при стартиране. Преди въвеждането й няма да се получават обаждания, съобщения или известия. Будилниците също няма да работят.\n\nФункцията помага за защита на данните на загубени или откраднати устройства. Искате ли да я включите?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
+    <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>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Приложения с разрешение"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Да"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Не"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Инсталиране на неизвестни приложения"</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>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"Да"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Не"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Разрешаване на инсталирането на приложения"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Има разрешение"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Няма разрешение"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"За камерата натиснете бутона за захранване 2 пъти"</string>
@@ -3390,9 +3387,10 @@
     <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 съобщенията, за които се таксува получателят, може да ви въвлекат в разходи и ще увеличат сметката към оператора ви. Ако дадете разрешението на дадено приложение, ще можете да изпращате такива съобщения чрез него."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Достъп до SMS съобщения, за които се таксува получателят"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Достъп до SMS, за които получателят заплаща"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Устройството не е видимо за други устройства"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Установена е връзка със:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочки за бързи настройки за програмисти"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Тук сме, за да помогнем"</string>
@@ -3462,7 +3460,7 @@
     <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="2521630136233865893">"За да проверите бързо известията си, докоснете двукратно екрана."</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="8696432220086951466">"За да проверите бързо известията си, повдигнете телефона си."</string>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Хранилище на таблета"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Хранилище на телефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Използвано от <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"използвани от <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"ползв."</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Изчистване на приложението"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Искате ли да премахнете това мигновено приложение?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(деактивирано за потребителя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Услуга за автоматично попълване"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автомативно, попълване, автоматично попълване"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Искате ли да направите <xliff:g id="APP_NAME_0">%1$s</xliff:g> приложението си за автоматично попълване? <xliff:g id="APP_NAME_1">%1$s</xliff:g> ще може да чете екрана ви и да попълва полета в други приложения."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Уверете се, че имате доверие на това приложение&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Функцията на Google за автоматично попълване&gt;%1$s&lt;/xliff:g&gt; използва това, което е на екрана ви, за да определи какво може да се попълни автоматично."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема на устройството"</string>
     <string name="default_theme" msgid="7085644992078579076">"Стандартно"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Мениджър на хранилището: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 8cae2fe..677e7c2 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"কোনো কিছুই নয়"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"সিম"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"কোনো কিছুই নয়"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 45c5582..06a72ed 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -51,7 +51,7 @@
     <string name="radio_info_ims_reg_status_not_registered" msgid="4438054067642750717">"নিবন্ধিত নয়"</string>
     <string name="radio_info_ims_feature_status_available" msgid="3687807290327566879">"উপলব্ধ"</string>
     <string name="radio_info_ims_feature_status_unavailable" msgid="4606182208970114368">"অনুপলব্ধ"</string>
-    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS নিবন্ধীকরণ: <xliff:g id="STATUS">%1$s</xliff:g>\nভয়েস ওভার LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nভয়েস ওভার WiFi: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nভিডিও কলিং: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT ইন্টারফেস: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
+    <string name="radio_info_ims_reg_status" msgid="7534612158445529715">"IMS নিবন্ধীকরণ: <xliff:g id="STATUS">%1$s</xliff:g>\nভয়েস ওভার LTE: <xliff:g id="AVAILABILITY_0">%2$s</xliff:g>\nভয়েস ওভার ওয়াই ফাই: <xliff:g id="AVAILABILITY_1">%3$s</xliff:g>\nভিডিও কলিং: <xliff:g id="AVAILABILITY_2">%4$s</xliff:g>\nUT ইন্টারফেস: <xliff:g id="AVAILABILITY_3">%5$s</xliff:g>"</string>
     <string name="radioInfo_service_in" msgid="1697703164394784618">"পরিষেবায়"</string>
     <string name="radioInfo_service_out" msgid="7999094221728929681">"পরিষেবার বাইরে"</string>
     <string name="radioInfo_service_emergency" msgid="6274434235469661525">"শুধুমাত্র জরুরি কল"</string>
@@ -123,26 +123,26 @@
     <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> এর সঙ্গে যুক্ত করতে আলতো চাপুন৷"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"পাওয়া ফাইলগুলি দেখান"</string>
     <string name="device_picker" msgid="4978696506172252813">"ব্লুটুথ ডিভাইস বাছুন"</string>
-    <string name="bluetooth_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>
-    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"একটি অ্যাপ Bluetooth চালু করতে চাইছে"</string>
-    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"একটি অ্যাপ Bluetooth চালু করতে চাইছে"</string>
-    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> আপনার ট্যাবলেটকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%2$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
-    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> আপনার ফোনটিকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%2$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
-    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"একটি অ্যাপ আপনার ট্যাবলেটকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
-    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"একটি অ্যাপ আপনার ফোনটিকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> অন্য Bluetooth ডিভাইসগুলির কাছে আপনার ট্যাবলেটটিকে দৃশ্যমান করতে চাইছে। আপনি পরে Bluetooth সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
-    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> অন্য Bluetooth ডিভাইসগুলির কাছে আপনার ফোনটিকে দৃশ্যমান করতে চাইছে। আপনি পরে Bluetooth সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"একটি অ্যাপ অন্য Bluetooth ডিভাইসগুলির কাছে আপনার ট্যাবলেটটিকে দৃশ্যমান করতে চাইছে। আপনি পরে Bluetooth সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
-    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"একটি অ্যাপ অন্য Bluetooth ডিভাইসগুলির কাছে আপনার ফোনটিকে দৃশ্যমান করতে চাইছে। আপনি পরে Bluetooth সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> Bluetooth চালু করতে চাইছে এবং আপনার ট্যাবলেটকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%2$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
-    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> Bluetooth চালু করতে চাইছে এবং আপনার ফোনটিকে অন্যান্য ডিভাইসের কাছে <xliff:g id="TIMEOUT">%2$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"একটি অ্যাপ Bluetooth চালু করতে চাইছে এবং আপনার ট্যাবলেটটিকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
-    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"একটি অ্যাপ Bluetooth চালু করতে চাইছে এবং আপনার ফোনটিকে অন্যান্য Bluetooth ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> Bluetooth চালু করতে চাইছে এবং অন্য ডিভাইসগুলির কাছে আপনার ট্যাবলেটটিকে দৃশ্যমান করতে চাইছে। আপনি পরে Bluetooth সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> Bluetooth চালু করতে চাইছে এবং অন্য ডিভাইসগুলির কাছে আপনার ফোনটিকে দৃশ্যমান করতে চাইছে। আপনি পরে Bluetooth সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="tablet" msgid="692477613671555006">"একটি অ্যাপ Bluetooth চালু করতে চাইছে এবং অন্য ডিভাইসগুলির কাছে আপনার ট্যাবলেটটিকে দৃশ্যমান করতে চাইছে। আপনি পরে Bluetooth সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
-    <string name="bluetooth_ask_enablement_and_lasting_discovery_no_name" product="default" msgid="6374480121751597648">"একটি অ্যাপ Bluetooth চালু করতে চাইছে এবং অন্য ডিভাইসগুলির কাছে আপনার ফোনটিকে দৃশ্যমান করতে চাইছে। আপনি পরে Bluetooth সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
+    <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g> ব্লুটুথ চালু করতে চাইছে"</string>
+    <string name="bluetooth_ask_disablement" msgid="5890386255790160573">"<xliff:g id="APP_NAME">%1$s</xliff:g> ব্লুটুথ বন্ধ করতে চাইছে"</string>
+    <string name="bluetooth_ask_enablement_no_name" msgid="1644353686104482763">"একটি অ্যাপ ব্লুটুথ চালু করতে চাইছে"</string>
+    <string name="bluetooth_ask_disablement_no_name" msgid="9218830122674868548">"একটি অ্যাপ ব্লুটুথ চালু করতে চাইছে"</string>
+    <string name="bluetooth_ask_discovery" product="tablet" msgid="4791779658660357386">"<xliff:g id="APP_NAME">%1$s</xliff:g> আপনার ট্যাবলেটকে অন্যান্য ব্লুটুথ ডিভাইসের কাছে <xliff:g id="TIMEOUT">%2$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
+    <string name="bluetooth_ask_discovery" product="default" msgid="1308225382575535366">"<xliff:g id="APP_NAME">%1$s</xliff:g> আপনার ফোনটিকে অন্যান্য ব্লুটুথ ডিভাইসের কাছে <xliff:g id="TIMEOUT">%2$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
+    <string name="bluetooth_ask_discovery_no_name" product="tablet" msgid="225715443477752935">"একটি অ্যাপ আপনার ট্যাবলেটকে অন্যান্য ব্লুটুথ ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
+    <string name="bluetooth_ask_discovery_no_name" product="default" msgid="4949152735544109994">"একটি অ্যাপ আপনার ফোনটিকে অন্যান্য ব্লুটুথ ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="tablet" msgid="8528329166577187961">"<xliff:g id="APP_NAME">%1$s</xliff:g> অন্য ব্লুটুথ ডিভাইসগুলির কাছে আপনার ট্যাবলেটটিকে দৃশ্যমান করতে চাইছে। আপনি পরে ব্লুটুথ সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
+    <string name="bluetooth_ask_lasting_discovery" product="default" msgid="4398738575307583138">"<xliff:g id="APP_NAME">%1$s</xliff:g> অন্য ব্লুটুথ ডিভাইসগুলির কাছে আপনার ফোনটিকে দৃশ্যমান করতে চাইছে। আপনি পরে ব্লুটুথ সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="tablet" msgid="1702590641426207062">"একটি অ্যাপ অন্য ব্লুটুথ ডিভাইসগুলির কাছে আপনার ট্যাবলেটটিকে দৃশ্যমান করতে চাইছে। আপনি পরে ব্লুটুথ সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
+    <string name="bluetooth_ask_lasting_discovery_no_name" product="default" msgid="8549952177383992238">"একটি অ্যাপ অন্য ব্লুটুথ ডিভাইসগুলির কাছে আপনার ফোনটিকে দৃশ্যমান করতে চাইছে। আপনি পরে ব্লুটুথ সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="tablet" msgid="1141843490422565755">"<xliff:g id="APP_NAME">%1$s</xliff:g> ব্লুটুথ চালু করতে চাইছে এবং আপনার ট্যাবলেটকে অন্যান্য ব্লুটুথ ডিভাইসের কাছে <xliff:g id="TIMEOUT">%2$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
+    <string name="bluetooth_ask_enablement_and_discovery" product="default" msgid="5195836980079191473">"<xliff:g id="APP_NAME">%1$s</xliff:g> ব্লুটুথ চালু করতে চাইছে এবং আপনার ফোনটিকে অন্যান্য ডিভাইসের কাছে <xliff:g id="TIMEOUT">%2$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="tablet" msgid="7009338445281693765">"একটি অ্যাপ ব্লুটুথ চালু করতে চাইছে এবং আপনার ট্যাবলেটটিকে অন্যান্য ব্লুটুথ ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
+    <string name="bluetooth_ask_enablement_and_discovery_no_name" product="default" msgid="8386904242279878734">"একটি অ্যাপ ব্লুটুথ চালু করতে চাইছে এবং আপনার ফোনটিকে অন্যান্য ব্লুটুথ ডিভাইসের কাছে <xliff:g id="TIMEOUT">%1$d</xliff:g> সেকেন্ডের জন্য দৃশ্যমান করতে চাইছে।"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="tablet" msgid="2279471426575892686">"<xliff:g id="APP_NAME">%1$s</xliff:g> ব্লুটুথ চালু করতে চাইছে এবং অন্য ডিভাইসগুলির কাছে আপনার ট্যাবলেটটিকে দৃশ্যমান করতে চাইছে। আপনি পরে ব্লুটুথ সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
+    <string name="bluetooth_ask_enablement_and_lasting_discovery" product="default" msgid="6961969825475461450">"<xliff:g id="APP_NAME">%1$s</xliff:g> ব্লুটুথ চালু করতে চাইছে এবং অন্য ডিভাইসগুলির কাছে আপনার ফোনটিকে দৃশ্যমান করতে চাইছে। আপনি পরে ব্লুটুথ সেটিংসে এটি পরিবর্তন করতে পারবেন।"</string>
+    <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_auto_connect" msgid="40711424456733571">"স্বতঃ-সংযোগ"</string>
@@ -203,7 +203,7 @@
     <string name="radio_info_band_mode_label" msgid="8730871744887454509">"রেডিও ব্যান্ড নির্বাচন করুন"</string>
     <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"ভয়েস নেটওয়ার্কের প্রকার:"</string>
     <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"ডেটা নেটওয়ার্কের প্রকার:"</string>
-    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"পছন্দের নেটওয়ার্ক প্রকার সেট করুন:"</string>
+    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"পছন্দের নেটওয়ার্ক সেট করুন:"</string>
     <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"হোস্টনামে(www.google.com) IPv4 পিংগ করুন:"</string>
     <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"হোস্টনামে(www.google.com) IPv6 পিংগ করুন:"</string>
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"HTTP ক্লায়েন্ট পরীক্ষা:"</string>
@@ -237,7 +237,7 @@
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD কার্ড শুধুমাত্র পাঠযোগ্য অবস্থায় মাউন্ট করা।"</string>
     <string name="skip_label" msgid="47510779345218297">"এড়িয়ে যান"</string>
     <string name="next_label" msgid="4693520878012668114">"পরবর্তী"</string>
-    <string name="language_picker_title" msgid="3596315202551687690">"ভাষাগুলি"</string>
+    <string name="language_picker_title" msgid="3596315202551687690">"ভাষা"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"ভাষা পছন্দগুলি"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"সরান"</string>
     <string name="add_a_language" msgid="2330538812283783022">"একটি ভাষা যোগ করুন"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"অ্যাকাউন্টগুলি"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"অবস্থান"</string>
     <string name="account_settings_title" msgid="626177544686329806">"অ্যাকাউন্টগুলি"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"নিরাপত্তা এবং অবস্থান"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"এনক্রিপশান ও শংসাপত্র"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ফোন এনক্রিপশন"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ফোন এনক্রিপশন"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"স্কিন লকের পছন্দগুলি"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"আমার স্থান, স্ক্রীন আনলক, সিম কার্ড লক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"আমার স্থান, স্ক্রীন আনলক, ক্রেডেনশিয়াল সঞ্চয়স্থান লক সেট করুন"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"গোপনীয়তা"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"প্রশাসক দ্বারা অক্ষম করা হয়েছে"</string>
     <string name="security_status_title" msgid="5848766673665944640">"নিরাপত্তা স্থিতি"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"আঙ্গুলের ছাপগুলি পরিচালনা করুন"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"এর জন্য আঙ্গুলের ছাপ ব্যবহার করুন"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"কোনো উচ্চ মানের বিনামূল্যের নেটওয়ার্ক উপলব্ধ হলে জানান"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"স্বয়ংক্রিয়ভাবে ওয়াই ফাই চালু করুন"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"উচ্চ মানের সংরক্ষিত নেটওয়ার্কের কাছাকাছি এলেই ওয়াই ফাই আবার চালু হবে, যেমন আপনার বাড়ির নেটওয়ার্ক"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"অনুপলব্ধ কারণ ওয়াই-ফাই স্ক্যানিং বন্ধ আছে"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"দুর্বল সংযোগগুলি এড়িয়ে চলুন"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ভালো ইন্টারনেট সংযোগ না হলে ওয়াই-ফাই ব্যবহার করবেন না"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"শুধুমাত্র ভাল ইন্টারনেট সংযোগ আছে এমন নেটওয়ার্ক ব্যবহার করুন"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"ওয়াই-ফাই কনফিগার করুন"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ঠিকানা"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ঠিকানা"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"সাবনেট মাস্ক"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 অ্যাড্রেসগুলি"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"সংরক্ষিত নেটওয়ার্ক"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP সেটিংস"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"এই ব্যবহারকারীর জন্য ওয়াই-ফাই এর উন্নত সেটিংস উপলব্ধ নয়"</string>
@@ -899,7 +897,7 @@
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"ওয়াই-ফাই কলিং চালু থাকার সময়ে, আপনার পছন্দ এবং কোন সিগন্যাল বেশী শক্তিশালী তার উপর নির্ভর করে আপনার ফোন ওয়াই-ফাই নেটওয়ার্ক বা আপনার পরিষেবা প্রদানকারীর নেটওয়ার্কের মাধ্যমে আপনার কলের রুট তৈরি করে। এই বৈশিষ্ট্যটি চালু করার আগে, আপনার পরিষেবা প্রদানকারীর কাছে ফি-গুলি এবং অন্যান্য বিশদ বিবরণ সম্বন্ধে পরীক্ষা করুন।"</string>
     <string name="emergency_address_title" msgid="3571902448699714454">"জরুরী ঠিকানা আপডেট করুন"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"আপনি যদি WiFi ব্যবহার করে ৯১১ এ কল করেন তাহলে জরুরি পরিষেবাগুলি  আপনার অবস্থান হিসাবে আপনার ঠিকানাকে ব্যবহার করে৷"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"আপনি যদি ওয়াই ফাই ব্যবহার করে ৯১১ এ কল করেন তাহলে জরুরি পরিষেবাগুলি  আপনার অবস্থান হিসাবে আপনার ঠিকানাকে ব্যবহার করে৷"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"প্রদর্শন"</string>
     <string name="sound_settings" msgid="5534671337768745343">"আওয়াজ"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"ভলিউম"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"বন্ধ করুন"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ফোন ডক করা এবং/অথবা নিদ্রা মোডে থাকাকালীন কি হচ্ছে তা নিয়ন্ত্রণের জন্য স্ক্রীন সেভার চালু করুন।"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"কখন শুরু করবেন"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"বর্তমান স্ক্রিন সেভার"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"এখন শুরু করুন"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"সেটিংস"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"স্বয়ংক্রিয় উজ্জ্বলতা"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"সক্রিয় করতে লিফ্ট করুন"</string>
-    <string name="doze_title" msgid="5389406335828323273">"আগত বিজ্ঞপ্তির স্ক্রিন"</string>
+    <string name="doze_title" msgid="2259176504273878294">"অ্যামবিয়েন্ট প্রদর্শন"</string>
     <string name="doze_summary" msgid="3846219936142814032">"যখন আপনি বিজ্ঞপ্তিগুলি পাবেন তখন স্ক্রীন জাগায়"</string>
     <string name="title_font_size" msgid="4405544325522105222">"হরফের আকার"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"পাঠ্য বড় বা ছোট করুন"</string>
@@ -1203,7 +1200,7 @@
     <string name="storage_detail_other" msgid="8404938385075638238">"অন্যান্য"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"সিস্টেম"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> এক্সপ্লোর করুন"</string>
-    <string name="storage_detail_dialog_other" msgid="8907101974576694793">"অন্যগুলির মধ্যে, অ্যাপগুলির দ্বারা সংরক্ষিত শেয়ার করা ফাইল, ইন্টারনেট বা Bluetooth থেকে ডাউনলোড করা ফাইল, Android ফাইল এবং এই ধরণের আরো অনেক কিছু অন্তর্ভুক্ত রয়েছে৷\n\n<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_wizard_init_title" msgid="5085400514028585772">"আপনার <xliff:g id="NAME">^1</xliff:g> সেট আপ করুন"</string>
@@ -1281,7 +1278,7 @@
     <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_network_desc" msgid="5547979398298881406">\n\n<li>"ওয়াই-ফাই"</li>\n<li>"মোবাইল ডেটা"</li>\n<li>"ব্লুটুথ"</li>" সহ নেটওয়ার্কের সমস্ত সেটিং আবার সেট করা হবে"</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>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"সেটিংস আবার সেট করুন"</string>
@@ -1431,7 +1428,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"আপনার পিন নিশ্চিত করুন"</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_choose_lock_generic_header" msgid="3811438094903786145">"আনলক নির্বাচন করুন"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"পাসওয়ার্ড সেট করা হয়েছে"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"পিন সেট করা হয়েছে"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"প্যাটার্ন সেট করা হয়েছে"</string>
@@ -1615,6 +1612,7 @@
     <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="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> সম্পর্কে আরও তথ্য"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"অ্যাপ্লিকেশান ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"চলমান"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(কখনো ব্যবহৃত হয়নি)"</string>
@@ -1662,11 +1660,11 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"সিস্টেমের পরিষেবা বন্ধ করবেন?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"আপনি যদি এই পরিষেবা বন্ধ করেন তাহলে আপনার ট্যাবলেটের পাওয়ার বন্ধ করে আবার চালু না করা পর্যন্ত কিছু বৈশিষ্ট্য সঠিকভাবে কাজ করা বন্ধ করে দিতে পারে।"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"আপনি যদি এই পরিষেবা বন্ধ করেন তাহলে আপনার ফোনের পাওয়ার বন্ধ করে আবার চালু না করা পর্যন্ত কিছু বৈশিষ্ট্য সঠিকভাবে কাজ করা বন্ধ করে দিতে পারে।"</string>
-    <string name="language_settings" msgid="8758655933029560944">"ভাষাগুলি এবং ইনপুট"</string>
-    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ভাষাগুলি এবং ইনপুট"</string>
+    <string name="language_settings" msgid="8758655933029560944">"ভাষা এবং ইনপুট"</string>
+    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ভাষা এবং ইনপুট"</string>
     <string name="input_assistance" msgid="7577795275222555487">"ইনপুট সহায়তা"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"কিবোর্ড ও ইনপুট পদ্ধতি"</string>
-    <string name="phone_language" msgid="7116581601133118044">"ভাষাগুলি"</string>
+    <string name="phone_language" msgid="7116581601133118044">"ভাষা"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
     <string name="auto_replace" msgid="6199184757891937822">"স্বতঃ-প্রতিস্থাপন"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"ভুলভাবে টাইপ করা শব্দ সঠিক করুন"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"কীবোর্ড শর্টকাট সাহায্যকারী"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"উপলব্ধ শর্টকাটগুলি দেখান"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ডিফল্ট"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"মাউস/ট্র্যাকপ্যাড"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"পয়েন্টারের গতি"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"গেম নিয়ন্ত্রক"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"কম্পক ব্যবহার করুন"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"সম্পূর্ণ চার্জ করার সময় থেকে স্ক্রিনের ব্যবহার"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"স্ক্রিনের জন্য ব্যবহার"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"মোবাইল নেটওয়ার্ক স্ক্যান করা"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> আগে"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"সম্পূর্ণ চার্জ হওয়া থেকে অ্যাপের ব্যবহার (<xliff:g id="TIME">%1$s</xliff:g> আগে)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> আগে"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"সম্পূর্ণ চার্জ হওয়া থেকে অ্যাপের ব্যবহার (<xliff:g id="TIME">^1</xliff:g> আগে)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"সম্পূর্ণ চার্জ হওয়ার সময় থেকে স্ক্রিন কত সময় চালু রয়েছে"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"সম্পূর্ণ চার্জ করার সময় থেকে ডিভাইসের ব্যবহার"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"আনপ্লাগ করার পর থেকে ব্যাটারি ব্যবহার"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"ক্যামেরা"</string>
     <string name="power_wifi" msgid="1135085252964054957">"ওয়াই-ফাই"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ব্লুটুথ"</string>
-    <string name="power_cell" msgid="6596471490976003056">"সেল স্ট্যান্ডবাই"</string>
+    <string name="power_cell" msgid="3392999761958982492">"মোবাইল নেটওয়ার্ক স্ট্যান্ডবাই এ আছে"</string>
     <string name="power_phone" msgid="5392641106474567277">"ভয়েস কল"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ট্যাবলেট নিষ্ক্রিয়"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ফোন নিষ্ক্রিয়"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ব্যাটারির ব্যবহার শক্তি ব্যবহারের প্রায় সঠিক পরিমাপ এবং এটি ব্যাটারি নি:শেষ হওয়ার সবধরনের উৎস অন্তর্ভূক্ত করে না। বিবিধ ব্যবহার আসলে শক্তির নির্ণিত আনুমানিক ব্যবহার ও ব্যাটারিতে দেখতে পাওয়া শক্তির প্রকৃত নি:শেষের ব্যবধান।"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"নির্ধারিত শক্তির থেকে বেশী শক্তির ব্যবহার"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s এর জন্য ব্যবহার করা হয়েছে"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> এর জন্য ব্যবহার করা হয়েছে"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> এর দ্বারা <xliff:g id="PERCENT">%1$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_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_detail_foreground" msgid="3350401514602032183">"সক্রিয়ভাবে ব্যবহার করার সময়"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ভয়েস ইনপুট ও আউটপুট সেটিংস"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ভয়েস অনুসন্ধান"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android কীবোর্ড"</string>
-    <string name="voice_category" msgid="1430370497125803904">"কথন"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"ভয়েস ইনপুট সেটিংস"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ভয়েস ইনপুট"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"ভয়েস ইনপুট পরিষেবা"</string>
@@ -2146,7 +2142,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>
@@ -2346,8 +2342,8 @@
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ডেটা ব্যবহার সতর্কতা সেট করুন"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ডেটা ব্যবহার সীমা সেট করুন"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ডেটা ব্যবহার সীমিত করা"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ট্যাবলেট মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ট্যাবলেট আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই আপনি একটি রক্ষণশীল সীমা সেট করার কথা ভাবতে পারেন।"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"ডেটার ব্যবহার আপনার সেট করা সীমায় পৌঁছলে আপনার ফোন মোবাইল ডেটা বন্ধ করে দেবে।\n\nযেহেতু আপনার ফোন আপনার ডেটা ব্যবহারের হিসাব রাখে এবং আপনার পরিষেবা প্রদানকারীর রাখা হিসাব কিছুটা আলাদা হলেও হতে পারে, তাই আপনি একটি রক্ষণশীল সীমা সেট করার কথা ভাবতে পারেন।"</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>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"আপনি যদি পটভূমির মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।"</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"আপনি যদি পটভূমির মোবাইল ডেটা সীমাবদ্ধ করেন, তাহলে ওয়াই ফাই এর সাথে সংযুক্ত না হওয়া পর্যন্ত কিছু কিছু অ্যাপ ও পরিষেবা কাজ করবে না।\n\nএই সেটিংটি এই ট্যাবলেটের সমস্ত ব্যবহারকারীর ক্ষেত্রে প্রযোজ্য।"</string>
@@ -2587,7 +2583,7 @@
     <string name="access_point_names" msgid="1381602020438634481">"অ্যাক্সেস পয়েন্টের নামগুলি"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"উন্নত 4G LTE মোড"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ভয়েস এবং যোগাযোগ উন্নত করার জন্য LTE ডেটা ব্যবহার করুন (প্রস্তাবিত)"</string>
-    <string name="preferred_network_type_title" msgid="3431041717309776341">"পছন্দের নেটওয়ার্ক প্রকার"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"পছন্দের নেটওয়ার্ক"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (প্রস্তাবিত)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"কর্মস্থলের সিম"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"অ্যাপ্লিকেশান &amp; সামগ্রী অ্যাক্সেস"</string>
@@ -2731,8 +2727,10 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"বিজ্ঞপ্তির ভলিউম"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ফোন রিংটোন"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ডিফল্ট বিজ্ঞপ্তি শব্দ"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"শব্দটি অ্যাপ দ্বারা দেওয়া হয়েছে"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"বিজ্ঞপ্তির ডিফল্ট শব্দ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ডিফল্ট অ্যালার্মের শব্দ"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"এছাড়াও কল এলে স্পন্দিত করুন"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"এছাড়াও কল এলে ভাইব্রেট করুন"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"অন্যান্য শব্দগুলি"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"ডায়াল প্যাডের টোনগুলি"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"স্ক্রিন লক হওয়ার শব্দ"</string>
@@ -2752,8 +2750,8 @@
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g>টি স্বয়ংক্রিয় নিয়ম চালু করা হয়েছে</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g>টি স্বয়ংক্রিয় নিয়ম চালু করা হয়েছে</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'বিরক্ত করবেন না\' এর পছন্দগুলি"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"শুধুমাত্র অগ্রাধিকারকে অনুমতি দেয়"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'বিরক্ত করবেন না\' বিকল্পগুলি"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"অগ্রাধিকার অনুমতিগুলি"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"স্বয়ংক্রিয় নিয়মগুলি"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'বিরক্ত করবেন না\' সেট আপ করুন"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"নির্দিষ্ট সময়ের ক্ষেত্রে শব্দ এবং কম্পন সীমিত করুন"</string>
@@ -2761,7 +2759,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"শুধুমাত্র অ্যালার্মগুলি"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"একদম নিরব"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ভিজ্যুয়াল ব্যাঘাতগুলিকে অবরুদ্ধ করুন"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ভিজ্যুয়াল ব্যাঘাতগুলিকে ব্লক করুন"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"কর্মস্থলের প্রোফাইলের ধ্বনিগুলি"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ব্যক্তিগত প্রোফাইলের ধ্বনিগুলি ব্যবহার করুন"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"কাজ এবং ব্যক্তিগত প্রোফাইলের জন্য একই শব্দ"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"কখনোই বিজ্ঞপ্তগুলি দেখায় না"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"নিম্ন: শব্দ করে বা কোনোকিছু দেখিয়ে বিরক্ত করবে না"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"মাঝারি: শব্দ করবে না"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"উচ্চ: শব্দ করবে"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"জরুরী: শব্দ করবে ও স্ক্রিনে ভেসে উঠবে"</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="6585849855452076626">"শব্দ চালু করুন"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"শব্দ, কম্পন করে না বা বর্তমান স্ক্রীনে এই বিজ্ঞপ্তিগুলিকে দেখানো হয় না৷"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"বিজ্ঞপ্তি সহায়ক"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"বিরক্ত করবেন না অ্যাক্সেস করুন"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ইনস্টল করা নেই এমন অ্যাপগুলি বিরক্ত করবেন না অ্যাক্সেস করুন এর অনুরোধ জানিয়েছে"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"অ্যাপ্লিকেশানগুলি লোড করা হচ্ছে..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android এই অ্যাপের বিজ্ঞপ্তিগুলিকে এই ডিভাইসে দেখাতে দিছে না।"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android এই বিভাগের বিজ্ঞপ্তিগুলিকে এই ডিভাইসে দেখাতে দিছে না।"</string>
     <string name="notification_channels" msgid="5346841743182627500">"বিভাগগুলি"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"অন্যান্য"</string>
     <string name="no_channels" msgid="3077375508177744586">"এই অ্যাপটি দ্বারা কোন বিজ্ঞপ্তি পোস্ট করা হয়নি"</string>
@@ -2920,7 +2921,7 @@
     <string name="zen_mode_all_callers" msgid="584186167367236922">"সমস্ত কলার"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"নির্বাচিত কলারগুলি"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"কলারগুলির পুনরাবৃত্তি করুন"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"যদি একই ব্যক্তি <xliff:g id="MINUTES">%d</xliff:g> মিনিটের মধ্যে দ্বিতীয়বার কলগুলি করেন, তবে এটি অনুমোদন করুন"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"যদি একই ব্যক্তি <xliff:g id="MINUTES">%d</xliff:g> মিনিটের মধ্যে দ্বিতীয়বার কল করেন, তবে এটি অনুমোদন করুন"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"স্বয়ংক্রিয়ভাবে চালু"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"কখনও নয়"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"প্রতিদিন রাতে"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"বর্তমান সজ্জায় থাকুন"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"নিরাপদ স্টার্ট-আপ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"অবিরত থাকুন"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"এই ডিভাইসটি শুরু হওয়ার আগে আপনার পিন চাইবে, এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইস শুরু না হওয়া পর্যন্ত, এটি অ্যালার্ম সহ কল, বার্তা, বিজ্ঞপ্তি প্রাপ্ত করতে পারবেন না। \n\nআপনার ডিভাইস হারিয়ে বা চুরি হয়ে গেলে ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে।"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"এই ডিভাইসটি শুরু হওয়ার আগে আপনার প্যাটার্ন চাইবে, এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইস শুরু না হওয়া পর্যন্ত, এটি অ্যালার্ম সহ কল, বার্তা, বিজ্ঞপ্তি প্রাপ্ত করতে পারবেন না। \n\nআপনার ডিভাইস হারিয়ে বা চুরি হয়ে গেলে ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে।"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"এই ডিভাইসটি শুরু হওয়ার আগে আপনার পাসওয়ার্ড চাইবে, এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইস শুরু না হওয়া পর্যন্ত, এটি অ্যালার্ম সহ কল, বার্তা, বিজ্ঞপ্তি প্রাপ্ত করতে পারবেন না। \n\nআপনার ডিভাইস হারিয়ে বা চুরি হয়ে গেলে ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে।"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"এছাড়া আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহারের ক্ষেত্রে, এটিকে শুরু করার আগে আপনার পিন দিয়ে আপনি ডিভাইসটিকে আরো সুরক্ষিত করতে পারেন। ডিভাইস শুরু না হওয়া পর্যন্ত, এটি অ্যালার্ম সহ কল, বার্তা, বিজ্ঞপ্তি প্রাপ্ত করতে পারবে না।\n\nআপনার ডিভাইস হারিয়ে বা চুরি হয়ে গেলে ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে।"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"এছাড়া আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহারের ক্ষেত্রে, এটিকে শুরু করার আগে আপনার প্যাটার্ন দিয়ে আপনি ডিভাইসটিকে আরো সুরক্ষিত করতে পারেন। ডিভাইস শুরু না হওয়া পর্যন্ত, এটি অ্যালার্ম সহ কল, বার্তা, বিজ্ঞপ্তি প্রাপ্ত করতে পারবে না।\n\nআপনার ডিভাইস হারিয়ে বা চুরি হয়ে গেলে ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে।"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"এছাড়া আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহারের ক্ষেত্রে, এটিকে শুরু করার আগে আপনার পাসওয়ার্ড দিয়ে আপনি এই ডিভাইসটিকে আরও বেশি সুরক্ষিত করত পারেন। ডিভাইস শুরু না হওয়া পর্যন্ত, এটি অ্যালার্ম সহ কল, বার্তা বা বিজ্ঞপ্তিগুলি প্রাপ্ত করতে পারবে না। \n\nএটি ডিভাইস হারিয়ে বা চুরি হয়ে গেলে সেক্ষেত্রে ডেটা সুরক্ষিত রাখতে সহায়তা করে।"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"ডিভাইস চালু করার জন্য পিন প্রয়োজন"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"ডিভাইস চালু করার জন্য প্যাটার্ন প্রয়োজন"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"ডিভাইস চালু করার জন্য পাসওয়ার্ড প্রয়োজন"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"না থাক"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"না থাক"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"না থাক"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"এই ডিভাইসটি চালু হওয়ার আগে সেটি আপনার পিন চাইবে এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পিন দরকার?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"এই ডিভাইসটি চালু হওয়ার আগে সেটি আপনার প্যাটার্ন চাইবে এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য প্যাটার্ন দরকার?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"এই ডিভাইসটি চালু হওয়ার আগে সেটি আপনার পাসওয়ার্ড চাইবে এমন পদ্ধতির মাধ্যমে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পাসওয়ার্ড দরকার?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার পিন চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পিন দরকার?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার প্যাটার্ন চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য প্যাটার্ন দরকার?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"আপনার ডিভাইস আনলক করার জন্য আপনার আঙ্গুলের ছাপ ব্যবহার করা ছাড়াও, এটি চালু হওয়ার আগে আপনার পাসওয়ার্ড চাওয়ার মাধ্যমে আপনি ডিভাইসটিকে আরো সুরক্ষিত করতে পারেন। ডিভাইসটি চালু না হওয়া পর্যন্ত সেটিতে কল, বার্তা বা অ্যালার্ম সহ বিজ্ঞপ্তি আসবে না।\n\nআপনার ডিভাইসটি হারিয়ে বা চুরি হয়ে গেলে এটি ডেটা সুরক্ষার ক্ষেত্রে সহায়তা করে। আপনার ডিভাইসটি চালু করার জন্য পাসওয়ার্ড দরকার?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"হ্যাঁ"</string>
+    <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>
@@ -3103,7 +3100,7 @@
     <string name="high_power_desc" msgid="6283926163708585760">"ব্যাটারি অপ্টিমাইজেশান প্রয়োগ করবেন না। আরো দ্রুত আপনার ব্যাটারির চার্জ শেষ হয়ে যেতে পারে৷"</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"অ্যাপটিকে সবসময় পটভূমিতে চালু রাখবেন?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> কে সবসময় পটভূমিতে চালু রাখলে ব্যাটারির ক্ষমতা কমে যেতে পারে। \n\nআপনি পরে সেটিংস &gt; অ্যাপ্স ও বিজ্ঞপ্তি থেকে এটি পরিবর্তন করতে পারেন।"</string>
-    <string name="battery_summary" msgid="8044042095190688654">"শেষ সম্পূর্ণ চার্জ করার পর থেকে <xliff:g id="PERCENTAGE">%1$s</xliff:g>%% ব্যবহার হয়েছে"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"শেষ বার সম্পূর্ণ চার্জ করার পর থেকে <xliff:g id="PERCENTAGE">%1$s</xliff:g> ব্যবহার হয়েছে"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"শক্তি পরিচালনা"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"শেষ সম্পূর্ণ চার্জ করার সময় থেকে কোনো ব্যাটারি ব্যবহার করা হয়নি"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"অ্যাপ্লিকেশান সেটিংস"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"অনুমতি সহ অ্যাপ্লিকেশানগুলি"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"হ্যাঁ"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"না"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"অজানা অ্যাপগুলি ইনস্টল করুন"</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>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"হ্যাঁ"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"না"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"অ্যাপ ইনস্টলের অনুমতি দিন"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"অনুমোদিত"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"অনুমোদিত নয়"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ক্যামেরার জন্য দুবার পাওয়ার বোতাম টিপুন"</string>
@@ -3300,8 +3297,8 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ডেটা সতর্কতা"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ডেটা সতর্কতা / <xliff:g id="ID_2">%2$s</xliff:g> ডেটা সীমা"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"বিলিং চক্র"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"প্রতি মাসের <xliff:g id="ID_1">%1$s</xliff:g> এ মাসিক চক্র শুরু হয়"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"মাসিক চক্র <xliff:g id="ID_1">%1$s</xliff:g> এ শুরু হয়"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"প্রতি মাসের <xliff:g id="ID_1">%1$s</xliff:g> তারিখে মাসিক বিল শুরু হয়"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"মাসিক বিল <xliff:g id="ID_1">%1$s</xliff:g> তরিখ থেকে শুরু হয়"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"নেটওয়ার্ক সীমাবদ্ধতা"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g>টি সীমাবদ্ধতা</item>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"এর সাথে সংযুক্ত"</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>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ইউজার <xliff:g id="USER">%s</xliff:g> এর জন্য অক্ষম হয়েছে)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"আপনাআপনি পূরণ করার পরিষেবা"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"স্বতঃ, পূরণ, স্বতঃপূরণ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> কে আপনার স্বতঃপূরণ অ্যাপ করবেন? <xliff:g id="APP_NAME_1">%1$s</xliff:g> আপনার স্ক্রিন পড়তে ও অন্যান্য অ্যাপে বিভিন্ন ফিল্ডগুলি পূরণ করতে পারবে।"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;নিশ্চিত করুন যে এই অ্যাপটি বিশ্বাসযোগ্য&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; কোনও তথ্য নিজে থেকে পূরণ করা যাবে কি না, তা নির্ণয় করতে &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; অ্যাপটি আপনার স্ক্রিনে যা দেখা যাচ্ছে সেই অনুযায়ী সিদ্ধান্ত নেয়।"</string>
     <string name="device_theme" msgid="4571803018917608588">"ডিভাইসের থিম"</string>
     <string name="default_theme" msgid="7085644992078579076">"ডিফল্ট"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"সঞ্চয়স্থান পরিচালক: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 1624fcd..0ba70a8 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -62,8 +62,8 @@
   <string-array name="entries_font_size">
     <item msgid="8166647333858618801">"Mali"</item>
     <item msgid="6986443533756848935">"Zadano"</item>
-    <item msgid="38373998008112077">"Velika"</item>
-    <item msgid="7635254317531872272">"Najveće"</item>
+    <item msgid="38373998008112077">"Veliki"</item>
+    <item msgid="7635254317531872272">"Najveći"</item>
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPv2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ništa"</item>
+    <item msgid="7480272092408291086">"MSCHAPv2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ništa"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -198,7 +200,7 @@
     <item msgid="168893341855953140">"Automatska konfiguracija proksija"</item>
   </string-array>
   <string-array name="apn_auth_entries">
-    <item msgid="3856896061242872146">"Nema"</item>
+    <item msgid="3856896061242872146">"Ništa"</item>
     <item msgid="5756844015743664882">"PAP"</item>
     <item msgid="535934025797984365">"CHAP"</item>
     <item msgid="8383098660619805783">"PAP ili CHAP"</item>
@@ -280,8 +282,8 @@
     <item msgid="4547883971364273343">"aplikacija sa dozvolom za reproduciranje zvuka"</item>
     <item msgid="2603878814882344450">"centar za upravljanje zvukom"</item>
     <item msgid="7136963238377062018">"jačina glasa"</item>
-    <item msgid="4270236897655923007">"jačina zvuka zvona"</item>
-    <item msgid="6325739889222559394">"jačina zvuka za medijske sadržaje"</item>
+    <item msgid="4270236897655923007">"jačina zvona"</item>
+    <item msgid="6325739889222559394">"jačina zvuka medija"</item>
     <item msgid="5762123934816216821">"jačina zvuka alarma"</item>
     <item msgid="785049718065337473">"jačina zvuka za obavještenja"</item>
     <item msgid="6700305533746877052">"jačina zvuka za Bluetooth vezu"</item>
@@ -315,7 +317,7 @@
     <item msgid="6602854600289714121">"Lokacija"</item>
     <item msgid="8677040780775113033">"Lokacija"</item>
     <item msgid="1660743989948992916">"Lokacija"</item>
-    <item msgid="8791172739860195290">"Vibriraj"</item>
+    <item msgid="8791172739860195290">"Vibracija"</item>
     <item msgid="383413555642128046">"Čitaj kontakte"</item>
     <item msgid="3654594895269697313">"Promijeni kontakte"</item>
     <item msgid="7928393476362362538">"Čitaj zapisnik poziva"</item>
@@ -347,8 +349,8 @@
     <item msgid="3265262911688671938">"Audio fokus"</item>
     <item msgid="2098976479485046797">"Centar za upravljanje zvukom"</item>
     <item msgid="5660213838861789350">"Jačina glasa"</item>
-    <item msgid="7983336752371254444">"Jačina zvuka zvona"</item>
-    <item msgid="7878027809189330917">"Jačina zvuka medijskog sadržaja"</item>
+    <item msgid="7983336752371254444">"Jačina zvona"</item>
+    <item msgid="7878027809189330917">"Jačina zvuka medija"</item>
     <item msgid="7260546305036218513">"Jačina zvuka alarma"</item>
     <item msgid="9103719301075748925">"Jačina zvuka za obavještenja"</item>
     <item msgid="7025966722295861512">"Jačina zvuka za Bluetooth vezu"</item>
@@ -379,9 +381,9 @@
     <item msgid="9039213578110332702">"Jačina zvuka za pristupačnost"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Kratak"</item>
-    <item msgid="2560532955514699713">"Srednji"</item>
-    <item msgid="2372711992605524591">"Dugi"</item>
+    <item msgid="3511504869290423954">"Kratko"</item>
+    <item msgid="2560532955514699713">"Srednje"</item>
+    <item msgid="2372711992605524591">"Dugo"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
     <item msgid="1319652728542138112">"Zadano"</item>
@@ -395,11 +397,11 @@
     <item msgid="561832997193039673">"Mala početna slova"</item>
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
-    <item msgid="4800919809575254054">"Veoma mala"</item>
-    <item msgid="6781094565687692782">"Mala"</item>
+    <item msgid="4800919809575254054">"Vrlo mali"</item>
+    <item msgid="6781094565687692782">"Mali"</item>
     <item msgid="8222123259497646551">"Normalna"</item>
-    <item msgid="5813217276778560466">"Velika"</item>
-    <item msgid="9044232017390975191">"Veoma velika"</item>
+    <item msgid="5813217276778560466">"Veliki"</item>
+    <item msgid="9044232017390975191">"Vrlo veliki"</item>
   </string-array>
   <string-array name="captioning_edge_type_selector_titles">
     <item msgid="4733815704128258753">"Zadano"</item>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 1c4041e..ae86a3e 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -110,7 +110,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Prekinuti vezu?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Time će se okončati vaša veza s uređajem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nemate dozvolu da mijenjate postavke za Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Uređaj <xliff:g id="DEVICE_NAME">%1$s</xliff:g> je vidljiv obližnjim uređajima, dok su otvorene Bluetooth postavke."</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>
     <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>
@@ -172,7 +172,7 @@
     <string name="proxy_port_label" msgid="5655276502233453400">"Priključak za proksi"</string>
     <string name="proxy_exclusionlist_label" msgid="7700491504623418701">"Zaobilazni proksi za"</string>
     <string name="proxy_defaultView_text" msgid="6387985519141433291">"Obnovi zadane vrijednosti"</string>
-    <string name="proxy_action_text" msgid="2957063145357903951">"Završeno"</string>
+    <string name="proxy_action_text" msgid="2957063145357903951">"Gotovo"</string>
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Proksi hostname"</string>
     <string name="proxy_error" msgid="8926675299638611451">"Pažnja"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"Uredu"</string>
@@ -284,8 +284,8 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"Dopusti prijenos podataka mobilnom mrežom"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Dozvoli prijenos podataka u romingu"</string>
     <string name="roaming" msgid="3596055926335478572">"Roming podataka"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Povezuj se na usluge prenosa podataka u romingu"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Povezuj se na usluge prenosa podataka u romingu"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Povezivanje na usluge prijenosa podataka u romingu"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Povezivanje na usluge prijenosa podataka u romingu"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Ostali ste bez veze za prijenos podataka jer ste napustili matičnu mrežu dok je roming podataka isključen."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Uključi"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Može doći do značajnih troškova."</string>
@@ -295,8 +295,8 @@
     <string name="networks" msgid="6333316876545927039">"Izbor operatera"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Odaberite operatera"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Datum i vrijeme"</string>
-    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Postavi datum i vrijeme"</string>
-    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Postavi datum, vrijeme, vremensku zonu i formate"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Postavljanje datuma i vremena"</string>
+    <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Postavljanje datuma, vremena, vremenske zone i formata"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatski datum i vrijeme"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Koristi vrijeme koje definira mreža"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Koristi vrijeme koje definira mreža"</string>
@@ -306,11 +306,11 @@
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24-satni format"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Koristi 24-satni format"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Vrijeme"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"Postavi vrijeme"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"Postavljanje vremena"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"Vremenska zona"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Odaberi vremensku zonu"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Odabir vremenske zone"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Datum"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"Postavi datum"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"Postavljanje vremena"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Sortiraj po abecedi"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"Poredaj po vremenskim zonama"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"Datum"</string>
@@ -323,7 +323,7 @@
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Poruka na zaključanom ekranu"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogući vidžete"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Onemogućio administrator"</string>
-    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Nijedno"</string>
+    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Ništa"</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">"Npr. Edinov Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Podaci o korisniku"</string>
@@ -332,20 +332,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sigurnost i lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje i akreditivi"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon je šifriran"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je šifriran"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Postavke zaključavanja ekrana"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje SIM kartice, zaključavanje pohrane akreditiva"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavite Moju lokaciju, otključavanje ekrana, zaključavanje pohrane akreditiva"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Onemogućio administrator"</string>
-    <string name="security_status_title" msgid="5848766673665944640">"Stanje sigurnosti"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_status_title" msgid="5848766673665944640">"Sigurnosni status"</string>
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Zaključavanje ekrana, otisak prsta"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaključavanje ekrana"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravljanje otiscima prstiju"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Koristi otisak za"</string>
@@ -357,7 +356,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> otisak prsta je registrovano</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Otključaj otiskom prsta"</string>
+    <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>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Samo dodirnite senzor za otisak prsta da odobrite kupovinu ili se prijavite u aplikacije. Pazite čije otiske dodajete. Jedan jedini dodani otisak može izvršiti sve gore navedeno.\n\nNapomena: Ne možete koristiti svoj otisak prsta za otključavanje ovog uređaja. Za više informacija, obratite se administratoru svoje organizacije."</string>
@@ -367,7 +366,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Preskoči"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Dodaj otisak prsta"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj tablet ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj uređaj ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete moći spriječiti upotrebu uređaja u slučaju gubitka, krađe ili brisanja podataka s njega."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj telefon ukoliko bude izgubljen, ukraden ili njegov sadržaj potpuno izbrisan."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj tablet ako ga izgubite ili vam ga ukradu."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funkcije za zaštitu uređaja neće biti aktivirane. Nećete biti u mogućnosti da spriječite druge osobe da koriste ovaj uređaj ako ga izgubite ili vam ga ukradu."</string>
@@ -445,7 +444,7 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaštitite svoj uređaj"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Koristite otisak prsta"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Otključajte otiskom prsta"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Odaberi zaklj. ekrana"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Zaključavanje ekrana"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Odaberi zaklj. profila"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"Zaštitite svoj tablet"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"Zaštitite svoj uređaj"</string>
@@ -464,7 +463,7 @@
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Odaberite način za zaključavanje ekrana"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nema"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
-    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Prevucite"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Prelazak prstom"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Nema sigurnosti"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Uzorak"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Srednja sigurnost"</string>
@@ -480,8 +479,8 @@
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Nastavi bez postavljanja otiska prsta"</string>
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Možete otključati telefon pomoću otiska prsta. Iz sigurnosnih razloga, ova opcija zahtijeva rezervni način zaključavanja ekrana."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Onemogućio administrator, pravila šifriranja ili pohrana akreditiva"</string>
-    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Nema"</string>
-    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prevucite"</string>
+    <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ništa"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prelazak prstom"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Uzorak"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Lozinka"</string>
@@ -639,7 +638,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Napredno"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Napredni Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Kada je Bluetooth uključen, uređaj može komunicirati sa drugim Bluetooth uređajima u blizini."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"U svrhu poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu detektirati Bluetooth uređaje. Ovu postavku 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="ble_scan_notify_text" msgid="1295915006005700650">"Radi poboljšanja preciznosti lociranja, sistemske aplikacije i usluge i dalje mogu detektirati Bluetooth uređaje. 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="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>
@@ -683,7 +682,7 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Uključite NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC razmjenjuje podatke između ovog i drugih uređaja ili ciljeva u blizini, kao što su terminali za plaćanje, čitači pristupa i interaktivni oglasi ili oznake."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Spremno za prijenos sadržaja aplikacije preko NFC-a"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Spremno za prijenos sadržaja aplikacije putem NFC-a"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Isključeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nedostupno jer je NFC isključen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -700,20 +699,21 @@
     <string name="wifi_error" msgid="3207971103917128179">"Greška"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Opseg od 5 GHz nije dostupan u ovoj zemlji"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"U načinu rada u avionu"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Otvori obavještenja mreže"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Obavještenja o otvorenim mrežama"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Obavijesti me kada bude dostupna javna mreža visokog kvaliteta"</string>
-    <string name="wifi_wakeup" msgid="8815640989361538036">"Uključi Wi‑Fi vezu automatski"</string>
-    <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi veza će se automatski ponovo uključiti u blizini sačuvanih mreža visokog kvaliteta, kao što je vaša kućna mreža"</string>
+    <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_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">"Poveži se na otvorene mreže"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Poveži se automatski na javnu mrežu visokog kvaliteta"</string>
-    <string name="wifi_install_credentials" msgid="3551143317298272860">"Instaliraj certifikate"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"U svrhu 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">"Za poboljšanje 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>
+    <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="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>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Ne prikazuj ponovo"</string>
-    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Držite Wi-Fi uključenim za vrijeme spavanja"</string>
+    <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Zadrži Wi-Fi uključenim tokom mirovanja"</string>
     <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi za vrijeme spavanja"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Pojavio se problem prilikom mijenjanja postavke"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Poboljšaj učinkovitost"</string>
@@ -724,11 +724,11 @@
     <string name="wifi_cellular_data_fallback_title" msgid="8753386877755616476">"Automatsko prebacivanje na prijenos mobilnih podataka"</string>
     <string name="wifi_cellular_data_fallback_summary" msgid="6375399280719867214">"Koristite prijenos mobilnih podataka kada Wi-Fi mreža nema pristup internetu. Mogući su troškovi za prijenos podataka."</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Dodaj mrežu"</string>
-    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Wi‑Fi postavke"</string>
+    <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Postavke za Wi-Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi veza se uključuje ponovo automatski"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi veza se ne uključuje ponovo automatski"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi-Fi mreže"</string>
-    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Pritisni WPS dugme"</string>
+    <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS dugme"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Više opcija"</string>
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Unos PIN-a za WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
@@ -779,7 +779,7 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonimni identitet"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Lozinka"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Prikaži lozinku"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite AP Band"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Odaberite opseg pristupne tačke"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Opseg od 2.4 GHz"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Opseg od 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP postavke"</string>
@@ -826,11 +826,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguriraj 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adrese"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Sačuvane mreže"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP postavke"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Napredne Wi-Fi postavke nisu dostupne za ovog korisnika"</string>
@@ -860,16 +858,16 @@
     <string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Otkazati poziv?"</string>
     <string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Da li želite otkazati poziv za povezivanje s uređajem <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">"Prijenosni Wi-Fi hotspot"</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>
     <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Koristite mobilnu vezu za pružanje Wi-Fi mreže"</string>
     <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Internetska veza ovog tableta ne dijeli se putem pristupne tačke"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetska veza ovog telefona ne dijeli se putem pristupne tačke"</string>
+    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Internetska veza telefona ne dijeli se putem pristupne tačke"</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>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Pogreška kod prijenosnog Wi-Fi hotspot"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Podešavanje Wi-Fi hotspot"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Greška kod prijenosne Wi-Fi pristupne tačke"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Postavljanje Wi-Fi pristupne tačke"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Postavke Wi-Fi hotspot"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK pristupna tačka"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> pristupna tačka"</string>
@@ -917,7 +915,7 @@
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"Jačine zvuka"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muzički efekti"</string>
-    <string name="ring_volume_title" msgid="5592466070832128777">"Jačina zvuka zvona"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"Jačina zvona"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj u nečujnom načinu rada"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Zadani zvuk obavještenja"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Melodija zvona"</string>
@@ -925,7 +923,7 @@
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Koristi jačinu zvuka dolaznih poziva za obavještenja"</string>
     <!-- no translation found for home_work_profile_not_supported (1357721012342357037) -->
     <skip />
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Podrazumijevani zvuk obavještenja"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Zadani zvuk obavještenja"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Mediji"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Postavi jačinu zvuka za muziku i video zapise"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
@@ -977,7 +975,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"Osvjetljenje"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Prilagodite osvjetljenje ekrana"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva osvijetljenost"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziraj nivo osvjetljenja za dostupno svjetlo"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje nivoa osvjetljenja u odnosu na osvijetljenost okoline"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Isključeno"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Preferirani nivo osvjetljenja je veoma nizak"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Preferirani nivo osvjetljenja je nizak"</string>
@@ -1013,7 +1011,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Nikada se neće automatski isključiti."</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"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="8574989770628425398">"Automatski će se isključiti u svitanje."</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Stanje mirovanja"</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>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
@@ -1031,13 +1029,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Za kontrolisanje dešavanja kada je telefon priključen i/ili dok miruje, uključi čuvara ekrana."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kada početi"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni čuvar ekrana"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pokreni odmah"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatsko osvjetljenje"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podignite za buđenje"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Prikaz dolaznih obavještenja"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambijentalni prikaz"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekran se aktivira kada primite obavještenja"</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>
@@ -1048,12 +1045,12 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zaključavanje SIM kartice"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Zaključaj SIM karticu"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Zahtijevaj PIN za korištenje tableta"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Zahtijevaj PIN za korištenje telefona"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Potreban je PIN za korištenje telefona"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Zahtijevaj PIN za korištenje tableta"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Zahtijevaj PIN za korištenje telefona"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Promijeni PIN za SIM"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Potreban je PIN za korištenje telefona"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Promjena PIN-a SIM kartice"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN za SIM"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zaključaj SIM karticu"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zaključavanje SIM kartice"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Otključaj SIM karticu"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Stari PIN za SIM"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Novi PIN za SIM"</string>
@@ -1221,7 +1218,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistem"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Istraži korisnika <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Ostalo uključuje podijeljene fajlove koji su sačuvani pomoću aplikacija, fajlove preuzete s Interneta ili Bluetootha, fajlove za Android uređaje i tako dalje. \n\nDa vidite vidljivi sadržaj ove <xliff:g id="NAME">^1</xliff:g>, dodirnite Istraži."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem obuhvata fajlove koji se koriste za pokretanje Androida verzije <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistem obuhvata fajlove koji se koriste za pokretanje verzije Androida <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Moguće je da je <xliff:g id="USER_0">^1</xliff:g> sačuvao/la fotografije, muziku, aplikacije ili druge podatke koristeći <xliff:g id="SIZE">^2</xliff:g> prostora za pohranu. \n\nDa vidite detalje, prebacite se na korisnika <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Podesite uređaj <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Koristiti kao prijenosnu memoriju"</string>
@@ -1255,7 +1252,7 @@
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Čini se da je <xliff:g id="NAME_0">^1</xliff:g> spora. \n\n Možete nastaviti, ali aplikacije koje su premještene na ovu lokaciju mogu zastajkivati te prijenos podataka može dugo trajati. \n\n Razmislite o korištenju brže<xliff:g id="NAME_1">^1</xliff:g> za bolje performanse."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status baterije"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Nivo napunjenosti baterije"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"Nazivi pristupnih tačaka"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Uredi pristupnu tačku"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Nije postavljeno"</string>
     <string name="apn_name" msgid="4115580098369824123">"Ime"</string>
@@ -1271,7 +1268,7 @@
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
     <string name="apn_auth_type" msgid="6167205395676037015">"Vrsta provjere vjerodostojnosti"</string>
-    <string name="apn_auth_type_none" msgid="5069592676845549926">"Nema"</string>
+    <string name="apn_auth_type_none" msgid="5069592676845549926">"Ništa"</string>
     <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP ili CHAP"</string>
@@ -1297,14 +1294,14 @@
     <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">"Postavi ponovo"</string>
-    <string name="reset_network_title" msgid="4557113742173895074">"Resetuj postavke za mrežu"</string>
-    <string name="reset_network_desc" msgid="5547979398298881406">"Ovim će se ponovo postaviti sve postavke mreže, 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_title" msgid="4557113742173895074">"Poništavanje postavki mreže"</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">"Ponovo postaviti sve mrežne postavke? Ovu radnju ne možete poništiti!"</string>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"Vratiti sve postavke mreže na zadano? Ovu radnju ne možete poništiti!"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetuj postavke"</string>
     <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">"Mrežne postavke su ponovo postavljene"</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>
     <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 biti ponovo postavljen</item>
@@ -1338,14 +1335,14 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prijenosna pristupna tačka"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Pristupna tačka i dijeljenje mobilne veze"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Pristupna tačka i povezivanje putem mobitela"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Pristupna tačka je uključena, veza se dijeli"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Pristupna tačka je uključena"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Dijeljenje veze"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Dok je upaljena Ušteda podataka nije moguće povezati uređaj niti koristiti prijenosne pristupne tačke"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Dijeljenje USB veze"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB povezan, označite za dijeljenje veze"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB povezan, označite za povezivanje putem mobitela"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Veza podijeljena"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Ne može se uparivati kada se koristi USB memorija"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nije povezan"</string>
@@ -1360,16 +1357,16 @@
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Broj uređaja s kojima telefon dijeli internetsku vezu putem Bluetootha: <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g>"</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_off_subtext" product="tablet" msgid="1889565070769307732">"Internetska veza telefona se ne dijeli putem Bluetootha."</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internetska veza telefona se ne dijeli putem Bluetootha."</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Internetska veza telefona ne dijeli se putem Bluetootha"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Veza se ne dijeli"</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>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Koristite pristupnu tačku i dijeljenje mobilne veze za pružanje interneta drugim uređajima putem mobilne mreže za prijenos podataka."</string>
+    <string name="tethering_footer_info" msgid="7287131664937054043">"Koristite pristupnu tačku i povezivanje putem mobitela za pružanje interneta drugim uređajima putem mobilne mreže za prijenos podataka."</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>
-    <string name="sms_application_title" msgid="4903928270533250448">"SMS aplikacija"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Promijeniti SMS aplikaciju?"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikacija za SMS"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Promijeniti aplikaciju za SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Želite li koristiti aplikaciju <xliff:g id="NEW_APP">%1$s</xliff:g> umjesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> kao aplikaciju za SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Koristiti <xliff:g id="NEW_APP">%s</xliff:g> kao vašu SMS aplikaciju?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Ocjenjivač mreže"</string>
@@ -1383,7 +1380,7 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Povežite se na Internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Moja lokacija"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Lokacija za profil za Work"</string>
-    <string name="location_mode_title" msgid="3982009713118421689">"Režim"</string>
+    <string name="location_mode_title" msgid="3982009713118421689">"Način"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Visoka preciznost"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ušteda baterije"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Samo uređaj"</string>
@@ -1394,7 +1391,7 @@
     <string name="location_category_location_services" msgid="7437150886946685979">"Usluge lokacije"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Visoka potrošnja baterije"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Niska potrošnja baterije"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"Režim lokacije"</string>
+    <string name="location_mode_screen_title" msgid="4528716772270246542">"Način otkrivanja lokacije"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Koristi GPS, Wi-Fi, Bluetooth ili mobilne mreže za određivanje lokacije"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Koristi Wi-Fi, Bluetooth ili mobilnu mrežu za određivanje lokacije"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Koristi GPS za određivanje lokacije"</string>
@@ -1558,7 +1555,7 @@
     <string name="sort_order_alpha" msgid="1410278099123670628">"Poredaj po nazivu"</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 keširane procese"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Prikaži procese iz keš memorije"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplikacija za hitne situacije"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Vrati željene postavke aplikacije na početne vrijednosti"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Postaviti željene postavke aplikacije na početne vrijednosti?"</string>
@@ -1635,6 +1632,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalji o aplikaciji"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija je instalirana preko trgovine <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Više informacija na <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Djelovanje aplikacije"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Pokrenuto"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikad korišteno)"</string>
@@ -1684,7 +1682,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ako zaustavite ovu uslugu, neke funkcije telefona će možda prestati pravilno funkcionirati sve dok ne isključite i zatim ponovo uključite tablet."</string>
     <string name="language_settings" msgid="8758655933029560944">"Jezici i unos"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jezici i unos"</string>
-    <string name="input_assistance" msgid="7577795275222555487">"Pomoć kod unosa"</string>
+    <string name="input_assistance" msgid="7577795275222555487">"Pomoć pri unosu"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Tastatura i načini unosa"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jezici"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1706,12 +1704,11 @@
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Upravljanje tastaturom"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Pomoć za tastaturu"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Fizička tastatura"</string>
-    <string name="show_ime" msgid="2658582193437188227">"Pokaži virtealnu tastaturu"</string>
+    <string name="show_ime" msgid="2658582193437188227">"Pokaži virtelnu tastaturu"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Zadržava se na ekranu dok je fizička tastatura aktivna"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomoć za skraćenice na tastaturi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaži dostupne prečice"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Zadano"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Miš/dodirna podloga"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontroler za igre"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Koristi vibraciju"</string>
@@ -1780,7 +1777,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Postavke pristupačnosti"</string>
     <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. Ove osobine pristupačnosti se mogu kasnije promijeniti u Postavkama."</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="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>
@@ -1792,14 +1789,14 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Dodirnite stavke na ekranu da se naglas pročitaju"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titlovi"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Uvećanje"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Uvećajte trostrukim dodirom"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Uvećajte pomoću dugmeta"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Uvećajte pomoću dugmeta i trostrukog dodira"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Uvećajte na ekranu"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite tri puta da biste uvećali"</string>
-    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite dugme da povećate"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Da povećate"</b>", brzo dodirnite ekran 3 puta.\n"<ul><li>"Povlačite s 2 ili više prstiju da listate"</li>\n<li>"Uhvatite s 2 ili više prstiju da podesite nivo povećanja"</li></ul>\n\n<b>"Da privremeno povećate"</b>", brzo dodirnite ekran 3 puta i zadržite prst nakon trećeg dodira.\n"<ul><li>"Povlačite da se krećete po ekranu"</li>\n<li>"Podignite prst da poništite povećanje"</li></ul>\n\n"Povećavanje nije moguće na tastaturi ili na traci za navigaciju."</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 povećate"</b>", dodirnite dugme Pristupačnost, zatim dodirnite bilo gdje na ekranu.\n"<ul><li>"Povlačite s 2 ili više prstiju da listate."</li>\n<li>"Uhvatite s 2 ili više prstiju da podesite nivo povećanja. "</li></ul>\n\n<b>"Da privremeno povećate"</b>", dodirnite dugme Pristupačnost, zatim dodirnite i držite bilo gdje na ekranu.\n"<ul><li>"Povlačite da se krećete po ekranu"</li>\n<li>"Podignite prst da poništite povećanje"</li></ul>\n\n"Povećavanje nije moguće na tastaturi ili na traci za navigaciju."</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Uvećavanje trostrukim dodirom"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Uvećavanje pomoću dugmeta"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Uvećavanje pomoću dugmeta i trostrukog dodira"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Uvećajte prikaz na ekranu"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite tri puta da zumirate"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite dugme da zumirate"</string>
+    <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_shortcut_service_title" msgid="4779360749706905640">"Usluga prečice"</string>
@@ -1808,15 +1805,15 @@
     <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>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Poziv se završava dugmetom za napajanje"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Dugme uklj./isklj. prekida poziv"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Veliki pokazivač miša"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono audio"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiniraj kanale prilikom reproduciranja zvuka"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiniranje kanala prilikom reprodukcije zvuka"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Odgoda za dodirivanje i držanje"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inverzija boja"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Može uticati na performanse"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klikni kada se pokazivač zaustavi"</string>
-    <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Sačekaj prije klika"</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="accessibility_summary_state_enabled" msgid="8359913912320966304">"UKLJUČENO"</string>
     <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"ISKLJUČENO"</string>
@@ -1888,8 +1885,8 @@
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj obrazac."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite svoj PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utiče na šifriranje podataka, stoga je potrebno da potvrdite lozinku."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Pratite svoje aktivnosti"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Primajte obavještenja za vrijeme interakcije s aplikacijom."</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Prati vaše aktivnosti"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Dobija obavještenja kada ostvarujete interakciju s aplikacijom."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Želite li zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Uslugu <xliff:g id="SERVICE">%1$s</xliff:g> možete zaustaviti dodirom na OK."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
@@ -1941,8 +1938,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Korištenje ekrana od pune napunjenosti"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja ekrana"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skeniranje mobilne mreže"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Prije <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Korištenje aplikacije od potpunog punjenja (Prije <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Prije <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Korištenje aplikacije od potpunog punjenja (Prije <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Vrijeme koliko je ekran uključen od potpune napunjenosti"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Korištenje uređaja od potpune napunjenosti"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Potrošnja baterije od isključivanja s napajanja"</string>
@@ -1974,7 +1971,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Stanje mirovanja mobitela"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilna mreža u stanju mirovanja"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet u stanju mirovanja"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u stanju mirovanja"</string>
@@ -2034,7 +2031,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Potrošnja baterije je približna vrijednost potrošnje energije te ne uključuje svaki izvor potrošnje baterije. Nedefinisana potrošnja je razlika između izračunate približne potrošnje energije i stvarne potrošnje koja se uočava na bateriji."</string>
     <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="4383512863007718804">"Vrijeme korištenja: %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Koristi se <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>
@@ -2106,14 +2103,13 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Postavke glasovnog unosa i izlaza"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno pretraživanje"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android tastatura"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Govor"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Podešavanja govornog unosa"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Govorni unos"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Usluge govornog unosa"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"Cela aktuelna reč i interakcija"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"Jednostavno pretvaranje govora u tekst"</string>
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Ova usluga za glasovni unos će biti u mogućnosti da obavlja uvijek uključeno praćenje glasa i da u vaše ime kontrolira aplikacije omogućene glasom. Ona dolazi iz <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> aplikacija. Omogućiti korištenje ove usluge?"</string>
-    <string name="tts_engine_preference_title" msgid="1578826947311494239">"Željeni program"</string>
+    <string name="tts_engine_preference_title" msgid="1578826947311494239">"Željeni alat"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"Postavke programa"</string>
     <string name="tts_sliders_title" msgid="992059150784095263">"Brzina govora i visina glasa"</string>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"Program"</string>
@@ -2172,7 +2168,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Pohrana akreditiva je izbrisana."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Nije uspjelo bris. memorije vjerodaj."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohrana akreditiva je omogućena."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebate postaviti PIN za zaključavanje ekrana ili lozinku da biste mogli koristiti pohranu akreditiva."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebate postaviti PIN za zaključavanje ekrana ili lozinku da možete koristiti pohranu akreditiva."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Aplikacije s pristupom upotrebi"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton za hitne situacije"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Postavi ponašanje prilikom upućivanja poziva za hitne situacije"</string>
@@ -2184,7 +2180,7 @@
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Račun za rezervnu kopiju"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Uvrstite podatke aplikacije"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatsko obnavljanje"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"Prilikom ponovnog instaliranja aplikacije obnovi postavke i podatke iz rezervne kopije"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"Prilikom ponovnog instaliranja aplikacije, vraća sigurnosne kopije postavki i podataka"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"Usluga za izradu sigurnosne kopije nije aktivna"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Rezervna kopija podataka trenutno nije pohranjena ni na jednom računu"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
@@ -2211,7 +2207,7 @@
     <string name="admin_disabled_other_options" msgid="7712694507069054530">"Administrator je onemogućio ostale opcije"</string>
     <string name="admin_more_details" msgid="7901420667346456102">"Više detalja"</string>
     <string name="untitled_apn" msgid="1230060359198685513">"Bez naslova"</string>
-    <string name="sound_category_sound_title" msgid="1488759370067953996">"Opće"</string>
+    <string name="sound_category_sound_title" msgid="1488759370067953996">"Opće postavke"</string>
     <string name="notification_log_title" msgid="3766148588239398464">"Dnevnik obavještenja"</string>
     <string name="sound_category_call_ringtone_vibrate_title" msgid="1543777228646645163">"Melodija zvona telefona i vibracija"</string>
     <string name="sound_category_system_title" msgid="1480844520622721141">"Sistem"</string>
@@ -2281,7 +2277,7 @@
     <string name="preference_change_password_title" msgid="8955581790270130056">"Promijenite lozinku"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Postavke računa"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Ukloni račun"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"Dodajte račun"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Dodavanje računa"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Završi"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Ukloniti račun?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Uklanjanjem ovog računa će se izbrisati sve njegove poruke, kontakti i ostali podaci s tableta!"</string>
@@ -2313,7 +2309,7 @@
     <string name="data_usage_app" msgid="4970478397515423303">"Korištenje aplikacija"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"INFORMACIJE O APLIKACIJI"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilni podaci"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"Postavi ograničenje za podatke"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Postavljanje ograničenja za podatke"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Ciklus prijenosa podataka"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Korištenje aplikacije"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Roming podataka"</string>
@@ -2324,7 +2320,7 @@
     <string name="data_usage_menu_hide_wifi" msgid="7290056718050186769">"Sakrij Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Prikaži korištenje Etherneta"</string>
     <string name="data_usage_menu_hide_ethernet" msgid="3326702187179943681">"Sakrij korištenje podataka putem Etherneta"</string>
-    <string name="data_usage_menu_metered" msgid="6235119991372755026">"Ograničenja za mrežu"</string>
+    <string name="data_usage_menu_metered" msgid="6235119991372755026">"Mrežna ograničenja"</string>
     <string name="data_usage_menu_auto_sync" msgid="8203999775948778560">"Automatsko sinhroniziranje podataka"</string>
     <string name="data_usage_menu_sim_cards" msgid="6410498422797244073">"SIM kartice"</string>
     <string name="data_usage_menu_cellular_networks" msgid="8339835014751511300">"Mobilne mreže"</string>
@@ -2373,11 +2369,11 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Sve promjene koje napravite na svom web računu automatski se kopiraju na vaš telefon. \n\nNeki računi također mogu automatski kopirati na web promjene napravljene na telefonu. Google račun funkcioniše na ovaj način."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključiti automatsko sinhroniziranje podataka?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Ovim će se uštedeti na podacima i potrošnji baterije, ali ćete morati ručno sinhronizirati svaki račun da prikupite najnovije informacije. Također, nećete primati obavještenja kada se izvrše ažuriranja."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Poništi datum ciklusa korištenja"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum poništavanja ciklusa korištenja"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum svakog mjeseca:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Postavi"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavi upozorenje za prijenos podataka"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavite ograničenje za prijenos podataka"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavljanje upozorenja o prijenosu podataka"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavljanje ograničenja za prijenos podataka"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ograničavanje prijenosa podataka"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Vaš tablet će isključiti prijenos mobilnih podataka nakon što dostigne ograničenje koje ste postavili.\n\nS obzirom na to da vaš telefon mjeri prijenos podataka te da obračun vašeg operatera može biti drugačiji, uzmite u obzir postavljanje umjerenog ograničenja."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Vaš telefon će isključiti prijenos mobilnih podataka nakon što dostigne ograničenje koje ste postavili.\n\nS obzirom na to da vaš telefon mjeri prijenos podataka te da obračun vašeg operatera može biti drugačiji, uzmite u obzir postavljanje umjerenog ograničenja."</string>
@@ -2393,7 +2389,7 @@
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>: iskorišteno otprilike <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>: iskoristili ste oko <xliff:g id="TOTAL">%1$s</xliff:g> prema mjerenju tableta. Obračun operatera može biti drugačiji."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: iskoristili ste oko <xliff:g id="TOTAL">%1$s</xliff:g> prema mjerenju telefona. Obračun operatera može biti drugačiji."</string>
-    <string name="data_usage_metered_title" msgid="7383175371006596441">"Ograničenja za mreže"</string>
+    <string name="data_usage_metered_title" msgid="7383175371006596441">"Mrežna ograničenja"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Mjerene mreže tretiraju se kao mobilne kada je ograničeno korištenje pozadinskih podataka. Aplikacije mogu dati upozorenje prije korištenja takvih mreža za velika preuzimanja."</string>
     <!-- no translation found for data_usage_metered_mobile (5423305619126978393) -->
     <skip />
@@ -2453,7 +2449,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"Uredi profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Izbriši profil"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Uvijek aktivni VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Nisu dodani VPN-ovi"</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Nema dodanih VPN-ova"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"Ostanite stalno povezani na VPN"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Ova aplikacija ne podržava ovu funkciju"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Funkcija Uvijek uključeno je aktivna"</string>
@@ -2484,10 +2480,10 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Uklonjeni akreditiv: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Nisu instalirani korisnički akreditivi"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Provjera pravopisa"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ovdje unesite trenutnu lozinku za punu rezervnu kopiju"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ovdje unesite novu lozinku za potpune rezervne kopije"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ovdje ponovo otkucajte novu lozinku za punu rezervnu kopiju"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Postavi lozinku za rezervnu kopiju"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Ovdje unesite trenutnu lozinku za sigurnosnu kopiju čitavog sistema"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Ovdje unesite novu lozinku za sigurnosne kopije čitavog sistema"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Ovdje ponovo unesite novu lozinku za sigurnosnu kopiju čitavog sistema"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Postavi lozinku za sigurnosnu kopiju"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Otkaži"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Dodatna ažuriranja sistema"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Onemogućeno"</string>
@@ -2548,7 +2544,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Ograničeni profili ne mogu dodati račune"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Izbrišite <xliff:g id="USER_NAME">%1$s</xliff:g> sa uređaja"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Postavke zaključavanja ekrana"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodajte korisnike sa zaključanog ekrana"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Dodavanje korisnika sa zaključanog ekrana"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Novi korisnik"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Novi profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Želite li izbrisati sebe?"</string>
@@ -2568,8 +2564,8 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"Ukloniti gosta?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Sve aplikacije i podaci iz ove sesije će biti izbrisani."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Ukloniti"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"Uključite telefonske pozive"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Uključi telefonske pozive i SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"Uključivanje telefonskih poziva"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Uključivanje telefonskih poziva i SMS-ova"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Ukloni korisnika"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Uključiti telefonske pozive?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Historija poziva će se dijeliti s ovim korisnikom."</string>
@@ -2592,7 +2588,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Koristiti zadanu aplikaciju"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Uvijek"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Osim kada je otvorena druga aplikacija za plaćanje"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Na terminalu koji podržava uslugu Dodirni i plati plaćajte pomoću:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Na terminalu \"Dodirni i plati\" plaćajte pomoću:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Plaćanje na terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Postavite aplikaciju za plaćanje, zatim jednostavno prislonite poleđinu svog telefona uz bilo koji terminal označen simbolom beskontaktne komunikacije."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Razumijem"</string>
@@ -2620,7 +2616,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">"Emisije za hitne slučajeve"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Hitna emitiranja"</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>
@@ -2764,20 +2760,22 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zvono je postavljeno da vibrira"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zvono je utišano"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Jačina zvona je na 80%"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Jačina zvuka medijskog sadržaja"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Jačina zvuka medija"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Jačina zvuka alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Jačina zvona"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Jačina zvuka za obavještenja"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"Podrazumijevani zvuk obavještenja"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Zadani zvuk obavještenja"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvuk iz aplikacije"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Zadani zvuk obavještenja"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Zadani zvuk alarma"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Dodatna vibracija za pozive"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvukovi"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonovi tastature telefona"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvuk zaključavanja ekrana"</string>
-    <string name="charging_sounds_title" msgid="1132272552057504251">"Zvuk punjenja"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvukovi zaključavanja ekrana"</string>
+    <string name="charging_sounds_title" msgid="1132272552057504251">"Zvukovi punjenja"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Zvukovi priključne stanice"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Zvuci dodira"</string>
+    <string name="touch_sounds_title" msgid="5326587106892390176">"Zvukovi pri dodiru"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Vibracija na dodir"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Zvučnik priključne stanice reprodukuje zvuk"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Svi zvukovi"</string>
@@ -2793,7 +2791,7 @@
       <item quantity="other">Uključeno je <xliff:g id="ON_COUNT">%d</xliff:g> automatskih pravila</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Postavke funkcije Ne ometaj"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dopustiti samo prioritete"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Dozvoljeni su samo prioriteti"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatska pravila"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Postavite pravila za funkciju Ne ometaj"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Ograničite zvuk i vibracije u određenim vremenskim periodima"</string>
@@ -2801,7 +2799,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Samo alarmi"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Potpuna tišina"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizualnih prekida"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokiranje vizuelnih ometanja"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Zvuci radnog profila"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Koristite zvuke ličnog profila"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Zvuci su isti za radni i lični profil"</string>
@@ -2815,7 +2813,7 @@
     <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"Želite li dodati prilagođeni zvuk?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"Ovaj fajl će se kopirati u folder <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Melodije zvona"</string>
-    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ostali zvuci i vibracije"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Ostali zvukovi i vibracije"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Obavještenja"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Napredno"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Obavještenja za posao"</string>
@@ -2826,12 +2824,13 @@
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Uopće ne prikazuj obavještenja"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Kada je uređaj zaključan, na koji način želite prikazivati obavještenja?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Obavještenja"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Prikaži sadržaj svih poslovnih obavještenja"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Prikaži sav sadržaj obavještenja radnog profila"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Sakrij sadržaj osjetljivih poslovnih obavještenja"</string>
     <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">"Kako želite da se prikazuju obavještenja profila kada vam je uređaj zaključan?"</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="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>
     <string name="notification_importance_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavještenja"</string>
@@ -2839,13 +2838,13 @@
     <string name="notification_importance_low" msgid="8881468429453766553">"Bez zvuka"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Pusti zvuk"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Pusti zvuk i prikaži na ekranu"</string>
-    <string name="notification_importance_min_summary" msgid="8233873580287975662">"Niska: Bez zvuka ili vizuelnog ometanja"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Srednja: Bez zvuka"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Visoka: Reproduciraj zvuk"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Hitno: Reproduciraj zvuk i prikaži na ekranu"</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">"Hitno"</string>
     <string name="allow_sound" msgid="6585849855452076626">"Dopusti 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="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obavještenja"</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="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne mogu čitati obavještenja"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
@@ -2874,9 +2873,11 @@
     <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_on" msgid="6103704909710176555">"Da"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Ne"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Pristup Ne smetaj"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikaz obavještenja ove aplikacije na uređaju"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikaz ove kategorije obavještenja na uređaju"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Ostalo"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije objavila nikakva obavještenja"</string>
@@ -2919,7 +2920,7 @@
     <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>
-    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Odaberite tip pravila"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Odabir tipa pravila"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Želite li izbrisati pravilo “<xliff:g id="RULE">%1$s</xliff:g>”?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Izbriši"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Vrsta pravila"</string>
@@ -2954,16 +2955,16 @@
     <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_from_anyone" msgid="2638322015361252161">"Od bilo koga"</string>
-    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Samo iz kontakata"</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>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"Nijedno"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ništa"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmi"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Podsjetnici"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Događaji"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Svi pozivi"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Odabrani pozivaoci"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovljeni pozivaoci"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ako ista osoba zove drugi put u roku od <xliff:g id="MINUTES">%d</xliff:g> minutnog perioda, dopustite poziv"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Ponovni pozivaoci"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dopuštanje poziva ako ista osoba zove drugi put u roku od <xliff:g id="MINUTES">%d</xliff:g> min."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Automatski upaliti"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikad"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Svaku noć"</string>
@@ -2987,7 +2988,7 @@
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokiranje kada je ekran uključen"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Sprječavanje da obavještenja koja su utišana opcijom Ne ometaj iskaču na ekran"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokiranje kada je ekran isključen"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Sprječavanje da obavještenja koja su utišana opcijom Ne ometaj uključuju ekran ili trepereće svjetlo za obavještenja"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Sprječavanje da obavještenja koja su utišana opcijom Ne ometaj uključuju ekran ili izazovu pulsiranje svjetla za obavještenja"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Spriječite da obavještenja utišana načinom rada Ne ometaj uključuju ekran"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Isključeno"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Kada je ekran uključen"</string>
@@ -2997,7 +2998,7 @@
     <string name="device_feedback" msgid="3238056036766293294">"Pošaljite pov. inf. o ovom uređaju"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Upišite PIN kôd administratora"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Isključi"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Isključeno"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Kačenje ekrana"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Kada je ova postavka uključena, možete koristiti kačenje na ekran da zadržite trenutni ekran u prikazu sve dok ga ne otkačite.\n\nKorištenje kačenja ekrana:\n\n1. Provjerite da li je kačenje ekrana uključeno.\n\n2. Otvorite željeni ekran.\n\n3. Dodirnite Pregled.\n\n4. Prevucite prema gore, a zatim dodirnite ikonu za kačenje."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Traži unos obrasca prije poništavanja pribadanja"</string>
@@ -3009,23 +3010,19 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentalno)"</string>
     <string name="display_auto_rotate_title" msgid="7119684966039069439">"Rotacija uređaja"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Rotiraj sadržaj ekrana"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Ostani u portretnom prikazu"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Zadrži uspravni prikaz"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Ostani u vodoravnom prikazu"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ostani u trenutnoj orijentaciji"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sigurno pokretanje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Uređaj možete dodatno zaštiti tako da zahtijevate unošenje PIN-a prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke ili obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Uređaj možete dodatno zaštititi ako zahtijevate unošenje obrasca prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Uređaj možete dodatno zaštiti tako da zahtijevate unošenje lozinke prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke ili obavještenja, uključujući i aktiviranje alarma. \n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštititi ako zahtijevate unošenje PIN-a prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma.\n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštititi ako zahtijevate unošenje obrasca prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma.\n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštititi ako zahtijevate unošenje lozinke prije njegovog pokretanja. Prije pokretanja, uređaj ne može primati pozive, poruke i obavještenja, uključujući i aktiviranje alarma.\n\nNa ovaj način štite se podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Zahtijevaj unos PIN-a prilikom pokretanja uređaja"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Zahtijevaj unos obrasca prilikom pokretanja uređaja"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Zahtijevaj unos lozinke prilikom pokretanja uređaja"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ne, hvala"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Uređaj možete dodatno zaštiti tako što ćete tražiti PIN kôd prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži PIN kôd?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Uređaj možete dodatno zaštiti tako što ćete tražiti unošenje uzorka prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži unošenje uzorka?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Uređaj možete dodatno zaštiti tako što ćete tražiti lozinku prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži lozinka?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti tako što ćete tražiti PIN kôd prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži PIN kôd?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Osim korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti tako što ćete tražiti unošenje uzorka prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži unošenje uzorka?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Pored korištenja otiska prsta za otključavanje, uređaj možete dodatno zaštiti tako što ćete tražiti lozinku prije nego što se pokrene. Dok se uređaj ne pokrene, ne može primati pozive, poruke ili obavještenja, uključujući alarme. \n\nOvim se štite podaci na izgubljenim ili ukradenim uređajima. Želite li da se za pokretanje uređaja traži lozinka?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Zahtijevati PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Zahtijevati unos obrasca?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Zahtijevati lozinku?"</string>
@@ -3115,18 +3112,18 @@
     <string name="default_for_work" msgid="9152194239366247932">"Uobičajeno za rad"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Pomoć i glasovni unos"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplikacija za pomoć"</string>
-    <string name="assistant_security_warning_title" msgid="8673079231955467177">"Želite li da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> bude vaš pomoćnik?"</string>
-    <string name="assistant_security_warning" msgid="8498726261327239136">"Pomoćnik 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_title" msgid="8673079231955467177">"Želite li da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> bude vaš asistent?"</string>
+    <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="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 telefoniju"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Aplikacija za pozive"</string>
     <string name="default_app" msgid="6864503001385843060">"(Zadano)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistem)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Sistemski zadano)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Memorija aplikacija"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Pohrana aplikacija"</string>
     <string name="usage_access" msgid="5479504953931038165">"Pristup upotrebi"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Dopusti pristup korištenju"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Postavke upotrebe aplikacija"</string>
@@ -3143,7 +3140,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimizacija baterije"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Upozorenja za korištenje"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Obavještenja o upotrebi"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Prikaži sve aplikacije"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Sakrij dodatne aplikacije"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Bez optimizacije"</string>
@@ -3153,7 +3150,7 @@
     <string name="high_power_desc" msgid="6283926163708585760">"Ne primjenjuje se optimizacija baterije. Tako se baterija može brže isprazniti."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Želite li dopustiti aplikaciji da uvijek radi u pozadini?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Ako aplikaciji <xliff:g id="APP_NAME">%1$s</xliff:g> dopustite da uvijek radi u pozadini, može se skratiti vijek trajanja baterije. \n\nTo možete promijeniti kasnije ako odete u Postavke &gt; Aplikacije i obavještenja."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g>%% iskorištenosti od posljednje potpune napunjenosti"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> iskorištenosti od posljednje potpune napunjenosti"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Upravljanje napajanjem baterije"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Nema potrošnje baterije od prošlog potpunog punjenja"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Postavke aplikacije"</string>
@@ -3185,10 +3182,10 @@
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Korištenje uređaja kao MIDI"</string>
     <string name="background_check_pref" msgid="7550258400138010979">"Provjera u pozadini"</string>
     <string name="background_check_title" msgid="4534254315824525593">"Pun pristup pozadini"</string>
-    <string name="assist_access_context_title" msgid="2269032346698890257">"Koristi tekst sa ekrana"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"Dozvolite da aplikacija za pomoć pristupa sadržaju na ekranu kao tekstu"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Koristi snimku ekrana"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Dozvoli aplikaciji za pomoć da pristupi slici ekrana"</string>
+    <string name="assist_access_context_title" msgid="2269032346698890257">"Korištenje teksta sa ekrana"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"Omogućavanje aplikaciji za pomoć da pristupa sadržaju na ekranu kao tekstu"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Korištenje snimke ekrana"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Omogućavanje aplikaciji za pomoć da pristupa slici ekrana"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Bljeskanje ekrana"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Ivice ekrana bljeskaju kada aplikacija za pomoć pristupi tekstu s ekrana ili snimku ekrana"</string>
     <string name="assist_footer" msgid="1982791172085896864">"Aplikacije za pomoć vam mogu pomoći na osnovu informacija sa ekrana koji pregledate. Kako bi vam pružile sveukupnu pomoć, neke aplikacije podržavaju i usluge pokretača i glasovnog unosa."</string>
@@ -3205,7 +3202,7 @@
     <string name="total_memory" msgid="2017287600738630165">"Ukupno memorije"</string>
     <string name="average_used" msgid="5338339266517245782">"Prosječna iskorištenost (%)"</string>
     <string name="free_memory" msgid="4003936141603549746">"Slobodno"</string>
-    <string name="memory_usage_apps" msgid="5650192998273294098">"Korištenje memorije za aplikacije"</string>
+    <string name="memory_usage_apps" msgid="5650192998273294098">"Memorija koju koriste aplikacije"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> aplikacija je koristila memoriju u prethodnom periodu od <xliff:g id="DURATION_1">%2$s</xliff:g></item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikacije su koristile memoriju u prethodnom periodu od <xliff:g id="DURATION_1">%2$s</xliff:g></item>
@@ -3224,7 +3221,7 @@
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Baterija se može brže isprazniti"</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Preporučuje se za duže trajanje baterije"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Želite da dozvolite aplikaciji <xliff:g id="APP">%s</xliff:g> da ignoriše optimizacije baterije?"</string>
-    <string name="app_list_preference_none" msgid="108006867520327904">"Nijedno"</string>
+    <string name="app_list_preference_none" msgid="108006867520327904">"Ništa"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Isključivanjem pristupa korištenju za ovu aplikaciju nećete spriječiti administratora da prati podatke o korištenju u aplikacija u vašem radnom profilu."</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Iskorištenih znakova: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"Prikaz preko drugih aplikacija"</string>
@@ -3241,9 +3238,9 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacije s dozvolom"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Ne"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Instaliraj nepoznate aplikacije"</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">"Promjeni postavke sistema"</string>
+    <string name="write_settings" msgid="4797457275727195681">"Izmjena postavki sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"pisati izmijeniti sistemske postavke"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"Aplikacije sa dozvolom za mijenjanje postavki sistema: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"Mogu instalirati druge aplikacije"</string>
@@ -3255,14 +3252,14 @@
     <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_trusted" msgid="6857780460845250885">"Da"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ne"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Dopusti instaliranje aplikacija"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Dozvoljeno"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nije dozvoljeno"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Dva pritiska na napajanje za kameru"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Brzo otvaranje fotoaparata bez otključavanja ekrana"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"Veličina ekrana"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Veličina prikaza"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Povećavanje ili umanjivanje objekata na ekranu"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"gustoća prikaza, uvećanje ekrana, promijeni veličinu, mijenjanje veličine"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"Smanjite ili povećajte objekte na ekranu. Neke aplikacije sa vašeg ekrana mogu promijeniti svoj položaj."</string>
@@ -3280,7 +3277,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Uto 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Uto 18:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"Nije povezano"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> podataka u upotrebi"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Iskorišteno <xliff:g id="AMOUNT">%1$s</xliff:g> podataka"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one">Isključeno za <xliff:g id="COUNT">%d</xliff:g> aplikaciju</item>
       <item quantity="few">Isključeno za <xliff:g id="COUNT">%d</xliff:g> aplikacije</item>
@@ -3297,9 +3294,9 @@
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="USED_MEMORY">%1$s</xliff:g> prosječno od ukupno <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> iskorištene memorije"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Trenutni korisnik: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Prijavljeni ste kao korisnik <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> aplikacija je standardna"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"UKLJUČEN / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"ISKLJUČEN"</string>
+    <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> je zadana aplikacija"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"UKLJUČENO/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_off_summary" msgid="6474350053215707957">"ISKLJUČENO"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Pravljenje sigurnosnih kopija je onemogućeno"</string>
     <string name="about_summary" msgid="924181828102801010">"Ažurirano na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Radnja nije dozvoljena"</string>
@@ -3318,7 +3315,7 @@
     <string name="condition_expand_show" msgid="608202020023489939">"Prikaži"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"Sakrij"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot je na"</string>
-    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prijenosni Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> je aktivan, Wi-Fi za ovaj uređaj je isključen."</string>
+    <string name="condition_hotspot_summary" msgid="3433182779269409683">"Prijenosna Wi-Fi pristupna tačka <xliff:g id="ID_1">%1$s</xliff:g> je aktivna. Wi-Fi je isključen za ovaj uređaj."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Airplane način rada je uključen"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth i mobilna mreža su isključeni. Ne možete telefonirati niti se povezati na internet."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Usluga Ne ometaj je podešena na (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
@@ -3341,8 +3338,8 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Da primijenite promjenu na nadzoru telefonije, ponovo pokrenite uređaj"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Automatsko ažuriranje sistema"</string>
     <string name="usage" msgid="2977875522080448986">"Upotreba"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Prijenos mobilnih podataka"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Prijenos podataka putem Wi-Fi-ja"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Potrošnja mobilnih podataka"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Potrošnja Wi-Fi podataka"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Prijenos podataka putem Etherneta"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
@@ -3352,9 +3349,9 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Upozorenje o podacima <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozorenje o podacima <xliff:g id="ID_1">%1$s</xliff:g> / Ograničenje podataka <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Obračunski ciklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mjesečni ciklus počinje na <xliff:g id="ID_1">%1$s</xliff:g> svakog mjeseca"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mjesečno od <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="network_restrictions" msgid="8234695294536675380">"Ograničenje mreže"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mjesečni ciklus počinje svakog <xliff:g id="ID_1">%1$s</xliff:g>. u mjesecu"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Svakog mjeseca od <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="network_restrictions" msgid="8234695294536675380">"Mrežna ograničenja"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> ograničenje</item>
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> ograničenja</item>
@@ -3362,11 +3359,11 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Obračun podataka koji vrši operater se može razlikovati od obračuna koji vrši uređaj."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Postavite upozorenje o podacima"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Postavi upozorenje o podacima"</string>
     <string name="data_warning" msgid="209133958008062117">"Upozorenje o podacima"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Postavi ograničenje za podatke"</string>
     <string name="data_limit" msgid="1885406964934590552">"Ograničenje za podatke"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno u razdoblju <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_1">%1$s</xliff:g> iskorišteno u razdoblju: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="configure" msgid="1029654422228677273">"Konfiguracija"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Ostale aplikacije uključene u upotrebu"</string>
     <plurals name="data_saver_unrestricted_summary" formatted="false" msgid="2635267833484232703">
@@ -3381,7 +3378,7 @@
     <string name="data_saver_off" msgid="6892309031162738794">"Isključeno"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Neograničeni prijenos podataka"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Dopusti neograničen pristup podacima kada je Ušteda podataka uključena"</string>
-    <string name="home_app" msgid="4066188520886810030">"Početna aplikacija"</string>
+    <string name="home_app" msgid="4066188520886810030">"Aplikacija na početnom ekranu"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Nema zadane početne aplikacije"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Sigurno pokretanje"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Zahtijeva uzorak za pokretanje vašeg uređaja. Dok je isključen, ovaj uređaj ne može primati pozive, poruke, obavijesti ili alarme."</string>
@@ -3398,7 +3395,7 @@
     <string name="default_spell_checker" msgid="8506899870026026660">"Zadani kontrolor pravopisa"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Odaberite kontrolora pravopisa"</string>
     <string name="spell_checker_not_selected" msgid="8871083796179200696">"Nije odabrano"</string>
-    <string name="notification_log_no_title" msgid="5678029849672024215">"(nijedan)"</string>
+    <string name="notification_log_no_title" msgid="5678029849672024215">"(ništa)"</string>
     <string name="notification_log_details_delimiter" msgid="3116559361552416747">": "</string>
     <string name="notification_log_details_package" msgid="2596495677039100284">"pkg"</string>
     <string name="notification_log_details_key" msgid="2995791937075862968">"ključ"</string>
@@ -3424,7 +3421,7 @@
     <string name="notification_log_details_sound" msgid="5506232879598808099">"zvuk"</string>
     <string name="notification_log_details_vibrate" msgid="6890065466625335940">"vibriraj"</string>
     <string name="notification_log_details_default" msgid="2345249399796730861">"standardno/default"</string>
-    <string name="notification_log_details_none" msgid="184131801230614059">"nijedan"</string>
+    <string name="notification_log_details_none" msgid="184131801230614059">"ništa"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangirani objekt nedostaje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangirani objekt ne sadrži ovu tipku."</string>
     <string name="special_access" msgid="3458780842491881155">"Poseban pristup aplikacijama"</string>
@@ -3443,11 +3440,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Podrška"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmanja širina"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Nijedna instalirana aplikacija nije zatražila Premium SMS pristup"</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>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Premium SMS pristup"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Pristup premijum SMS-ovima"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Nije vidljivo drugim uređajima"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Povezan sa"</string>
+    <string name="bluetooth_connected_summary" msgid="7672528674593152862">"Povezan s uređajem <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="bluetooth_connected_multiple_devices_summary" msgid="9173661896296663932">"Povezan s više uređaja"</string>
     <string name="demo_mode" msgid="2798762752209330277">"Način demonstracije Sistemskog UI-a"</string>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice programera za brze postavke"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Mi smo tu da pomognemo"</string>
@@ -3463,7 +3461,7 @@
     <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">"Putujete u inostranstvo?"</string>
     <string name="support_international_phone_summary" msgid="208231793637026927">"Mogući su troškovi za međunarodne pozive"</string>
-    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
+    <string name="support_escalation_by_phone" msgid="4843223043487058711">"Pozovi"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Pokreni razgovor"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Istražite savjete i trikove"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"Pretražite pomoć i pošaljite povratne informacije"</string>
@@ -3512,24 +3510,24 @@
     <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">"Idi na Kameru"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Za brzo otvaranje kamere, dvaput dodirnite dugme za uključivanje. Funkcionira na svakom ekranu."</string>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Prebaci kameru"</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>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Okretanje kamere"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Da nabrzinu provjerite obavještenja, dvaput dodirnite ekran."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite za provjeru telefona"</string>
+    <string name="ambient_display_summary" msgid="2521630136233865893">"Dodirivanje ekrana dvaput za brzu provjeru obavještenja."</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>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Da nabrzinu provjerite obavještenja, podignite telefon."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Da nabrzinu provjerite obavještenja, podignite tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Da nabrzinu provjerite obavještenja, podignite uređaj."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prevucite otisak prsta za obavještenja"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini telefona."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini tableta."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da provjerite obavještenja, prevucite prema dolje na senzoru otiska prsta na poleđini uređaja."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Podizanje telefona za brzu provjeru obavještenja."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Podizanje tableta za brzu provjeru obavještenja."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Podizanje uređaja za brzu provjeru obavještenja."</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 otiska 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 otiska 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 otiska prsta na poleđini uređaja."</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>
@@ -3551,7 +3549,7 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"Automatsko sinhroniziranje podataka"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Automatsko sinhroniziranje ličnih podataka"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Automatsko sinhroniziranje radnih podataka"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"Dozvoli aplikacijama da automatski osvježavaju podatke"</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="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>
@@ -3566,7 +3564,7 @@
     <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Najskoriji zapis mrežnog prometa"</string>
     <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Najnoviji izvještaj o greškama"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Najnoviji zapisnik o aktivnostima"</string>
-    <string name="enterprise_privacy_none" msgid="7706621148858381189">"Nijedno"</string>
+    <string name="enterprise_privacy_none" msgid="7706621148858381189">"Nema"</string>
     <string name="enterprise_privacy_enterprise_installed_packages" msgid="6353757812144878828">"Aplikacije su instalirane"</string>
     <string name="enterprise_privacy_apps_count_estimation_info" msgid="7433213592572082606">"Broj aplikacija je samo procjena. Možda nisu obuhvaćene aplikacije koje su instalirane izvan Play trgovine."</string>
     <plurals name="enterprise_privacy_number_packages_lower_bound" formatted="false" msgid="3005116533873542976">
@@ -3634,7 +3632,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Druge aplikacije"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fajlovi"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Pohrana na tabletu"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pohrana telefona"</string>
+    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pohrana na telefonu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Iskorišteno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"iskor."</string>
@@ -3646,7 +3644,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Želite li aplikaciju <xliff:g id="APP_NAME_0">%1$s</xliff:g> postaviti kao svoju aplikaciju za popunjavanje? Aplikacija <xliff:g id="APP_NAME_1">%1$s</xliff:g> će moći čitati sadržaj s vašeg ekrana i popunjavati polja u drugim aplikacijama."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Vodite računa da je to pouzdana aplikacija&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; koristi sadržaj na vašem ekranu da odredi šta se može automatski popuniti."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
     <string name="default_theme" msgid="7085644992078579076">"Zadano"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohranom: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 211fc65..0006c92 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="8166647333858618801">"Petita"</item>
     <item msgid="6986443533756848935">"Predeterminat"</item>
     <item msgid="38373998008112077">"Gran"</item>
-    <item msgid="7635254317531872272">"Màxim"</item>
+    <item msgid="7635254317531872272">"Més grans possible"</item>
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Cap"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Cap"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -379,7 +381,7 @@
     <item msgid="9039213578110332702">"Volum d\'accessibilitat"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Curt"</item>
+    <item msgid="3511504869290423954">"Breu"</item>
     <item msgid="2560532955514699713">"Mitjà"</item>
     <item msgid="2372711992605524591">"Llarg"</item>
   </string-array>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 79f979b..680f605 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -78,7 +78,7 @@
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Esborra la targeta SD"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"Previsualització"</string>
     <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"Previsualització, pàgina <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> (<xliff:g id="NUM_PAGES">%2$d</xliff:g> en total)"</string>
-    <string name="font_size_summary" msgid="1690992332887488183">"Amplia o redueix el text de la pantalla."</string>
+    <string name="font_size_summary" msgid="1690992332887488183">"Amplia o redueix la mida del text de la pantalla."</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"Redueix"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"Amplia"</string>
     <!-- no translation found for font_size_preview_text (4818424565068376732) -->
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicació"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Seguretat i ubicació"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptació i credencials"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telèfon encriptat"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferències de la pantalla de bloqueig"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telèfon encriptat"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferències de pantalla de bloqueig"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privadesa"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desactivada per l\'administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estat de seguretat"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueig de pantalla i empremta digital"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueig de pantalla"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Empremta digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gest. empremtes digit."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Util. empr. digit. per"</string>
@@ -362,9 +361,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="8386444182056861429">"Afegeix empremta digital"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones facin servir la tauleta si la perds, si te la roben o se n\'esborra el contingut."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones el facin servir si el perds, te\'l roben o se n\'esborra el contingut."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones facin servir el telèfon si el perds, te\'l roben o se n\'esborra el contingut."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones facin servir la tauleta si la perds, si te la roben o se n\'esborren les dades."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones el facin servir si el perds, te\'l roben o se n\'esborren les dades."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones facin servir el telèfon si el perds, te\'l roben o se n\'esborren les dades."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin la tauleta si la perds o te la roben."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin el dispositiu si el perds o te\'l roben."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Les funcions de protecció del dispositiu no s\'activaran. No podràs impedir que altres persones utilitzin el telèfon si el perds o te\'l roben."</string>
@@ -441,7 +440,7 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protegeix el teu dispositiu"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utilitza l\'empremta digital"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloqueja el dispositiu amb l\'empremta digital"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Tria un bloqueig de pantalla"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Bloqueig de pantalla"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Tria bloq. profess."</string>
     <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>
@@ -570,7 +569,7 @@
     <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>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplicacions de l\'administrador del dispositiu"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Aplicacions d\'administració del dispositiu"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"No hi ha aplicacions actives"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicacions actives</item>
@@ -624,8 +623,8 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Dessincronitza"</string>
     <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">"Avançades"</string>
-    <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avançat"</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_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_specific_profiles_title" msgid="6952214406025825164">"Connecta\'t a..."</string>
@@ -648,7 +647,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Com a telèfon amb altaveu"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Per a música i contingut multimèdia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Recorda la configuració"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emet pantalla"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Emet"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activa pantalla sense fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No s\'ha trobat cap dispositiu a prop."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"S\'està connectant"</string>
@@ -671,7 +670,7 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Activa l\'NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"L\'NFC permet que aquest dispositiu pugui intercanviar dades amb altres dispositius o objectius propers, com ara terminals de pagament, lectors d\'accés o anuncis i etiquetes interactius."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Preparat per compartir contingut d\'aplicacions mitjançant NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Preparat per compartir contingut d\'aplicacions per NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivat"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible perquè la funció NFC està desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notifica\'m quan hi hagi una xarxa pública d\'alta qualitat"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activa la Wi‑Fi automàticament"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"La Wi-Fi es tornarà a activar automàticament en detectar xarxes desades d\'alta qualitat, com ara la teva xarxa domèstica"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"No està disponible perquè la cerca de xarxes Wi-Fi està desactivada"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Només connexions estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"No utilitzis una xarxa Wi-Fi tret que tingui una bona connexió a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilitza només les xarxes amb una bona connexió a Internet."</string>
@@ -721,13 +721,13 @@
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"PIN de WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi-Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Cerca"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avançat"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Configuració avançada"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"Configura"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connecta\'t a la xarxa"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Recorda la xarxa"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esborra la xarxa"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica la xarxa"</string>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escriu a l\'etiqueta de NFC"</string>
+    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escriu a l\'etiqueta d\'NFC"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Per veure les xarxes disponibles, activa la Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"S\'estan cercant xarxes Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"No tens permís per canviar la xarxa Wi‑Fi."</string>
@@ -784,7 +784,7 @@
     <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_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ó, vés a Opcions avançades al menú addicional."</string>
+    <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"Per desactivar aquesta funció, vés a Configuració avançada al menú addicional."</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permet"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denega"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"Vols iniciar la sessió per connectar-te?"</string>
@@ -809,15 +809,13 @@
       <item quantity="other">%d xarxes</item>
       <item quantity="one">1 xarxa</item>
     </plurals>
-    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi avançada"</string>
+    <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Config. avançada de Wi-Fi"</string>
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configura la 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Màscara de la subxarxa"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adreces IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Xarxes desades"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configuració IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"La configuració avançada de la Wi‑Fi no està disponible per a aquest usuari"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivat"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Per controlar què passa quan el telèfon està acoblat a una base o en mode de repòs, activa l\'estalvi de pantalla."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quan començar"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Estalvi de pantalla actual"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comença ara mateix"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuració"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
-    <string name="lift_to_wake_title" msgid="4555378006856277635">"Aixeca\'l per reactivar-lo"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Pantalla de notificació entrant"</string>
+    <string name="lift_to_wake_title" msgid="4555378006856277635">"Aixeca el dispositiu per activar-lo"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Pantalla Ambient"</string>
     <string name="doze_summary" msgid="3846219936142814032">"La pantalla s\'activa quan arriben notificacions"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Mida de la lletra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Amplia o redueix el text"</string>
@@ -1280,7 +1277,7 @@
     <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 la xarxa"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Restableix la configuració de xarxa"</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>
@@ -1380,10 +1377,10 @@
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utilitza el GPS, la Wi-Fi, el Bluetooth o les xarxes de telefonia mòbil per determinar la ubicació"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utilitza la Wi‑Fi, el Bluetooth o les xarxes de telefonia mòbil per determinar la ubicació"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utilitza el GPS per determinar la ubicació"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Anàlisi"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Cerca de Wi‑Fi"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Cerca"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Cerca de xarxes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Millora la ubicació permetent que les aplicacions i els serveis del sistema detectin les xarxes Wi‑Fi en qualsevol moment."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Cerca de Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Cerca de dispositius Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Millora la ubicació permetent que les aplicacions i els serveis del sistema detectin els dispositius Bluetooth en qualsevol moment."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Ubicació p. Wi-Fi i xarxa mòb."</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Permet que les aplicacions utilitzin el servei d\'ubicació de Google per calcular la teva ubicació més ràpidament. Es recopilaran dades d\'ubicació anònimes i s\'enviaran a Google."</string>
@@ -1489,7 +1486,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ó de l\'aplicació"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Informació d\'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">"Orígens desconeguts"</string>
@@ -1556,7 +1553,7 @@
     <string name="disabled" msgid="9206776641295849915">"Desactivat"</string>
     <string name="not_installed" msgid="2797554494953450291">"No instal·lada per a l\'usuari"</string>
     <string name="installed" msgid="3070865169422600098">"Instal·lada"</string>
-    <string name="no_applications" msgid="7336588977497084921">"No hi ha aplicacions."</string>
+    <string name="no_applications" msgid="7336588977497084921">"No hi ha cap aplicació."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Emmagatzematge intern"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"emmagatzematge intern"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Emmagatzematge USB"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Botiga"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Informació de l\'aplicació"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"L\'aplicació s\'ha instal·lat des de: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Més informació a <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacions d\'aplicacions"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"S\'està executant"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(No s\'ha utilitzat mai)"</string>
@@ -1664,7 +1662,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Si atures aquest servei, és possible que hi hagi funcions del telèfon que deixin de funcionar correctament fins que no l\'apaguis i el tornis a engegar."</string>
     <string name="language_settings" msgid="8758655933029560944">"Idiomes i introducció de text"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Idiomes i introducció de text"</string>
-    <string name="input_assistance" msgid="7577795275222555487">"Assistència amb la introducció de text"</string>
+    <string name="input_assistance" msgid="7577795275222555487">"Assistència per a la introducció de text"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Teclat i mètodes d\'introducció"</string>
     <string name="phone_language" msgid="7116581601133118044">"Idiomes"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1676,7 +1674,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configuració del teclat físic"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Premeu la tecla d\'espai dos cops per inserir \".\""</string>
     <string name="show_password" msgid="4837897357002495384">"Mostra les contrasenyes"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Mostra breument els caràcters mentre escrius"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Mostra els caràcters breument mentre escrius"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"És possible que aquest corrector ortogràfic pugui recopilar tot el text que escrius, la qual cosa inclou dades personals com ara les contrasenyes i els números de les targetes de crèdit. Prové de l\'aplicació <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vols fer servir aquest corrector ortogràfic?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuració"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Auxiliar 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>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Ratolí/ratolí tàctil"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocitat del punter"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de joc"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilitza el vibrador"</string>
@@ -1717,7 +1714,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Edició de la paraula"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Edita"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Suprimeix"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"No tens cap paraula al diccionari de l\'usuari. Per afegir-ne una, toca el botó Afegeix (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"No tens cap paraula al diccionari de l\'usuari. Toca el botó Afegeix (+) per afegir-n\'hi una."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Per a tots els idiomes"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Més idiomes..."</string>
     <string name="testing" msgid="6584352735303604146">"Proves"</string>
@@ -1776,10 +1773,10 @@
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Amplia amb el botó"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Amplia amb el botó i tres tocs"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Amplia la pantalla"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca tres cops per ampliar la imatge"</string>
-    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toca un botó per ampliar la pantalla"</string>
-    <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>"Pessiga amb dos dits o més per ajustar el zoom"</li></ul>\n\n<b>"Per ampliar la imatge temporalment"</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 ampliar el teclat ni 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-la"</li>\n<li>"Pessiga amb 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 ampliar el teclat ni la barra de navegació."</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca tres cops per fer zoom"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toca un botó per fer zoom"</string>
+    <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_shortcut_service_title" msgid="4779360749706905640">"Servei associat a la drecera"</string>
@@ -1792,7 +1789,7 @@
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Punter de ratolí gran"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Àudio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combina els canals en reproduir àudio"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retard en tocar i mantenir premut"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retard en mantenir premut"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inversió de color"</string>
     <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>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ús 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 de telefonia mòbil"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Fa <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Ús de les aplicacions des de l\'última càrrega completa (fa <xliff:g id="TIME">%1$s</xliff:g>)"</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="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>
@@ -1936,7 +1933,7 @@
     <string name="awake" msgid="387122265874485088">"Temps d\'activació del dispositiu"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a temps"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Ús avançat de la bateria"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Configuració avançada de l\'ús 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="details_subtitle" msgid="32593908269911734">"Detalls d\'ús"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Càmera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Dispositiu inactiu"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Xarxa de telefonia mòbil inactiva"</string>
     <string name="power_phone" msgid="5392641106474567277">"Trucades de veu"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tauleta inactiva"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telèfon inactiu"</string>
@@ -2007,16 +2004,16 @@
     <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_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="4383512863007718804">"S\'ha utilitzat durant %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"S\'ha utilitzat durant <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_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="4701358808575132647">"El temps restant de la bateria és aproximat i pot variar en funció de l\'ús"</string>
-    <string name="battery_detail_foreground" msgid="3350401514602032183">"Quan s\'està utilitzant"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"Quan està en segon pla"</string>
+    <string name="battery_footer_summary" msgid="4701358808575132647">"El temps de bateria restant és aproximat i pot variar en funció de l\'ús"</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_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'ús total de l\'aplicació (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</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="estimated_time_left" msgid="7514194472683370877">"Temps estimat restant"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuració d\'entrada i sortida de veu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Cerca per veu"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclat Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Veu"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Configuració de l\'entrada de veu"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Entrada de veu"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Serveis d\'entrada de veu"</string>
@@ -2127,7 +2123,7 @@
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</string>
     <string name="user_credentials" msgid="3719013347787187083">"Credencials d\'usuari"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"Mostra i modifica les credencials emmagatzemades"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avançada"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"Configuració avançada"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipus d\'emmagatzematge"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Emmagatzemat en maquinari"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Només programari"</string>
@@ -2145,8 +2141,8 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Emmagatzematge de credencials esborrat."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"L\'emmagatzematge de credencials no s\'ha esborrat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"L\'emmagatzematge de credencials està activat."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Has d\'establir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Aplicacions amb accés d\'ús"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Has de definir un PIN o una contrasenya a la pantalla de bloqueig per poder fer servir l\'emmagatzematge de credencials."</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apps amb accés a dades d\'ús"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"To d\'emergència"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Defineix el comportament quan es fa una trucada d\'emergència"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Còpia de seguretat"</string>
@@ -2169,7 +2165,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Desactiva aquesta aplicació d\'administració del dispositiu"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstal·la l\'aplicació"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Desactiva i desinstal·la"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplicacions de l\'administrador del dispositiu"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplicacions d\'administració del dispositiu"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"No hi ha cap aplicació d\'administració disponible"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Professional"</string>
@@ -2246,7 +2242,7 @@
     <string name="sync_one_time_sync" msgid="3733796114909082260">"Toca per sincronitzar ara<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
-    <string name="sync_calendar" msgid="9056527206714733735">"Calendari"</string>
+    <string name="sync_calendar" msgid="9056527206714733735">"Calendar"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"Contactes"</string>
     <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Et donem la benvinguda a Google Sync!"</font>" \nLa sincronització de dades que ha ideat Google per permetre l\'accés als contactes, a les cites i a molts més elements des de qualsevol lloc."</string>
     <string name="header_application_sync_settings" msgid="6205903695598000286">"Configuració de la sincronització d\'aplicacions"</string>
@@ -2340,11 +2336,11 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Els canvis que facis als comptes des del web es reflectiran automàticament al telèfon.\n\nÉs possible que alguns comptes també reflecteixin al web els canvis que hagis fet al telèfon. Així funcionen els comptes de Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desactivar sincronització automàtica?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Et permetrà estalviar dades i bateria, però hauràs de sincronitzar cada compte manualment per obtenir la informació recent. I no rebràs notificacions quan hi hagi actualitzacions."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de restabliment del cicle d\'ús"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data d\'inici del cicle d\'ús"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mes:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Estableix"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Defineix l\'advertiment d\'ús de dades"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Defineix el límit d\'ús de dades"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Defineix un advertiment d\'ús de dades"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Defineix un límit d\'ús de dades"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitació de l\'ús de dades"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Es desactivaran les dades mòbils de la tauleta quan s\'arribi al límit que has definit.\n\nCom que la tauleta mesura l\'ús de dades i és possible que l\'operador de telefonia mòbil en faci un recompte diferent, et recomanem que defineixis un límit prudent."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Es desactivaran les dades mòbils del telèfon quan s\'arribi al límit que has definit.\n\nCom que el telèfon mesura l\'ús de dades i és possible que l\'operador de telefonia mòbil en faci un recompte diferent, et recomanem que defineixis un límit prudent."</string>
@@ -2536,7 +2532,7 @@
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Vols activar les trucades?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"L\'historial de trucades es compartirà amb aquest usuari."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vols activar les trucades i els SMS?"</string>
-    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historial de trucades i de SMS es compartirà amb aquest usuari."</string>
+    <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"L\'historial de trucades i d\'SMS es compartirà amb aquest usuari."</string>
     <string name="emergency_info_title" msgid="208607506217060337">"Informació d\'emergència"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Informació i contactes de: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Permet aplicacions i contingut"</string>
@@ -2548,13 +2544,13 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toca i paga"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Com funciona"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Paga a les botigues amb el telèfon"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Aplicació predeterminada per als pagaments"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Aplicació de pagament predeterminada"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"No definida"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Utilitza l\'aplicació predeterminada"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Sempre"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Excepte quan hi hagi oberta una altra aplicació de pagament"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"En un terminal que admeti la funció Toca i paga, paga amb:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"En un terminal que tingui la funció Toca i paga, paga amb:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Pagar a la terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configura una aplicació de pagament. A continuació, apropa la part posterior del telèfon a un terminal amb el símbol de pagament sense contacte."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"D\'acord"</string>
@@ -2572,9 +2568,9 @@
     <string name="user_picture_title" msgid="7297782792000291692">"Identificador de la foto"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Amenaces extremes"</string>
     <string name="extreme_threats_summary" msgid="8777860706500920667">"Rep alertes d\'amenaces extremes per a la vida i la propietat."</string>
-    <string name="severe_threats_title" msgid="8362676353803170963">"Amenaces extremes"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Rep alertes d\'amenaces extremes per a la vida i la propietat."</string>
-    <string name="amber_alerts_title" msgid="2772220337031146529">"Alertes d\'AMBER"</string>
+    <string name="severe_threats_title" msgid="8362676353803170963">"Amenaces greus"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Rep alertes d\'amenaces greus per a la vida i la propietat."</string>
+    <string name="amber_alerts_title" msgid="2772220337031146529">"Alertes AMBER"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Rep butlletins sobre segrestos infantils."</string>
     <string name="repeat_title" msgid="6473587828597786996">"Repetició"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"Activació del gestor de trucades"</string>
@@ -2712,7 +2708,7 @@
     <string name="keywords_gesture" msgid="5696040361482126337">"gest"</string>
     <string name="keywords_payment_settings" msgid="5220104934130446416">"paga, toca, pagaments"</string>
     <string name="keywords_backup" msgid="470070289135403022">"còpia de seguretat, crear una còpia de seguretat"</string>
-    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta de NFC per a Wi-Fi"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta d\'NFC per a Wi-Fi"</string>
     <string name="write_tag" msgid="8571858602896222537">"Escriu-hi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta per escriure..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"La contrasenya no és vàlida. Torna-ho a provar."</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volum de notificació"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"So de trucada"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"So de notificació predeterminat"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"So de l\'aplicació"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"So de notificació predeterminat"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"So d\'alarma predeterminat"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibra també en trucades"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Altres sons"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Com vols que es mostrin les notificacions del perfil quan el dispositiu estigui bloquejat?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificacions del perfil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificacions"</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_blocked" msgid="7938180808339386300">"No mostris mai notificacions"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Baix: sense so ni interrupcions visuals"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Mitjà: sense so"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Alt: amb so"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgent: amb so i una 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Assistent de notificacions"</string>
@@ -2812,7 +2811,7 @@
       <item quantity="other">%d aplicacions poden llegir notificacions</item>
       <item quantity="one">%d aplicació pot llegir notificacions</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"Cap aplicació instal·lada ha sol·licitat accés a les notificacions."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"Cap aplicació instal·lada no ha sol·licitat accés a les notificacions."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Vols que <xliff:g id="SERVICE">%1$s</xliff:g> tingui accés a les notificacions?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions, inclosa la informació personal, com ara els noms dels contactes i el text dels missatges que rebis. També podrà ignorar les notificacions o activar els botons d\'acció que continguin. \n\nL\'aplicació també podrà activar i desactivar el mode No molestis i canviar la configuració que hi estigui relacionada."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Si desactives l\'accés a les notificacions per a <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, és possible que també es desactivi l\'accés al mode No molestis."</string>
@@ -2833,9 +2832,11 @@
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permet que aquesta aplicació creï una finestra d\'imatge en imatge 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_on" msgid="6103704909710176555">"Sí"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Accés No molestis"</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"Cap aplicació instal·lada no ha sol·licitat accés No molestis."</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android està impedint que les notificacions d\'aquesta aplicació es mostrin en aquest dispositiu"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android està impedint que les notificacions d\'aquesta categoria es mostrin en aquest dispositiu"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Altres"</string>
     <string name="no_channels" msgid="3077375508177744586">"No hi ha cap notificació per a aquesta aplicació"</string>
@@ -2939,12 +2940,12 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Canvia al mode Només alarmes fins a les <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Canvia al mode Interromp sempre"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloqueja quan la pantalla està activada"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloqueja amb pantalla activada"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Evita que les notificacions silenciades pel mode No molestis apareguin a la pantalla"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloqueja quan la pantalla està desactivada"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloqueja amb pantalla desactivada"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Evita que les notificacions silenciades pel mode No molestis activin la pantalla o el llum de notificació"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Evita que les notificacions silenciades pel mode No molestis activin la pantalla"</string>
-    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desactivades"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desactivat"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Quan la pantalla està activada"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Quan la pantalla està desactivada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Quan la pantalla està activada o desactivada"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desactivat"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixació de pantalla"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Si aquesta opció està activada, pots fixar la pantalla per mantenir-la visible fins que desactivis aquesta opció.\n\nPer fer-ho:\n\n1. Assegura\'t que l\'opció per fixar la pantalla estigui activada.\n\n2. Obre la pantalla que vulguis fixar.\n\n3. Toca Aplicacions recents.\n\n4. Fes lliscar el dit cap amunt i toca la icona de fixació."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Si aquesta opció està activada, pots fixar la pantalla per mantenir-la visible fins que deixis de fixar-la.\n\nPer fer-ho:\n\n1. Assegura\'t que la fixació de pantalla estigui activada.\n\n2. Obre la pantalla que vulguis fixar.\n\n3. Toca Aplicacions recents.\n\n4. Fes lliscar el dit cap amunt i toca la icona de fixació."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Sol·licita el patró de desbloqueig per anul·lar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demana el codi PIN per anul·lar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demana la contrasenya per anul·lar"</string>
@@ -2969,21 +2970,17 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Continua amb l\'orientació actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inici segur"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Per augmentar la protecció del dispositiu, pots sol·licitar un PIN abans d\'iniciar-lo. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nAixò permet protegir les dades en cas de pèrdua o robatori del dispositiu."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Per augmentar la protecció del dispositiu, pots sol·licitar un patró abans d\'iniciar-lo. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nAixò permet protegir les dades en cas de pèrdua o robatori del dispositiu."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Per augmentar la protecció del dispositiu, pots sol·licitar una contrasenya abans d\'iniciar-lo. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nAixò permet protegir les dades en cas de pèrdua o robatori del dispositiu."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció sol·licitant un PIN abans d\'iniciar-lo. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció sol·licitant un patró abans d\'iniciar-lo. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció sol·licitant una contrasenya abans d\'iniciar-lo. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Sol·licita un PIN per iniciar el dispositiu"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Sol·licita un patró per iniciar el dispositiu"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Sol·licita una contrasenya per iniciar el dispositiu"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"No, gràcies"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"No, gràcies"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"No, gràcies"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Per augmentar la protecció del dispositiu, pots configurar-lo perquè demani un PIN abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un PIN per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Per augmentar la protecció del dispositiu, pots configurar-lo perquè demani un patró abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un patró per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Per millorar la protecció del dispositiu, pots configurar-lo perquè sol·liciti una contrasenya abans d\'iniciar-se. Fins que no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que sol·liciti una contrasenya en iniciar-se?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un PIN abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un PIN per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani un patró abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani un patró per iniciar-se?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"A més de fer servir l\'empremta digital per desbloquejar el dispositiu, pots augmentar-ne la protecció configurant-lo perquè demani una contrasenya abans d\'iniciar-se. Fins que el dispositiu no s\'iniciï, no podrà rebre trucades, missatges ni notificacions, com ara alarmes.\n\nD\'aquesta manera es protegeixen les dades en cas de pèrdua o robatori del dispositiu. Vols que demani una contrasenya per iniciar-se?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vols demanar el PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vols demanar el patró?"</string>
-    <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vols demanar contrasenya?"</string>
+    <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Sol·licitar contrasenya?"</string>
     <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Quan introdueixis el teu PIN per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
     <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Quan introdueixis el teu patró per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
     <string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Quan introdueixis la teva contrasenya per iniciar aquest dispositiu, els serveis d\'accessibilitat com ara <xliff:g id="SERVICE">%1$s</xliff:g> encara no estaran disponibles."</string>
@@ -3041,7 +3038,7 @@
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Categories: importància baixa"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categories: desactivades"</string>
     <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Categories: amb prioritat"</string>
-    <string name="advanced_apps" msgid="4812975097124803873">"Avançada"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Configuració avançada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configura aplicacions"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicació desconeguda"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos d\'aplicacions"</string>
@@ -3049,7 +3046,7 @@
     <string name="tap_to_wake" msgid="7211944147196888807">"Toca per activar"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Toca dos cops un punt de la pantalla per activar el dispositiu"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Obertura d\'enllaços"</string>
-    <string name="domain_urls_summary_none" msgid="2639588015479657864">"No obre els enllaços admesos"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"No obre els enllaços compatibles"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Obre <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Obre <xliff:g id="DOMAIN">%s</xliff:g> i altres URL"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"No hi ha cap aplicació que permeti obrir enllaços compatibles"</string>
@@ -3063,7 +3060,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No s\'ha reconegut"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Predeterminada"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Predeterminada per a la feina"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistència i entrada veu"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Assistència i entrada de veu"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicació d\'assistència"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Vols que <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> sigui l\'assistent?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"L\'assistent podrà llegir informació sobre les aplicacions que s\'utilitzen al teu sistema; també podrà accedir a la informació que es veu a la teva pantalla o a què accedeixes des de les aplicacions."</string>
@@ -3072,15 +3069,15 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Tria l\'entrada de veu"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Aplicació de navegador"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Navegador no predeterminat"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Aplicació Telèfon"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Aplicació de telèfon"</string>
     <string name="default_app" msgid="6864503001385843060">"(Predeterminat)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Opció predetermina del sistema)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Emmagatzematge d\'aplicacions"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Accés d\'ús"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"Permet l\'accés d\'ús"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Accés a dades d\'ús"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Permet l\'accés a dades d\'ús"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferències d\'ús de les aplicacions"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"Gràcies a l\'accés d\'ús, les aplicacions poden fer un seguiment de les altres aplicacions que utilitzes i la freqüència amb què ho fas, així com del teu operador de telefonia mòbil i de la configuració d\'idioma, entre d\'altres."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"L\'accés a dades d\'ús permet que una aplicació pugui fer un seguiment de les altres aplicacions que utilitzes i la freqüència amb què ho fas, així com del teu operador de telefonia mòbil i de la configuració d\'idioma, entre d\'altres."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memòria"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Detalls de la memòria"</string>
     <string name="always_running" msgid="6042448320077429656">"Sempre en execució (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3096,7 +3093,7 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Alertes d\'ús"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Mostra totes les aplicacions"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Amaga aplicacions addicionals"</string>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"No optimitzen la bateria"</string>
+    <string name="high_power_filter_on" msgid="3222265297576680099">"Sense optimitzar"</string>
     <string name="high_power_on" msgid="6216293998227583810">"No optimitzen la bateria"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Optimitza l\'ús de la bateria"</string>
     <string name="high_power_system" msgid="7362862974428225301">"L\'optimització de la bateria no està disponible"</string>
@@ -3137,11 +3134,11 @@
     <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>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"Permet que l\'aplicació d\'assistència accedeixi als continguts de la pantalla en forma de text"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Ús de captures de pantalla"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Utilitza captura de pantalla"</string>
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Permet que l\'aplicació d\'assistència accedeixi a una imatge de la pantalla"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Fes centellejar la pantalla"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Fa centellejar les vores de la pantalla quan l\'aplicació d\'assistència accedeix al text d\'una pantalla o d\'una captura de pantalla"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"Les aplicacions d\'assistència et poden ajudar en funció de la informació que estiguis visualitzant a la pantalla. Algunes aplicacions admeten tant els serveis de Launcher com els d\'entrada de veu per oferir-te una assistència integrada."</string>
+    <string name="assist_footer" msgid="1982791172085896864">"Les aplicacions d\'assistència et poden ajudar en funció de la informació que es mostri a la pantalla. Algunes aplicacions admeten tant els serveis de menú d\'aplicacions com els d\'entrada de veu per oferir-te una assistència integrada."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Ús mitjà de la memòria"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Ús màxim de la memòria"</string>
     <string name="memory_usage" msgid="1781358557214390033">"Ús de la memòria"</string>
@@ -3166,7 +3163,7 @@
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Vols que <xliff:g id="APP">%1$s</xliff:g> tingui accés a No molestis?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"L\'aplicació podrà activar o desactivar No molestis i fer canvis en paràmetres relacionats."</string>
     <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Ha d\'estar activat perquè l\'accés a les notificacions també ho està"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Vols revocar l\'accés de l\'aplicació <xliff:g id="APP">%1$s</xliff:g> al mode No molestis?"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Vols revocar l\'accés de l\'aplicació <xliff:g id="APP">%1$s</xliff:g> a No molestis?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Se suprimiran totes les regles del mode No molestis creades per aquesta aplicació."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"No optimitzis la bateria"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimitza la bateria"</string>
@@ -3174,7 +3171,7 @@
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Es recomana per allargar la bateria"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Vols permetre que <xliff:g id="APP">%s</xliff:g> ignori les optimitzacions de la bateria?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Cap"</string>
-    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Encara que es desactivi l\'accés a l\'ús d\'aquesta aplicació, l\'administrador podrà continuar fent el seguiment de l\'ús de dades de les aplicacions del perfil professional"</string>
+    <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Encara que es desactivi l\'accés a dades d\'ús d\'aquesta aplicació, l\'administrador podrà continuar fent el seguiment de l\'ús de dades de les aplicacions del perfil professional"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Caràcters utilitzats: <xliff:g id="COUNT_0">%1$d</xliff:g> de <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"Mostra sobre altres aplicacions"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"Mostra sobre altres aplicacions"</string>
@@ -3190,31 +3187,31 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicacions amb permís"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Sí"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Instal·la aplicacions desconegudes"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Instal·lar aplicacions desconegudes"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instal·lar aplicacions orígens desconeguts"</string>
-    <string name="write_settings" msgid="4797457275727195681">"Modifica configuració sistema"</string>
+    <string name="write_settings" msgid="4797457275727195681">"Modificar configuració sistema"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"modifica la configuració del sistema i hi escriu"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%1$d</xliff:g> de: <xliff:g id="COUNT_1">%2$d</xliff:g> aplicacions poden modificar configuració del sistema"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"Pot instal·lar altres aplicacions"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"Pot modificar la configuració del sistema"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"Pot modificar la configuració del sistema"</string>
-    <string name="write_system_settings" msgid="3482913590601096763">"Modifica configuració sistema"</string>
+    <string name="write_system_settings" msgid="3482913590601096763">"Modificar configuració sistema"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Permís aplicació per modificar configuració sistema"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Permet modificar la configuració del sistema"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Aquest permís permet que una aplicació modifiqui la configuració del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Sí"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"No"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Permet instal·lar aplicacions"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Permeses"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"No permeses"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Permet d\'aquesta font"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Doble gir per obrir Càmera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira el canell dues vegades per obrir l\'aplicació Càmera"</string>
     <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 els elements 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_keywords" msgid="9176477565403352552">"densitat de pantalla, zoom de pantalla, escala, mida"</string>
-    <string name="screen_zoom_summary" msgid="6445488991799015407">"Amplia o redueix els elements de la pantalla. És possible que algunes aplicacions de la pantalla canviïn de posició."</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>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Redueix"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Amplia"</string>
@@ -3228,7 +3225,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Dimarts a les 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Dimarts a les 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Dimarts a les 18:03"</string>
-    <string name="disconnected" msgid="4836600637485526329">"No connectada"</string>
+    <string name="disconnected" msgid="4836600637485526329">"No connectat"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> de dades utilitzades"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">Desactivades per a <xliff:g id="COUNT">%d</xliff:g> aplicacions</item>
@@ -3309,16 +3306,16 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"El recompte de dades de l\'operador de telefonia mòbil pot ser diferent del calculat pel dispositiu"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilitzats"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Estableix l\'avís de dades"</string>
-    <string name="data_warning" msgid="209133958008062117">"Advertiment sobre ús de dades"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Defineix advertiment de dades"</string>
+    <string name="data_warning" msgid="209133958008062117">"Advertiment d\'ús 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="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">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicacions poden utilitzar dades sense restricció quan l\'extensió Economitzador de dades està activada</item>
-      <item quantity="one">1 aplicació pot utilitzar dades sense restricció quan l\'extensió Economitzador de dades està activada</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicacions poden utilitzar dades sense restricció quan l\'Economitzador de dades està activat</item>
+      <item quantity="one">1 aplicació pot utilitzar dades sense restricció quan l\'Economitzador de dades està activat</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Economitzador de dades"</string>
     <string name="unrestricted_data_saver" msgid="7019858887510062789">"Accés a dades sense restricció"</string>
@@ -3360,7 +3357,7 @@
     <string name="notification_log_details_delete_intent" msgid="905118520685297007">"suprimeix l\'intent"</string>
     <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"intent de pantalla completa"</string>
     <string name="notification_log_details_actions" msgid="242523930165118066">"accions"</string>
-    <string name="notification_log_details_title" msgid="7177091647508863295">"títol"</string>
+    <string name="notification_log_details_title" msgid="7177091647508863295">"càrrec"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"entrades remotes"</string>
     <string name="notification_log_details_content_view" msgid="6638731378278561786">"vista personalitzada"</string>
     <string name="notification_log_details_extras" msgid="4188418723779942047">"extres"</string>
@@ -3378,7 +3375,7 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacions poden utilitzar dades sense restricció</item>
       <item quantity="one">1 aplicació pot utilitzar dades sense restricció</item>
     </plurals>
-    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Vols esborrar les dades d\'usuari i convertir-les en l\'encriptació de fitxers?"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Vols esborrar les dades d\'usuari i convertir-les en encriptació de fitxers?"</string>
     <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>
@@ -3388,11 +3385,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Assistència"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Amplada més petita"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Cap aplicació instal·lada no ha sol·licitat accés a l\'enviament de SMS prèmium"</string>
+    <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 l\'enviament d\'SMS prèmium"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Accés a SMS prèmium"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"No és visible per a altres dispositius"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Connectat a"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Camps de configuració ràpida per a desenvolupadors"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Som aquí per ajudar-te"</string>
@@ -3456,22 +3454,22 @@
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos ràpids per controlar el dispositiu"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accés ràpid a la càmera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Per obrir ràpidament la càmera, prem el botó d\'engegada dues vegades. Funciona des de qualsevol pantalla."</string>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Gira la càmera"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Canvia de càmera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Per consultar el telèfon, fes-hi doble toc"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Per consultar la tauleta, fes-hi doble toc"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Per consultar el dispositiu, fes-hi doble toc"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Per consultar ràpidament les notificacions, fes doble toc a la pantalla."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Per consultar el telèfon, aixeca\'l"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Aixeca el dispositiu per consultar-lo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Per consultar la tauleta, aixeca-la"</string>
-    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Per consultar el dispositiu, aixeca\'l"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Per consultar ràpidament les notificacions, agafa el telèfon."</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Aixeca el dispositiu per consultar-lo"</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Agafa el telèfon per consultar ràpidament les notificacions."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Per consultar ràpidament les notificacions, agafa la tauleta."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Per consultar ràpidament les notificacions, agafa el dispositiu."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Fes lliscar el dit per veure les notificacions"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Llisca per veure notificacions"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Per consultar les notificacions, llisca el dit cap avall al sensor d\'empremtes digitals de la part posterior del telèfon."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per consultar les notificacions, llisca el dit cap avall al sensor d\'empremtes digitals de la part posterior de la tauleta."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Per consultar les notificacions, llisca el dit cap avall al sensor d\'empremtes digitals de la part posterior del dispositiu."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per consultar les notificacions, llisca el dit cap avall al sensor d\'empremtes digitals situat a la part posterior de la tauleta"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Per consultar les notificacions, llisca el dit cap avall al sensor d\'empremtes digitals situat a la part posterior del dispositiu"</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gest per obrir Assistència"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilitat"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivat per a <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servei d\'emplenament automàtic"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automàtic, emplenament, emplenament automàtic"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Vols que <xliff:g id="APP_NAME_0">%1$s</xliff:g> sigui la teva aplicació d\'emplenament automàtic? <xliff:g id="APP_NAME_1">%1$s</xliff:g> podrà llegir la pantalla i emplenar els camps d\'altres aplicacions."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assegura\'t que confies en aquesta aplicació&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Emplenament automàtic de Google&gt;%1$s&lt;/xliff:g&gt; utilitza el contingut que es mostra a la pantalla per determinar què es pot emplenar automàticament."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema del dispositiu"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predeterminat"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestor d\'emmagatzematge: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 90996c2..76620c8 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Žádné"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Žádné"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 1e1d760..0d7af02 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -333,20 +333,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Účty"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Zabezpečení a poloha"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrování a identifikační údaje"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon je zašifrován"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je zašifrován"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Předvolby obrazovky uzamčení"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Ochrana soukromí"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Zakázáno administrátorem"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stav zabezpečení"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Zámek obrazovky, otisky prstů"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zámek obrazovky"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisk prstu"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Správa otisků prstů"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"K čemu otisk používat"</string>
@@ -452,7 +451,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">"Za účelem zvýšení zabezpečení nastavte záložní zámek obrazovky."</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="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>
@@ -697,7 +696,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Vypnuto"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Není k dispozici, protože je vypnuta funkce NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Když je funkce zapnutá, můžete přenášet obsah aplikace do jiného zařízení s funkcí NFC tak, že obě zařízení podržíte blízko sebe. Přenášet můžete například webové stránky, videa YouTube, kontakty a další.\n\nPřiložte zařízení k sobě (zpravidla zadní stranou) a klepněte na obrazovku. Aplikace určí, jaký obsah se bude přenášet."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Když je funkce zapnutá, můžete přenášet obsah aplikace do jiného zařízení s funkcí NFC tak, že obě zařízení podržíte blízko sebe. Přenášet můžete například webové stránky, videa na YouTube, kontakty a další.\n\nPřiložte zařízení k sobě (zpravidla zadní stranou) a klepněte na obrazovku. Aplikace určí, jaký obsah se bude přenášet."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Zapnout Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -714,6 +713,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Zobrazit oznámení, když je dostupná kvalitní veřejná síť"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Zapínat Wi-Fi automaticky"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"V dosahu kvalitních uložených sítí, jako je například vaše domácí síť, se Wi-Fi znovu zapne"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nedostupné, protože je vypnuto vyhledávání Wi-Fi"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Ignorovat slabá připojení"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nepoužívat síť Wi-Fi, pokud nemá dostatečně kvalitní internetové připojení"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Použít jen sítě s dobrým připojením k internetu"</string>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurace Wi‑Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsítě"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Uložené sítě"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavení IP adresy"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Rozšířená nastavení sítě Wi-Fi nejsou pro tohoto uživatele dostupná."</string>
@@ -1041,13 +1039,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vyp."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Chcete-li nastavit, co se stane, když je telefon vložen do doku nebo je v režimu spánku, zapněte spořič obrazovky."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kdy spustit"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Aktuální spořič obrazovky"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Spustit"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavení"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Probudit zvednutím zařízení"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Obrazovka příchozího oznámení"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambientní displej"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Probudit obrazovku, když dostanete oznámení"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Umožňuje zvětšit nebo zmenšit text"</string>
@@ -1645,6 +1642,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Obchod"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Podrobnosti o aplikaci"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikace nainstalovaná z obchodu <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Další informace: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operace aplikací"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Spuštěno"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nebylo použito)"</string>
@@ -1721,7 +1719,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Nápověda ke klávesovým zkratkám"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Zobrazit dostupné klávesové zkratky"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Výchozí"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Myš/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Rychlost kurzoru"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Herní ovladače"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Použít vibrace"</string>
@@ -1808,7 +1805,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Přiblížení obrazovky"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Trojitým klepnutím aktivujete přiblížení"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Přiblížení zobrazení klepnutím na tlačítko"</string>
-    <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 po 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_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>
@@ -1957,8 +1954,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Využití obrazovky od úplného nabití"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Spotřeba obrazovky"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhledávání mobilních sítí"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Před <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Využití aplikací od úplného nabití (před <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Před <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Využití aplikací od úplného nabití (před <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Doba, po kterou byla od úplného nabití zapnutá obrazovka"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Využití zařízení od úplného nabití"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využití baterie od odpojení"</string>
@@ -1978,7 +1975,7 @@
     <string name="awake" msgid="387122265874485088">"Doba provozu zařízení"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Doba provozu Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Doba provozu modulu Wi-Fi"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Rozšířené informace o využití baterie"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Rozšířené informace o baterii"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti historie"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Využití baterie"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Podrobnosti využívání"</string>
@@ -1989,7 +1986,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparát"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Pohotovostní režim"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Pohotovostní režim mobilní sítě"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet v nečinnosti"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"V nečinnosti"</string>
@@ -2049,7 +2046,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Informace o využití baterie jsou přibližné odhady a neobsahují všechny způsoby využití energie. Pod označením „Různé využití energie“ uvádíme rozdíl mezi vypočtenou přibližnou spotřebou energie a skutečnou spotřebou zjištěnou podle baterie."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadhodnocení spotřeby energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Doba používání: %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Využíváno <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> bylo použito aplikací <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> z celkové kapacity baterie"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Přehled od posledního úplného nabití"</string>
@@ -2121,7 +2118,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavení hlasového vstupu a výstupu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hlasové vyhledávání"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Klávesnice Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Řeč"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Nastavení hlasového zadávání"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Hlasové zadávání"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Služby hlasového zadávání"</string>
@@ -2188,7 +2184,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Úložiště pověření nelze smazat."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložiště pověření je aktivováno."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Před použitím úložiště pověření musíte nastavit kód PIN nebo heslo zámku obrazovky."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Přístup k datům o používání"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Přístup k dat. o používání"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tísňové vyzvánění"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastavit chování při tísňovém volání"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Záloha"</string>
@@ -2604,7 +2600,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Použít výchozí"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Vždy"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Kromě případů, kdy je spuštěna jiná platební aplikace"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace, která bude použita u terminálu pro platby dotykem telefonu:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikace pro platby dotykem telefonu:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Platba na terminálu"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Nastavte platební aplikaci. Poté jen přidržte telefon zadní stranou u terminálu se symbolem bezkontaktních plateb."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Rozumím"</string>
@@ -2783,6 +2779,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitost oznámení"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Výchozí zvuk oznámení"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvuk z aplikace"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Výchozí zvuk oznámení"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Výchozí zvuk budíku"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"U hovorů také vibrovat"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Ostatní zvuky"</string>
@@ -2846,6 +2844,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Jak chcete zobrazovat profilová oznámení, když bude zařízení uzamčeno?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilová oznámení"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Oznámení nikdy nezobrazovat"</string>
@@ -2853,10 +2852,10 @@
     <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_min_summary" msgid="8233873580287975662">"Nízká: Bez zvukového a vizuálního vyrušení"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Střední: Bez zvuku"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Vysoká: Vydat zvukový signál"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgentní: Vydat zvukový signál a vyskočit na obrazovku"</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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Asistent oznámení"</string>
@@ -2892,6 +2891,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Oznámení této aplikace jsou v zařízení blokována systémem Android"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Tato kategorie oznámení je v zařízení blokována systémem Android"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Jiné"</string>
     <string name="no_channels" msgid="3077375508177744586">"Tato aplikace neodeslala žádná oznámení"</string>
@@ -3033,18 +3034,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Zachovat aktuální orientaci"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Bezpečné spuštění"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Pokračovat"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadován kód PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Kromě odemykání pomocí otisku prstu můžete toto zařízení dále ochránit tak, že před jeho spuštěním bude požadován kód PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Kromě odemykání pomocí otisku prstu můžete toto zařízení dále ochránit tak, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Kromě odemykání pomocí otisku prstu můžete toto zařízení dále ochránit tak, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Při spuštění zařízení požadovat kód PIN"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Při spuštění zařízení požadovat gesto"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Při spuštění zařízení požadovat heslo"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ne, děkuji"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ne, děkuji"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ne, děkuji"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadován PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadován PIN?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno gesto?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Toto zařízení můžete dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků. \n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno heslo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Kromě odemykání otiskem prstu můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadován PIN. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadován PIN?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Kromě odemykání otiskem prstu můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno gesto. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Má být před spuštěním zařízení vyžadováno gesto?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Kromě odemykání otiskem prstu můžete toto zařízení dále ochránit tím, že před jeho spuštěním bude požadováno heslo. Před spuštěním zařízení nemůže přijímat hovory, zprávy ani oznámení, včetně budíků.\n\nTato funkce pomáhá chránit data ve ztracených nebo ukradených zařízeních. Při spuštění zařízení požadovat heslo&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ano"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Požadovat kód PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Požadovat gesto?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Požadovat heslo?"</string>
@@ -3175,7 +3172,7 @@
     <string name="high_power_desc" msgid="6283926163708585760">"Optimalizace výdrže baterie nebude použita. Baterie se může vybíjet rychleji."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Povolit aplikaci stále běžet na pozadí?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Pokud aplikaci <xliff:g id="APP_NAME">%1$s</xliff:g> povolíte stále běžet na pozadí, může to zkrátit životnost baterie. \n\nToto nastavení můžete později změnit v sekci Nastavení &gt; Aplikace a oznámení."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"Od posledního úplného nabití bylo využito <xliff:g id="PERCENTAGE">%1$s</xliff:g> %% baterie"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"Od posledního úplného nabití bylo využito <xliff:g id="PERCENTAGE">%1$s</xliff:g> baterie"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Správa napájení"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Baterie od posledního úplného nabití nebyla využita"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Nastavení aplikace"</string>
@@ -3278,9 +3275,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Toto oprávnění umožňuje aplikaci měnit nastavení systému."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ano"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ano"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ne"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Povolit instalace aplikací"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Povoleno"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Není povoleno"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Povolit z tohoto zdroje"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Otevření Fotoaparátu otočením zápěstí"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Umožňuje otevřít aplikaci Fotoaparát dvojitým otočením zápěstí."</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Fotoaparát dvojitým stisknutím vypínače"</string>
@@ -3376,8 +3373,8 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Upozornění na data: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozornění na data: <xliff:g id="ID_1">%1$s</xliff:g> / limit dat: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturační cyklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Měsíční cyklus začíná <xliff:g id="ID_1">%1$s</xliff:g> den každého měsíce"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Měsíčně od <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"Měsíční cyklus začíná <xliff:g id="ID_1">%1$s</xliff:g>. den každého měsíce"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Měsíčně od <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Omezení sítě"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> omezení</item>
@@ -3395,10 +3392,10 @@
     <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">
-      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikace mají povoleno využívat neomezená data, i když je zapnutý Spořič dat</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> aplikace má povoleno využívat neomezená data, i když je zapnutý Spořič dat</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikací má povoleno využívat neomezená data, i když je zapnutý Spořič dat</item>
-      <item quantity="one">1 aplikace má povoleno využívat neomezená data, i když je zapnutý Spořič dat</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikace mají povoleno využívat neomezená data, i když je zapnutý spořič dat</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> aplikace má povoleno využívat neomezená data, i když je zapnutý spořič dat</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikací má povoleno využívat neomezená data, i když je zapnutý spořič dat</item>
+      <item quantity="one">1 aplikace má povoleno využívat neomezená data, i když je zapnutý spořič dat</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Spořič dat"</string>
     <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neomezený přístup k datům"</string>
@@ -3453,7 +3450,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"žádné"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objekt hodnocení chybí."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekt hodnocení tento klíč neobsahuje."</string>
-    <string name="special_access" msgid="3458780842491881155">"Přístup ke speciálním aplikacím"</string>
+    <string name="special_access" msgid="3458780842491881155">"Přístup ke spec. aplikacím"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikace mohou využívat neomezená data</item>
       <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> aplikace může využívat neomezená data</item>
@@ -3474,7 +3471,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Připojeno k"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Dlaždice rychlého nastavení pro vývojáře"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Rádi vám pomůžeme"</string>
@@ -3556,7 +3554,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Oznámení můžete rychle zkontrolovat tak, že telefon zvednete."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Oznámení můžete rychle zkontrolovat tak, že tablet zvednete."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Oznámení můžete rychle zkontrolovat tak, že zařízení zvednete."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Přejetí otisku prstu pro oznámení"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Otisk prstu pro oznámení"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně telefonu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně tabletu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Chcete-li zkontrolovat oznámení, přejeďte prstem dolů po snímači otisků prstů na zadní straně zařízení."</string>
@@ -3683,7 +3681,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(pro uživatele <xliff:g id="USER">%s</xliff:g> nedostupné)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Služba automatického vyplňování"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatické vyplňování, vyplňování"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Chcete aplikaci <xliff:g id="APP_NAME_0">%1$s</xliff:g> nastavit jako aplikaci na automatické vyplňování? Aplikace <xliff:g id="APP_NAME_1">%1$s</xliff:g> bude moci číst obsah vaší obrazovky a vyplňovat pole v ostatních aplikacích."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Zkontrolujte, zda se jedná o důvěryhodnou aplikaci&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatické doplňování Google&gt;%1$s&lt;/xliff:g&gt; určuje na základě obsahu obrazovky, co lze automaticky vyplnit."</string>
     <string name="device_theme" msgid="4571803018917608588">"Motiv zařízení"</string>
     <string name="default_theme" msgid="7085644992078579076">"Výchozí"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Správce úložiště: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index d0f163e..e939775 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ingen"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ingen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -281,8 +283,8 @@
     <item msgid="2603878814882344450">"generel lydstyrke"</item>
     <item msgid="7136963238377062018">"lydstyrke for stemme"</item>
     <item msgid="4270236897655923007">"lydstyrke for ringetone"</item>
-    <item msgid="6325739889222559394">"medielydstyrke"</item>
-    <item msgid="5762123934816216821">"alarmlydstyrke"</item>
+    <item msgid="6325739889222559394">"lydstyrke for medier"</item>
+    <item msgid="5762123934816216821">"lydstyrke for alarmer"</item>
     <item msgid="785049718065337473">"lydstyrke for underretninger"</item>
     <item msgid="6700305533746877052">"lydstyrke for bluetooth"</item>
     <item msgid="2029227495214047094">"lås ikke"</item>
@@ -348,8 +350,8 @@
     <item msgid="2098976479485046797">"Generel lydstyrke"</item>
     <item msgid="5660213838861789350">"Lydstyrke for stemme"</item>
     <item msgid="7983336752371254444">"Lydstyrke for ringetone"</item>
-    <item msgid="7878027809189330917">"Medielydstyrke"</item>
-    <item msgid="7260546305036218513">"Alarmlydstyrke"</item>
+    <item msgid="7878027809189330917">"Lydstyrke for medier"</item>
+    <item msgid="7260546305036218513">"Lydstyrke for alarmer"</item>
     <item msgid="9103719301075748925">"Lydstyrke for underretninger"</item>
     <item msgid="7025966722295861512">"Lydstyrke for bluetooth"</item>
     <item msgid="4665183401128289653">"Lås ikke"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0d9a731..4abaae4 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -292,7 +292,7 @@
     <string name="networks" msgid="6333316876545927039">"Valg af udbyder"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"Vælg en netværksudbyder"</string>
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Dato og tid"</string>
-    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Indstil dato og tid"</string>
+    <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Angiv dato og klokkeslæt"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Angiv dato, klokkeslæt, tidszone og formater"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Automatisk dato og tid"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Brug netværkets tid"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Placering"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sikkerhed og placering"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering og loginoplysninger"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefonen er krypteret"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefonen er krypteret"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Præferencer for låseskærm"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låst SIM-kort og lager for loginoplysninger"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privatliv"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Deaktiveret af administratoren"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sikkerhedsstatus"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Skærmlås, fingeraftryk"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skærmlås"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeraftryk"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Adm. fingeraftryk"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Brug fingeraftryk til"</string>
@@ -577,7 +576,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aktive apps</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Hvis du vil bruge dette, skal du først indstille en skærmlås"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Hvis du vil bruge dette, skal du først konfigurere en skærmlås"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Ingen"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aktiv trust agent</item>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Giv besked om et tilgængeligt offentligt netværk af høj kvalitet"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktivér Wi-Fi automatisk"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi aktiveres igen, når du er i nærheden af gemte netværk af høj kvalitet, f.eks dit hjemmenetværk"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ikke tilgængelig, fordi Søgning efter Wi-Fi-netværk er slået fra"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undgå dårlige forbindelser"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Brug kun et Wi-Fi-netværk, hvis det har en god internetforbindelse"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Anvend kun netværk med god internetforbindelse"</string>
@@ -702,7 +702,7 @@
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Hvis du vil forbedre nøjagtigheden af placeringer, skal du slå Wi-Fi-scanning til i <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>scanningsindstillingerne<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"Vis ikke igen"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"Hold Wi-Fi aktiveret i dvale"</string>
-    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Slå Wi-Fi til i dvaletilstand"</string>
+    <string name="wifi_setting_on_during_sleep_title" msgid="8308975500029751565">"Wi-Fi aktiveret i dvaletilstand"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Der opstod et problem ved ændring af indstillingen"</string>
     <string name="wifi_suspend_efficiency_title" msgid="2338325886934703895">"Gør mere effektiv"</string>
     <string name="wifi_suspend_optimizations" msgid="1220174276403689487">"Wi-Fi-optimering"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurer 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Undernetmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Gemte netværk"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-indstillinger"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Avancerede Wi-Fi-indstillinger er ikke tilgængelige for denne bruger"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Fra"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Aktivér pauseskærmen for at kontrollere, hvad der sker, når telefonen er sat i dockingstationen og/eller går i dvale."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Starttidspunkt"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Aktuel pauseskærm"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nu"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Indstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Løft enheden for at vække den"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Skærm for indgående underretninger"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Aktiv låseskærm"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Væk skærmen, når du modtager underretninger"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gør teksten større eller mindre"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Åbn <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Andre omfatter bl.a. delte filer, der er gemt af apps, filer, som er downloadet fra internettet eller via Bluetooth, og Android-filer. \n\nDu kan se synligt indhold på dette <xliff:g id="NAME">^1</xliff:g> ved at trykke på Udforsk."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systemet omfatter filer, der anvendes til at køre Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"System omfatter filer, der anvendes til at køre 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> kan have gemt billeder, musik, apps eller andre data på <xliff:g id="SIZE">^2</xliff:g> af lagerpladsen. \n\nSkift til <xliff:g id="USER_1">^1</xliff:g> for at se oplysninger."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer dit <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Brug som ekstern lagerplads"</string>
@@ -1324,10 +1321,10 @@
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot er slået til, netdeling"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot er slået til"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Netdeling"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Der kan ikke bruges netdeling eller bærbare hotspots, når Datasparefunktion er aktiveret"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Der kan ikke bruges netdeling eller hotspots, når Datasparefunktion er aktiveret"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Netdeling via USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB tilsluttet, slå til for at bruge netdeling"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB tilsluttet. Aktivér for at bruge netdeling"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Netdeling anvendt"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Netdeling kan ikke anvendes, når USB-lager er i brug"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB ikke tilsluttet"</string>
@@ -1380,7 +1377,7 @@
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Brug GPS, Wi-Fi, Bluetooth eller mobilnetværk til at fastslå placeringen"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Brug Wi-Fi, Bluetooth eller mobilnetværk til at fastslå placering"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Brug GPS-signal til at fastslå din placering"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søger"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Scanning"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi-scanning"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Du kan forbedre placeringsnøjagtigheden ved at give systemapps og -tjenester tilladelse til at registrere Wi-Fi-netværk når som helst."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-scanning"</string>
@@ -1431,7 +1428,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bekræft din pinkode"</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åsning"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Vælg oplåsningsmetode"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Adgangskoden er indstillet"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"Pinkoden er blevet indstillet"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mønsteret er blevet indstillet"</string>
@@ -1489,7 +1486,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Den samme som enhedens skærmlås"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrer apps"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrer og fjern installerede apps"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Oplysninger om appen"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Appinfo"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrer apps, konfigurer genveje til hurtig start"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Indstillinger for app"</string>
     <string name="install_applications" msgid="4872012136210802181">"Ukendte kilder"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Butik"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Oplysninger om appen"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Appen er installeret fra <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Flere oplysninger i <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Handlinger i app"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Kører"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Aldrig brugt)"</string>
@@ -1676,7 +1674,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Indstillinger for fysisk tastatur"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Tryk på mellemrumstasten to gange for at indsætte punktum"</string>
     <string name="show_password" msgid="4837897357002495384">"Vis adgangskoder"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Vis tegnene kort, mens du skriver"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Vis kort tegnene, mens du skriver"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"Denne stavekontrol kan muligvis indsamle al den tekst, som du skriver, også personlige data som adgangskoder og kreditkortnumre. Den kommer fra appen <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Vil du bruge denne stavekontrol?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Indstillinger"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Sprog"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Hjælp til tastaturgenveje"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Vis tilgængelige genveje"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Standard"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mus/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Markørens hastighed"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Spillekontroller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Brug vibrator"</string>
@@ -1772,7 +1769,7 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Tryk på elementer på din skærm for at få dem læst op"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Undertekster"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Forstørrelse"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Trykke tre gange for at forstørre"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Tryk tre gange for at forstørre"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Brug en knap til forstørrelse"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Brug en knap til forstørrelse med tre tryk"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Zoom ind på skærmen"</string>
@@ -1874,8 +1871,8 @@
     <string name="print_settings" msgid="4742428530112487843">"Udskrivning"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Fra"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> udskriftstjeneste er slået til</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> udskriftstjenester er slået til</item>
+      <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> udskrivningstjeneste er slået til</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> udskrivningstjenester er slået til</item>
     </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Udskrivningstjenester"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Der er ikke installeret nogen tjenester"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Brug af skærmen siden fuld opladning"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skærmens strømforbrug"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanning af mobilnetværk"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"For <xliff:g id="TIME">%1$s</xliff:g> siden"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appforbrug siden fuld opladning (for <xliff:g id="TIME">%1$s</xliff:g> siden)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"For <xliff:g id="TIME">^1</xliff:g> siden"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appforbrug siden fuld opladning (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lang tid skærmen har været tændt siden fuld opladning"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Brug af enheden siden fuld opladning"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriforbrug siden afbrydelse"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Cellestandby"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilnetværk på standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Stemmeopkald"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletcomputeren er ikke aktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Inaktiv telefon"</string>
@@ -2007,14 +2004,14 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Batteriforbrug er en tilnærmet beregning af strømforbruget og omfatter ikke alle årsager til afladning af batteriet. \"Diverse\" er forskellen mellem den tilnærmede beregning af strømforbruget og det faktiske forbrug, der er registreret for batteriet."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overvurderet strømforbrug"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Brugt i %1$s"</string>
-    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> bruges af <xliff:g id="APP">%2$s</xliff:g>"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Har været aktiv i <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> anvendt af <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af det samlede batteriforbrug"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Oversigt siden sidste fulde opladning"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Siden sidste fulde opladning"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Sidste fulde opladning"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Den resterende batteritid er omtrentlig og kan ændre sig afhængigt af forbrug"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Under aktiv brug"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"Når den er i baggrunden"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"Mens den kører i baggrunden"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batteriforbrug"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> af det samlede appforbrug (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Siden fuld opladning"</string>
@@ -2034,7 +2031,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Aldrig"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ved batteriniveau på <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Batteriniveau"</string>
-    <string name="battery_percentage_description" msgid="8511658577507384014">"Vis batteriniveau i statusbjælken"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Vis batteriniveau på statusbjælken"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Processtatistikker"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Nørdede statistikker om kørende processer"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"hukommelse brugt"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Indstillinger for indtaling og oplæsning"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Talesøgning"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-tastatur"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Tale"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Indstillinger for indtaling"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Indtaling"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Indtalingstjenester"</string>
@@ -2364,7 +2360,7 @@
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Forbrugsbaserede netværk behandles ligesom mobilnetværk, når baggrundsdata begrænses. Apps kan advare dig, før du bruger disse netværk til store downloads."</string>
     <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">"For at vælge forbrugsbaserede netværk skal du slå Wi-Fi til."</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_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>
@@ -2450,9 +2446,9 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Fjernede loginoplysninger: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Der er ikke installeret nogen brugerloginoplysninger"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Stavekontrol"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Indtast her din aktuelle adgangskode til fuldstændig sikkerhedskopiering"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Angiv her en ny adgangskode til fuldstændig sikkerhedskopiering"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Gentag din nye adgangskode til fuldstændig sikkerhedskopiering her"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Angiv din aktuelle adgangskode til fuldstændig sikkerhedskopiering:"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Angiv din nye adgangskode til fuldstændig sikkerhedskopiering:"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Gentag din nye adgangskode til fuldstændig sikkerhedskopiering:"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Angiv adgangskode til sikkerhedskopi"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuller"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Yderligere systemopdateringer"</string>
@@ -2537,7 +2533,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Opkaldshistorikken deles med denne bruger."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Vil du aktivere telefonopkald og sms?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Opkalds- og sms-historikken deles med denne bruger."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Oplysninger i nødsituationer"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Info til nødsituationer"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Oplysninger og kontaktpersoner for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Tillad apps og indhold"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applikationer med begrænsninger"</string>
@@ -2548,7 +2544,7 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tryk og betal"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Sådan fungerer det"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Betal med din telefon i butikker"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Standardbetalingsapp"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Standardapp til betaling"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Ikke angivet"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> – <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Brug standard"</string>
@@ -2656,9 +2652,9 @@
       <item quantity="one">Vis %d skjult element</item>
       <item quantity="other">Vis %d skjulte elementer</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"Netværk &amp; internet"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Netværk og internet"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobil, dataforbrug, hotspot"</string>
-    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Tilsluttede enheder"</string>
+    <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Forbundne enheder"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps og underretninger"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Tilladelser, standardapps"</string>
@@ -2724,13 +2720,15 @@
     <string name="sound_dashboard_summary" msgid="3402435125958012986">"Lydstyrke, vibration, Forstyr ikke"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ringesignalet er indstillet til vibration"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ringesignalet er indstillet til lydløs"</string>
-    <string name="sound_settings_example_summary" msgid="2404914514266523165">"Lydstyrken for ringesignalet er på 80 %"</string>
+    <string name="sound_settings_example_summary" msgid="2404914514266523165">"Lydstyrken for ringetonen er på 80 %"</string>
     <string name="media_volume_option_title" msgid="2811531786073003825">"Medielydstyrke"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmlydstyrke"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Lydstyrke for alarmer"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Lydstyrke for ringetone"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Lydstyrke for underretninger"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringetone ved opkald"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Standardlyd for underretninger"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Lyd fra appen"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Standardlyd for underretninger"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standardlyd for alarmer"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også ved opkald"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andre lyde"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hvordan skal profilunderretninger vises, når din enhed er låst?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilunderretninger"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Underretninger"</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_blocked" msgid="7938180808339386300">"Vis aldrig underretninger"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Lav: Ingen lyd eller pop op-visning"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Mellem: Ingen lyd"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Høj: Med lyd"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Haster: Med lyd og 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Underretningsassistent"</string>
@@ -2825,22 +2824,24 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Når enheden er i VR-tilstand"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reducer sløring (anbefalet)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reducer flimren"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Billede i billede"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ingen af de installerede apps understøtter Billede i billede"</string>
-    <string name="picture_in_picture_keywords" msgid="8361318686701764690">"pip billede i"</string>
-    <string name="picture_in_picture_app_detail_title" msgid="4080800421316791732">"Billede i billede"</string>
-    <string name="picture_in_picture_app_detail_switch" msgid="1131910667023738296">"Tillad billede i billede"</string>
-    <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Giv tilladelse til at oprette et billede i billede-vindue, 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_title" msgid="5824849294270017113">"Integreret billede"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"Ingen af de installerede apps understøtter integreret billede"</string>
+    <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_on" msgid="6103704909710176555">"Ja"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Nej"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokerer underretninger for denne app, så de ikke vises på enheden"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokerer underretninger i denne kategori, så de ikke vises på enheden"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorier"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Andre"</string>
     <string name="no_channels" msgid="3077375508177744586">"Denne app har ikke sendt nogen underretninger"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"Yderligere indstillinger i appen"</string>
-    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Slået til for alle apps"</string>
+    <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Aktiveret for alle apps"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
       <item quantity="one">Slået fra for <xliff:g id="COUNT_1">%d</xliff:g> app</item>
       <item quantity="other">Slået fra for <xliff:g id="COUNT_1">%d</xliff:g> apps</item>
@@ -2920,7 +2921,7 @@
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle opkaldere"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Udvalgte opkald"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gentagne opkald"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillad, hvis den samme person ringer for anden gang inden for en periode på <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillad, hvis den samme person ringer to gange inden for <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Aktivér automatisk"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldrig"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Hver nat"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Til"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Fra"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Skærmfastholdelse"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Når denne indstilling er aktiveret, kan du bruge skærmfastholdelse til at fastholde den aktuelle skærm i visningen, indtil du frigør den.\n\nSådan bruger du skærmfastholdelse:\n\n1. Sørg for, at skærmfastholdelse er slået til.\n\n2. Åbn den skærm, du vil fastholde.\n\n3. Tryk på Oversigt.\n\n4. Stryg opad, og tryk derefter på markøren."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Når denne indstilling er aktiveret, kan du bruge skærmfastholdelse til at fastholde den aktuelle skærm i visningen, indtil du frigør den.\n\nSådan bruger du skærmfastholdelse:\n\n1. Sørg for, at skærmfastholdelse er slået til her.\n\n2. Åbn den skærm, du vil fastholde.\n\n3. Tryk på Oversigt (den firkantede knap nederst til højre).\n\n4. Stryg opad, og tryk derefter på nålen."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Bed om oplåsningsmønster inden frigørelse"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Bed om pinkode inden frigørelse"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Bed om adgangskode inden frigørelse"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold den aktuelle orientering"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sikker opstart"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsæt"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Du kan beskytte denne enhed yderligere ved at kræve din pinkode, før den starter. Enheden kan hverken modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet op. \n\nDette medvirker til at beskytte data på mistede eller stjålne enheder."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Du kan beskytte denne enhed yderligere ved at kræve dit mønster, før den starter. Enheden kan hverken modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet op. \n\nDette medvirker til at beskytte data på mistede eller stjålne enheder."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Du kan beskytte denne enhed yderligere ved at kræve adgangskode, før den starter. Enheden kan hverken modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet op. \n\nDette medvirker til at beskytte data på mistede eller stjålne enheder."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Ud over at beskytte din enhed ved at kræve fingeraftryk til oplåsning kan du beskytte den yderligere ved at kræve, at din pinkode indtastes før opstart. Enheden kan ikke modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet.\n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Ud over at beskytte din enhed ved at kræve fingeraftryk til oplåsning kan du beskytte den yderligere ved at kræve, at dit mønster angives før opstart. Enheden kan ikke modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet.\n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Ud over at beskytte din enhed ved at kræve fingeraftryk til oplåsning kan du beskytte den yderligere ved at kræve, at din adgangskode indtastes før opstart. Enheden kan ikke modtage opkald, beskeder eller underretninger, herunder alarmer, før den er startet.\n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Kræv pinkode for at starte enheden"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Kræv mønster for at starte enheden"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Kræv adgangskode for at starte enheden"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nej tak"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nej tak"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nej tak"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan beskytte denne enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før enheden kan starte op?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Du kan beskytte denne enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette hjælper med at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før enheden kan starte op?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kan beskytte denne enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer. \n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at din pinkode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en pinkode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at dit mønster skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives et mønster, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ud over at låse din enhed op ved hjælp af dit fingeraftryk kan du beskytte din enhed yderligere ved at kræve, at din adgangskode skal angives, før enheden kan starte op. Før enheden er startet op, kan den ikke modtage opkald, meddelelser eller underretninger, herunder alarmer.\n\nDette er med til at beskytte data på enheder, du har mistet, eller som er blevet stjålet. Vil du kræve, at der skal angives en adgangskode, før din enhed kan starte op?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nej"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Kræv pinkode?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Kræv mønster?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Kræv adgangskode?"</string>
@@ -3006,7 +3003,7 @@
     <string name="change" msgid="6657848623929839991">"Skift"</string>
     <string name="change_storage" msgid="600475265207060436">"Skift lager"</string>
     <string name="notifications_label" msgid="8543457911148619898">"Appunderretninger"</string>
-    <string name="notifications_enabled" msgid="6983396130566021385">"Slået til"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"Til"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"Alt er slået fra"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> af <xliff:g id="COUNT_1">%2$d</xliff:g> kategorier er slået fra"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"Slået fra"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Denne tilladelse giver en app lov til at ændre systemindstillinger."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ja"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nej"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Tillad appinstallationer"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Tilladt"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Ikke tilladt"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Tillad fra denne kilde"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Drej to gange for at åbne kameraet"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Åbn kameraappen ved at dreje håndleddet to gange"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tryk to gange på afbryderknappen for at åbne kameraet"</string>
@@ -3228,7 +3225,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Tir. 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Tir. 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Tir. 18:03"</string>
-    <string name="disconnected" msgid="4836600637485526329">"Ingen forbindelse"</string>
+    <string name="disconnected" msgid="4836600637485526329">"Ikke forbundet"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"Du har brugt <xliff:g id="AMOUNT">%1$s</xliff:g> data"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one">Slået fra for <xliff:g id="COUNT">%d</xliff:g> app</item>
@@ -3297,8 +3294,8 @@
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobildata"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi-data"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> Ethernet-data"</string>
-    <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Dataadvarsel"</string>
-    <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Dataadvarsel / <xliff:g id="ID_2">%2$s</xliff:g> Datagrænse"</string>
+    <string name="cell_warning_only" msgid="763147658209027140">"Dataadvarsel ved <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="cell_warning_and_limit" msgid="2273413629267437470">"Dataadvarsel ved <xliff:g id="ID_1">%1$s</xliff:g> / Datagrænse på <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringscyklus"</string>
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Den månedlige cyklus starter den <xliff:g id="ID_1">%1$s</xliff:g>. i hver måned"</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hver måned fra og med den <xliff:g id="ID_1">%1$s</xliff:g>."</string>
@@ -3308,12 +3305,12 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begrænsninger</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Mobilselskabets dataopgørelse kan variere fra enhedens opgørelse."</string>
-    <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> anvendt"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Indstil en dataadvarsel"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> brugt"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Konfigurer en dataadvarsel"</string>
     <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> anvendt i perioden <xliff:g id="ID_2">%2$s</xliff:g>"</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="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">
@@ -3388,11 +3385,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Support"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Mindste bredde"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Ingen installerede apps har anmodet adgang til overtakseret sms"</string>
+    <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_connected_summary" msgid="8733997010923307915">"Forbundet til"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Felter for udviklere til Hurtige indstillinger"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Vi er her for at hjælpe dig"</string>
@@ -3454,7 +3452,7 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Styr din telefon med hurtige bevægelser"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Styr din tablet med hurtige bevægelser"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Styr din enhed med hurtige bevægelser"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Spring til kamera"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Gå til kamera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Du kan åbne dit kamera hurtigt ved at trykke to gange på afbryderknappen. Denne genvej fungerer fra enhver skærm."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vip kameraet"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
@@ -3465,10 +3463,10 @@
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Løft for at tjekke telefon"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Løft for at tjekke din tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Løft for at tjekke enheden"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Du kan hurtigt se dine underretninger ved at samle din telefon op."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Du kan hurtigt se dine underretninger ved at tage din telefon op."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Du kan hurtigt se dine underretninger ved at samle din tablet op."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Du kan hurtigt se dine underretninger ved at samle din enhed op."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Stryg med fingeraftryk for at se underretninger"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Stryg over fingeraftryk for at se underretninger"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af telefonen."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af din tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kan tjekke dine underretninger ved at stryge nedad på fingeraftrykslæseren på bagsiden af enheden."</string>
@@ -3569,7 +3567,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Andre apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Filer"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Din tablets lagerplads"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonens lager"</string>
+    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Lagerplads på telefonen"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Anvendt lagerplads ud af <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"brugt"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(deaktiveret for brugeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"AutoFyld-tjenesten"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatisk, udfyld, autofyld"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Vil du gøre <xliff:g id="APP_NAME_0">%1$s</xliff:g> til din autofyld-app? <xliff:g id="APP_NAME_1">%1$s</xliff:g> vil kunne læse din skærm og udfylde felter i andre apps."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sørg for, at du har tillid til denne app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; anvender indholdet af din skærm til at fastslå, hvad der kan udfyldes automatisk."</string>
     <string name="device_theme" msgid="4571803018917608588">"Enhedstema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standard"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagerstyring: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 4e726fa..aa90ce5 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Keine"</item>
+    <item msgid="7480272092408291086">"MS-CHAP v2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Keine"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index e411483..ae592a9 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -328,20 +328,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konten"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Standort"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konten"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sicherheit &amp; Standort"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Verschlüsselung &amp; Anmeldedaten"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Smartphone verschlüsselt"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone verschlüsselt"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Einstellungen für Sperrbildschirm"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldedatenspeicher festlegen"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldedatenspeichers festlegen"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Datenschutz"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Vom Administrator deaktiviert"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sicherheitsstatus"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Displaysperre und Fingerabdruck"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Displaysperre"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerabdruck"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Fingerabdrücke verwalten"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Abdruck nutzen für"</string>
@@ -648,7 +647,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Als Lautsprechertelefon"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Für Musik und Medien"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Einstellungen speichern"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Übertragen"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Streamen"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Kabellose Übertragung aktivieren"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Kein Gerät in der Nähe gefunden"</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Verbindung wird hergestellt..."</string>
@@ -688,10 +687,11 @@
     <string name="wifi_error" msgid="3207971103917128179">"Fehler"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Das 5-GHz-Band ist in diesem Land nicht verfügbar."</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Im Flugmodus"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Benachrichtigungen zu offenen Netzwerken"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Benachr. zu offenen Netzwerken"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Benachrichtigen, wenn ein leistungsstarkes öffentliches Netzwerk verfügbar ist"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"WLAN automatisch aktivieren"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"WLAN wird in der Nähe von leistungsstarken gespeicherten Netzwerken wie deinem Heimnetzwerk automatisch aktiviert"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nicht verfügbar, weil WLAN-Suche deaktiviert ist"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Schlechte Internetverbindungen vermeiden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"WLAN nur bei guter Internetverbindung verwenden"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Nur Netzwerke mit stabiler Internetverbindung verwenden"</string>
@@ -767,7 +767,7 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme Identität"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Passwort"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Passwort anzeigen"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Band für Zugriffspunkt auswählen"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Band für Zugangspunkt auswählen"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4-GHz-Band"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5-GHz-Band"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"IP-Einstellungen"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"WLAN konfigurieren"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetzmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-Adressen"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Gespeicherte Netzwerke"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-Einstellungen"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Erweiterte WLAN-Einstellungen sind für diesen Nutzer nicht verfügbar"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Aus"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Um festzulegen, was geschieht, wenn dein Smartphone angedockt oder im Ruhemodus ist, aktiviere den Bildschirmschoner."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Startzeitpunkt"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Aktueller Bildschirmschoner"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Jetzt starten"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Einstellungen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Zum Aktivieren anheben"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Display für eingehende Benachrichtigungen"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Inaktivitätsdisplay"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bei Benachrichtigungen Bildschirm aktivieren"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Text vergrößern oder verkleinern"</string>
@@ -1198,7 +1195,7 @@
     <string name="storage_detail_apps" msgid="6141154016753507490">"Apps"</string>
     <string name="storage_detail_images" msgid="6950678857740634769">"Bilder"</string>
     <string name="storage_detail_videos" msgid="2919743464827110953">"Videos"</string>
-    <string name="storage_detail_audio" msgid="1197685141676483213">"Audiodateien"</string>
+    <string name="storage_detail_audio" msgid="1197685141676483213">"Audio"</string>
     <string name="storage_detail_cached" msgid="8547136365247818567">"Daten im Cache"</string>
     <string name="storage_detail_other" msgid="8404938385075638238">"Andere"</string>
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
@@ -1382,9 +1379,9 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS zur Standortbestimmung nutzen"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Suche"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WLAN-Suche"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"System-Apps und -diensten zwecks Erhöhung der Standortgenauigkeit jederzeit das Erkennen von WLAN-Netzwerken gestatten"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"System-Apps und -diensten zur Erhöhung der Standortgenauigkeit jederzeit das Erkennen von WLAN-Netzwerken gestatten"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth-Suche"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"System-Apps und -diensten zwecks Erhöhung der Standortgenauigkeit jederzeit das Erkennen von Bluetooth-Geräten gestatten"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"System-Apps und -diensten zur Erhöhung der Standortgenauigkeit jederzeit das Erkennen von Bluetooth-Geräten gestatten"</string>
     <string name="location_network_based" msgid="9134175479520582215">"WLAN- &amp; Mobilfunknetz-Standort"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Apps dürfen meinen Standort mit dem Google-Standortdienst schneller bestimmen. Anonyme Standortdaten werden erfasst und an Google gesendet."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Standort per WLAN ermittelt"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"App-Details"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App installiert vom <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Weitere Informationen im <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"App-Vorgänge"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Aktiv"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nie verwendet)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Hilfe zu Tastenkombinationen"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Verfügbare Tastenkombinationen einblenden"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Standard"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Maus/Touchpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Zeigergeschwindigkeit"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Gamecontroller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Vibration verwenden"</string>
@@ -1759,7 +1756,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Bedienungshilfen"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Einstellungen für Bedienungshilfen"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Screenreader, Display, Interaktionssteuerung"</string>
-    <string name="vision_settings_title" msgid="4204111425716868288">"Für Sehbehinderte"</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="screen_reader_category_title" msgid="7739154903913400641">"Screenreader"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Audiodienste und Text auf dem Bildschirm"</string>
@@ -1768,12 +1765,12 @@
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Heruntergeladene Dienste"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"Experimentell"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"Der Screenreader ist in erster Linie für Blinde und Menschen mit eingeschränkten Sehvermögen bestimmt"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"Der Screenreader ist in erster Linie für Blinde und Menschen mit eingeschränktem Sehvermögen bestimmt"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Tippe auf dem Bildschirm auf Elemente, damit sie vorgelesen werden"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Untertitel"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Vergrößerung"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Durch dreimaliges Tippen vergrößern"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Mit Schaltfläche vergrößern"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Dreimal tippen zum Vergrößern"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Über Schaltfläche vergrößern"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Mit Schaltfläche &amp; dreimaligem Tippen vergrößern"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Auf dem Bildschirm heranzoomen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Zum Zoomen dreimal tippen"</string>
@@ -1782,20 +1779,20 @@
     <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_shortcut_service_title" msgid="4779360749706905640">"Verknüpfungsdienst"</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_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>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Ein/Aus beendet Anruf"</string>
-    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Großer Mausanzeiger"</string>
+    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Großer Mauszeiger"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Mono-Audio"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kanäle bei der Audiowiedergabe verbinden"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Reaktionszeit Berühren/Halten"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Farbumkehr"</string>
     <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 sich nicht mehr bewegt"</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>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Displaynutzung seit letzter vollständiger Aufladung"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Displayverbrauch"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilfunknetzsuche"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"vor <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App-Verbrauch seit letzter vollständiger Aufladung (vor <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"vor <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"App-Verbrauch seit letzter vollständiger Aufladung (vor <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Aktivierungsdauer des Displays seit letzter vollständiger Aufladung"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Gerätenutzung seit letzter vollständiger Aufladung"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkuverbrauch seit dem Ausstecken"</string>
@@ -1936,7 +1933,7 @@
     <string name="awake" msgid="387122265874485088">"Aktivzeit des Geräts"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WLAN-Aktivzeit"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN-Aktivzeit"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Detaillierte Informationen zum Akkuverbrauch"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Details zum Akkuverbrauch"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Verlaufsdetails"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Akkunutzung"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Details"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"WLAN"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobilfunk-Standby"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilfunknetz – Standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Anrufe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ruhezustand"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ruhezustand"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Der Akkuverbrauch ist nur eine ungefähre Angabe, die nicht jede Quelle der Akkuentladung berücksichtigt. Der sonstige Verbrauch bezieht sich auf die Differenz zwischen dem errechneten ungefähren Akkuverbrauch und der ermittelten tatsächlichen Akkuentladung."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zu hoch berechneter Stromverbrauch"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Nutzungsdauer: %1$s"</string>
-    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> wird von <xliff:g id="APP">%2$s</xliff:g> belegt"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Seit <xliff:g id="TIME">^1</xliff:g> verwendet"</string>
+    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> durch <xliff:g id="APP">%2$s</xliff:g> verbraucht"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> des gesamten Akkuverbrauchs"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Aufschlüsselung des Verbrauchs seit letzter vollständiger Aufladung"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Verbrauchsdetails seit letzter vollständiger Ladung"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Letzte vollständige Aufladung"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Die verbleibende Akkulaufzeit ist eine Schätzung und kann sich je nach Nutzung ändern"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Bei aktiver Nutzung"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Einstellungen für Spracheingabe &amp; -ausgabe"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Sprachsuche"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-Tastatur"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Sprache"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Einstellungen für Spracheingabe"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Spracheingabe"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Spracheingabedienste"</string>
@@ -2145,7 +2141,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Speicher wurde gelöscht."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Anmeldedaten nicht gelöscht"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Der Anmeldedatenspeicher ist aktiviert."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Zur Verwendung des Anmeldeinformationsspeichers musst du eine PIN oder ein Passwort für die Displaysperre festlegen."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Zur Verwendung des Anmeldedatenspeichers musst du eine PIN oder ein Passwort für die Displaysperre festlegen."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apps mit Nutzungsdatenzugriff"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Notfallsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Verhalten bei einem Notruf festlegen"</string>
@@ -2340,7 +2336,7 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Änderungen, die du im Web an deinem Konto vornimmst, werden automatisch auf dein Telefon kopiert.\n\nBei manchen Konten werden ggf. auch automatisch alle Änderungen, die du auf dem Telefon vornimmst, ins Web kopiert. Das ist die übliche Synchronisierungsfunktion eines Google-Kontos."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Automatische Synchronisierung deaktivieren?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"So reduzierst du den Datenverbrauch und schonst den Akku, musst jedoch jedes einzelne Konto manuell synchronisieren, um neue Informationen abzurufen. Außerdem erhältst du keine Benachrichtigungen, wenn Aktualisierungen erfolgen."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum für Zurücksetzung der Nutzungszyklen"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum für Zurücksetzung des Nutzungszyklus"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum (monatlich):"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Übernehmen"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Warnung für Datenverbrauch festlegen"</string>
@@ -2363,7 +2359,7 @@
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Netzwerkbeschränkungen"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Kostenpflichtige Netzwerke werden wie Mobilfunknetze behandelt, wenn die Hintergrunddaten eingeschränkt wurden. In Apps werden möglicherweise Warnungen angezeigt, bevor große Datenmengen über diese Netzwerke heruntergeladen werden."</string>
     <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" msgid="1761738002328299714">"Kostenpflichtige WLAN-Netzwerke"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Um kostenpflichtige Netzwerke auszuwählen, aktiviere WLAN."</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>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Standard-App verwenden"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Immer"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Außer wenn eine andere Zahlungs-App geöffnet ist"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Am Terminal für das mobile Bezahlen mit folgender App bezahlen:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"An einem Terminal für mobiles Bezahlen folgende App nutzen:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"An der Kasse bezahlen"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Richte eine Zahlungs-App ein. Halte die Rückseite deines Smartphones an eine beliebige Kasse mit dem Symbol zum mobilen Bezahlen."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"OK"</string>
@@ -2721,7 +2717,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"In das NFC-Tag kann nicht geschrieben werden. Bitte verwende ein anderes Tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardton"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Klingeltonlautstärke: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Lautstärke, Vibration, Bitte nicht stören"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Lautstärke, Vibration, Nicht stören"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Klingelton auf Vibrieren gestellt"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Klingelton auf lautlos gestellt"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Klingeltonlautstärke: 80 %"</string>
@@ -2730,7 +2726,9 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Klingeltonlautstärke"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Benachrichtigungslautstärke"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"Standardbenachrichtigungston"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Standard-Benachrichtigungston"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Von App erzeugter Ton"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Standard-Benachrichtigungston"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standard-Weckerton"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Bei Anrufen auch vibrieren"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andere Töne"</string>
@@ -2752,10 +2750,10 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> automatische Regeln aktiviert</item>
       <item quantity="one">1 automatische Regel aktiviert</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Einstellungen für \"Bitte nicht stören\""</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Nur wichtige Unterbr. zulassen"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Einstellungen für \"Nicht stören\""</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Nur wichtige Unterbrechungen zulassen"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatische Regeln"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Bitte nicht stören\"-Regeln einrichten"</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Nicht stören\"-Regeln einrichten"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Töne &amp; Vibrationen zu bestimmten Zeiten einschränken"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Nur wichtige Unterbrechungen"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Nur Wecker"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Wie sollen Profilbenachrichtigungen angezeigt werden, wenn dein Gerät gesperrt ist?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilbenachrichtigungen"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Niemals Benachrichtigungen anzeigen"</string>
@@ -2799,10 +2798,10 @@
     <string name="notification_importance_low" msgid="8881468429453766553">"Kein Ton"</string>
     <string name="notification_importance_default" msgid="5958338024601957516">"Akustisches Signal"</string>
     <string name="notification_importance_high" msgid="2082429479238228527">"Akustisches Signal und Bildschirmbenachrichtigung"</string>
-    <string name="notification_importance_min_summary" msgid="8233873580287975662">"Niedrig: kein akustisches Signal und keine visuelle Unterbrechung"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Mittel: kein akustisches Signal"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Hoch: akustisches Signal"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Dringend: akustisches Signal und 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Benachrichtigungsassistent"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android unterbindet, dass Benachrichtigungen dieser App auf dem Gerät angezeigt werden"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android unterbindet, dass Benachrichtigungen dieser Kategorie auf dem Gerät angezeigt werden"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorien"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Andere"</string>
     <string name="no_channels" msgid="3077375508177744586">"Für diese App gibt es keine Benachrichtigungen"</string>
@@ -2856,8 +2857,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Diese Benachrichtigungen niemals anzeigen"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Benachrichtigungen anzeigen"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Benachrichtigungen niemals in der Leiste oder auf Peripheriegeräten anzeigen"</string>
-    <string name="notification_badge_title" msgid="7166470350070693657">"Kennzeichensymbol"</string>
-    <string name="notification_badge_summary" msgid="3944771498030335669">"Benachrichtigungen falls möglich als Badges in der Home App anzeigen"</string>
+    <string name="notification_badge_title" msgid="7166470350070693657">"App-Symbol markieren"</string>
+    <string name="notification_badge_summary" msgid="3944771498030335669">"Bei Benachrichtigungen App-Symbol markieren, sofern möglich"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"\"Nicht stören\" deaktivieren"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Diese Benachrichtigungen dürfen auch dann empfangen werden, wenn für den Modus \"Nicht stören\" die Option \"Nur wichtige Unterbrechungen\" ausgewählt ist."</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Auf dem Sperrbildschirm"</string>
@@ -2918,7 +2919,7 @@
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Erinnerungen"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Termine"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle Anrufer"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Ausgewählte Anrufer"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ausgewählte Anrufer"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wiederholte Anrufer"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Zulassen, falls dieselbe Person innerhalb von <xliff:g id="MINUTES">%d</xliff:g> Minuten erneut anruft"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Autom. aktivieren"</string>
@@ -2940,10 +2941,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Bis <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> zur Option \"Nur Wecker\" wechseln"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zur Option \"Immer unterbrechen\" wechseln"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bei aktiviertem Display blockieren"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Keine Benachrichtigungen auf dem Display einblenden, die durch \"Bitte nicht stören\" stummgeschaltet wurden"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Keine Benachrichtigungen auf dem Display einblenden, die durch \"Nicht stören\" stummgeschaltet wurden"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bei deaktiviertem Display blockieren"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Weder Display noch Benachrichtigungslicht bei Benachrichtigungen aktivieren, die durch \"Bitte nicht stören\" stummgeschaltet wurden"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Keine Benachrichtigungen auf dem Display einblenden, die durch \"nicht stören\" stummgeschaltet wurden"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Weder Display noch Benachrichtigungslicht bei Benachrichtigungen aktivieren, die durch \"Nicht stören\" stummgeschaltet wurden"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Keine Benachrichtigungen auf dem Display einblenden, die durch \"Nicht stören\" stummgeschaltet wurden"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Aus"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Bei aktiviertem Display"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Bei deaktiviertem Display"</string>
@@ -2962,25 +2963,21 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Dieses Arbeitsprofil wird verwaltet von:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Verwaltet von <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentell)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Drehen des Bildschirms"</string>
+    <string name="display_auto_rotate_title" msgid="7119684966039069439">"Bildschirm drehen"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Bildschirminhalte drehen"</string>
     <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Hochformat beibehalten"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Querformat beibehalten"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Aktuelle Ausrichtung beibehalten"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sicherer Start"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Weiter"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Du kannst dieses Gerät noch weiter schützen, indem du festlegst, dass vor dem Gerätestart die Eingabe deiner PIN erforderlich ist. Bis das Gerät startet, können weder Anrufe noch Nachrichten, Benachrichtigungen oder Alarme empfangen werden. \n\nSo schützt du Daten auf verloren gegangenen oder gestohlenen Geräten."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Du kannst dieses Gerät noch weiter schützen, indem du festlegst, dass vor dem Gerätestart die Eingabe deines Musters erforderlich ist. Bis das Gerät startet, können weder Anrufe noch Nachrichten, Benachrichtigungen oder Alarme empfangen werden. \n\nSo schützt du Daten auf verloren gegangenen oder gestohlenen Geräten."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Du kannst dieses Gerät noch weiter schützen, indem du festlegst, dass vor dem Gerätestart die Eingabe deines Passworts erforderlich ist. Bis das Gerät startet, können weder Anrufe noch Nachrichten, Benachrichtigungen oder Alarme empfangen werden. \n\nSo schützt du Daten auf verloren gegangenen oder gestohlenen Geräten."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Neben der Verwendung deines Fingerabdrucks zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du für den Gerätestart deine PIN erforderlich machst. Erst wenn das Gerät gestartet wurde, kann es Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen.\n\nDies trägt zum Schutz der Daten auf verlorenen oder gestohlenen Geräten bei."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Neben der Verwendung deines Fingerabdrucks zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du für den Gerätestart dein Muster erforderlich machst. Erst wenn das Gerät gestartet wurde, kann es Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen.\n\nDies trägt zum Schutz der Daten auf verlorenen oder gestohlenen Geräten bei."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Neben der Verwendung deines Fingerabdrucks zum Entsperren des Geräts kannst du es zusätzlich schützen, indem du für den Gerätestart dein Passwort erforderlich machst. Erst wenn das Gerät gestartet wurde, kann es Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen.\n\nDies trägt zum Schutz der Daten auf verloren gegangenen oder gestohlenen Geräten bei."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"PIN zum Starten des Geräts erforderlich"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Muster zum Starten des Geräts erforderlich"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Passwort zum Starten des Geräts erforderlich"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nein danke"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nein danke"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nein danke"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kannst dieses Gerät zusätzlich schützen, indem du festlegst, dass deine PIN vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden. \n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass deine PIN zum Starten des Geräts eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Du kannst dieses Gerät zusätzlich schützen, indem du festlegst, dass dein Muster vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden. \n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass dein Muster zum Starten des Geräts eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kannst dieses Gerät zusätzlich schützen, indem du festlegst, dass dein Passwort vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden. \n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass dein Passwort zum Starten des Geräts eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Neben dem Fingerabdruck zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass deine PIN vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass deine PIN zum Starten des Geräts eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Neben dem Fingerabdruck zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass dein Muster vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Möchtest du festlegen, dass dein Muster zum Starten des Geräts eingegeben werden muss?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Neben dem Fingerabdruck zum Entsperren deines Geräts kannst du dein Gerät noch zusätzlich schützen, indem du festlegst, dass dein Passwort vor dem Start eingegeben werden muss. Bis das Gerät startet, können keine Anrufe, Nachrichten oder Benachrichtigungen, einschließlich Weckrufen, empfangen werden.\n\nSo können Daten auf verloren gegangenen oder gestohlenen Geräten geschützt werden. Festlegen, dass dein Passwort zum Starten des Geräts eingegeben werden muss&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nein"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN erforderlich?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Muster erforderlich?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Passwort erforderlich?"</string>
@@ -2992,7 +2989,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Informationen zur relativen IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Standardmäßig öffnen"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Links zum Öffnen"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Links öffnen"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Unterstützte Links öffnen"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Ohne Nachfrage öffnen"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Unterstützte Links"</string>
@@ -3048,7 +3045,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Apps, die <xliff:g id="APPS">%1$s</xliff:g> verwenden"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Zum Aktivieren tippen"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Doppeltippe auf den Bildschirm, um das Gerät zu aktivieren."</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Links zum Öffnen"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Links öffnen"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Unterstützte Links nicht öffnen"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> öffnen"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> und andere URLs öffnen"</string>
@@ -3092,14 +3089,14 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"Durchschnittlich <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"Akku-Leistungsoptimierung"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"Akku-Optimierung"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Akkuwarnung"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Alle Apps anzeigen"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Weitere Apps ausblenden"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Nicht optimiert"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Nicht optimiert"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Akkuverbrauch optimiert"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"Akku-Leistungsoptimierung nicht verfügbar"</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Akku-Optimierung nicht verfügbar"</string>
     <string name="high_power_desc" msgid="6283926163708585760">"Keine Optimierung bezüglich der Akkuleistung anwenden. Dein Akku entleert sich hierdurch möglicherweise schneller."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Soll die App immer im Hintergrund ausgeführt werden?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Wenn du \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" erlaubst, stets im Hintergrund ausgeführt zu werden, kann dies die  Akkulaufzeit verringern. \n\nDu kannst dies später unter \"Einstellungen\" &gt; \"Apps &amp; Benachrichtigungen\" ändern."</string>
@@ -3136,9 +3133,9 @@
     <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>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"Der Assistent-App den Zugriff auf Bildschirminhalte in Form von Text gestatten"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"Der Assistent-App den Zugriff auf Bildschirminhalte wie Text gestatten"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Screenshot verwenden"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Der Assistent-App den Zugriff auf ein Bild auf dem Bildschirm gestatten"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Der Assistent-App den Zugriff auf eine Aufnahme deines Bildschirms gestatten"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Bildschirm kurz aufleuchten lassen"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Bildschirmrand kurz aufleuchten lassen, wenn Assistent-App auf Bildschirm- oder Screenshot-Text zugreift"</string>
     <string name="assist_footer" msgid="1982791172085896864">"Assistent-Apps helfen dir basierend auf den aktuell auf deinem Bildschirm angezeigten Informationen. Einige Apps unterstützen für eine einfachere Verwendung Übersichts- und Spracheingabedienste."</string>
@@ -3166,8 +3163,8 @@
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Zugriff auf \"Nicht stören\" für <xliff:g id="APP">%1$s</xliff:g> zulassen?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Die App kann \"Nicht stören\" aktivieren/deaktivieren und Änderungen an verwandten Einstellungen vornehmen."</string>
     <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Muss aktiviert bleiben, weil der Benachrichtigungszugriff aktiviert ist"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Zugriff auf \"Bitte nicht stören\" für <xliff:g id="APP">%1$s</xliff:g> aufheben?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle von dieser App erstellten \"Bitte nicht stören\"-Regeln werden entfernt."</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Zugriff auf \"Nicht stören\" für <xliff:g id="APP">%1$s</xliff:g> aufheben?"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Alle von dieser App erstellten \"Nicht stören\"-Regeln werden entfernt."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Nicht optimieren"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimieren"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Dein Akku entleert sich hierdurch möglicherweise schneller."</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Apps mit Berechtigung"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Ja"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Nein"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Unbekannte Apps installieren"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Unbek. Apps installieren"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"apps installieren aus unbekannten quellen"</string>
     <string name="write_settings" msgid="4797457275727195681">"Systemeinstellungen ändern"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"systemeinstellungen schreiben ändern"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Diese Berechtigung ermöglicht einer App das Ändern von Systemeinstellungen."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nein"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ja"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nein"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"App-Installationen zulassen"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Zulässig"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nicht zulässig"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Dieser Quelle vertrauen"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Zum Öffnen der Kamera zweimal drehen"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera App durch zweimaliges Drehen des Handgelenks öffnen"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Für Kamera Ein/Aus zweimal drücken"</string>
@@ -3269,7 +3266,7 @@
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Der mobile WLAN-Hotspot <xliff:g id="ID_1">%1$s</xliff:g> ist aktiviert. Das WLAN ist auf diesem Gerät deaktiviert."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Flugzeugmodus aktiviert"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"WLAN, Bluetooth und Mobilfunknetz sind deaktiviert. Du kannst keine Anrufe tätigen und keine Internetverbindung herstellen."</string>
-    <string name="condition_zen_title" msgid="2679168532600816392">"\"Bitte nicht stören\" aktiviert (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"\"Nicht stören\" aktiviert (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Energiesparmodus aktiviert"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Reduzierte Leistung. Standortdienste und Hintergrunddaten sind deaktiviert."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Mobile Daten sind deaktiviert"</string>
@@ -3300,7 +3297,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Warnlimit für mobile Datennutzung: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Warnlimit für mobile Datennutzung: <xliff:g id="ID_1">%1$s</xliff:g>/Datenlimit: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Abrechnungszeitraum"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Der monatliche Abrechnungszeitraum beginnt jeweils am <xliff:g id="ID_1">%1$s</xliff:g> jedes Monats."</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"Der monatliche Abrechnungszeitraum beginnt jeweils am <xliff:g id="ID_1">%1$s</xliff:g>. jedes Monats."</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Monatlich ab dem <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Netzwerkbeschränkungen"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
@@ -3339,7 +3336,7 @@
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Aus/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Niemals automatisch aktivieren"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Automatisch bei einem Akkustand von %1$s aktivieren"</string>
-    <string name="not_battery_optimizing" msgid="5362861851864837617">"Akku-Leistungsoptimierung wird nicht verwendet"</string>
+    <string name="not_battery_optimizing" msgid="5362861851864837617">"Akku-Optimierung wird nicht verwendet"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Wenn das Gerät gesperrt ist, ist das Schreiben von Antworten oder anderen Texten in Nachrichten nicht möglich"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Standardrechtschreibprüfung"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Rechtschreibprüfung wählen"</string>
@@ -3388,11 +3385,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Hilfe"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Geringste Breite"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Keine installierte App hat Zugriff auf Premium-SMS angefordert"</string>
+    <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_connected_summary" msgid="8733997010923307915">"Verbunden mit"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kacheln für Schnelleinstellungen für Entwickler"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Wir sind für dich da"</string>
@@ -3462,13 +3460,13 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Doppeltippen für schnellen Blick auf das Display des Tablets"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Doppeltippen für schnellen Blick auf das Display des Geräts"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Durch Doppeltippen auf das Display kannst du einen schnellen Blick auf deine Benachrichtigungen werfen."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Smartphone hochnehmen, um das Display anzusehen"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Für Benachr. anheben"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tablet hochnehmen, um das Display anzusehen"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Gerät hochnehmen, um das Display anzusehen"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Wirf einen schnellen Blick auf deine Benachrichtigungen, indem du dein Smartphone einfach in die Hand nimmst."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Wirf einen schnellen Blick auf deine Benachrichtigungen, indem du dein Tablet einfach in die Hand nimmst."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Wirf einen schnellen Blick auf deine Benachrichtigungen, indem du dein Gerät einfach in die Hand nimmst."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Für Benachrichtigungen Fingerabdrucksensor wischen"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Benachr. durch Fingerabdruck"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Smartphones über den Fingerabdrucksensor nach unten wischst."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Tablets über den Fingerabdrucksensor nach unten wischst."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Du kannst deine Benachrichtigungen lesen, indem du auf der Rückseite deines Geräts über den Fingerabdrucksensor nach unten wischst."</string>
@@ -3569,9 +3567,9 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Weitere Apps"</string>
     <string name="storage_files" msgid="8581083146777364063">"Dateien"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tablet-Speicher"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Smartphone-Speicher"</string>
+    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonspeicher"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Von <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"von <xliff:g id="TOTAL">%1$s</xliff:g> verwendet"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"belegt"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"App löschen"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Möchtest du diese Instant-App entfernen?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(für Nutzer <xliff:g id="USER">%s</xliff:g> deaktiviert)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"AutoFill-Dienst"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatisch, ausfüllen, füllen, autofill"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Möchtest du <xliff:g id="APP_NAME_0">%1$s</xliff:g> zu deiner AutoFill-App machen? <xliff:g id="APP_NAME_1">%1$s</xliff:g> kann dann deinen Bildschirm lesen und Felder in anderen Apps ausfüllen."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sorg dafür, dass dieser App vertraut wird.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; entscheidet anhand der Inhalte auf dem Display, welche Informationen automatisch ausgefüllt werden können."</string>
     <string name="device_theme" msgid="4571803018917608588">"Gerätedesign"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standard"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Speichermanager: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 36d9eb6..ab8d05b 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Κανένα"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Κανένα"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index afa218e..a9c0ffc 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Λογαριασμοί"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Τοποθεσία"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Λογαριασμοί"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Ασφάλεια και τοποθεσία"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Κρυπτογράφηση και διαπιστευτήρια"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Το τηλέφωνο είναι κρυπτογραφημένο"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Προτιμήσεις κλειδώματος οθόνης"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Το τηλέφωνο είναι κρυπτογραφημένο"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Προτιμήσεις κλειδ. οθόνης"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Απόρρητο"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Απενεργοποιήθηκε από τον διαχειριστή"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Κατάσταση ασφάλειας"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Διαχείριση μον.χαρακτ."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Χρήση μον.χαρακτ.για"</string>
@@ -424,8 +423,8 @@
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Κρυπτογράφηση"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του tablet. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του τηλεφώνου σας. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
-    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Περιμένετε έως ότου ολοκληρωθεί η κρυπτογράφηση του tablet σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
-    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Περιμένετε έως ότου ολοκληρωθεί η κρυπτογράφηση του τηλεφώνου σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Περιμένετε μέχρι να ολοκληρωθεί η κρυπτογράφηση του tablet σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
+    <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Περιμένετε μέχρι να ολοκληρωθεί η κρυπτογράφηση του τηλεφώνου σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"Για να ξεκλειδώσετε το tablet σας, απενεργοποιήστε το και, στη συνέχεια, ενεργοποιήστε το."</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"Για να ξεκλειδώσετε το τηλέφωνό σας, απενεργοποιήστε το και, στη συνέχεια, ενεργοποιήστε το."</string>
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Προσοχή: η συσκευή σας θα καταργηθεί μετά από <xliff:g id="COUNT">^1</xliff:g> αποτυχημένες προσπάθειες ξεκλειδώματος!"</string>
@@ -576,7 +575,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ενεργές εφαρμογές</item>
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> ενεργή εφαρμογή</item>
     </plurals>
-    <string name="manage_trust_agents" msgid="4629279457536987768">"Έμπιστοι αντιπρόσωποι"</string>
+    <string name="manage_trust_agents" msgid="4629279457536987768">"Έμπιστοι παράγοντες"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Για να τις χρησιμοποιήσετε, ορίστε πρώτα το κλείδωμα οθόνης"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Κανένας"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Η λειτουργία δεν είναι διαθέσιμη επειδή η σάρωση για δίκτυα Wi‑Fi είναι απενεργοποιημένη"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Διαμόρφωση 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Μάσκα υποδικτύου"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Διευθύνσεις IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Αποθηκευμένα δίκτυα"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Ρυθμίσεις IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Οι σύνθετες ρυθμίσεις Wi‑Fi δεν είναι διαθέσιμες για αυτόν το χρήστη"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Απενεργοποίηση"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Ενεργοποιήστε την προφύλαξη οθόνης για να ελέγξετε τι συμβαίνει όταν το τηλέφωνό σας είναι συνδεδεμένο στη βάση σύνδεσης ή/και βρίσκεται σε κατάσταση αδράνειας."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Πότε ξεκινά"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Τρέχουσα προφύλαξη οθόνης"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Έναρξη τώρα"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ρυθμίσεις"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Σηκώστε για ενεργοποίηση"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Οθόνη εισερχόμενης ειδοποίησης"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Οθόνη ambient"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Αφύπνιση οθόνης κατά τη λήψη ειδοποιήσεων"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Κάντε το κείμενο μεγαλύτερο ή μικρότερο"</string>
@@ -1231,9 +1228,9 @@
     <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Το μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> είναι έτοιμο για χρήση φωτογραφιών και άλλων μέσων."</string>
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Το νέο μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> λειτουργεί. \n\n Για να μετακινήσετε φωτογραφίες, αρχεία και δεδομένα εφαρμογών σε αυτήν τη συσκευή, μεταβείτε στις Ρυθμίσεις &gt; Αποθηκευτικός χώρος."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"Μετακίνηση <xliff:g id="APP">^1</xliff:g>"</string>
-    <string name="storage_wizard_move_confirm_body" msgid="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_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>
-    <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Μην αφαιρέσετε το μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> κατά τη διάρκεια της μετακίνησης. \n\n Η εφαρμογή <xliff:g id="APP">^2</xliff:g> σε αυτήν τη συσκευή δεν θα είναι διαθέσιμη έως ότου ολοκληρωθεί η μετακίνηση."</string>
+    <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Μην αφαιρέσετε το μέσο αποθήκευσης <xliff:g id="NAME">^1</xliff:g> κατά τη διάρκεια της μετακίνησης. \n\n Η εφαρμογή <xliff:g id="APP">^2</xliff:g> σε αυτήν τη συσκευή δεν θα είναι διαθέσιμη μέχρι να ολοκληρωθεί η μετακίνηση."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Ακύρωση μετακίνησης"</string>
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Το στοιχείο <xliff:g id="NAME_0">^1</xliff:g> παρουσιάζει καθυστέρηση. \n\nΜπορείτε να συνεχίσετε, αλλά οι εφαρμογές που έχουν μετακινηθεί σε αυτήν την τοποθεσία ενδέχεται να παρουσιάσουν δυσκολίες στη λειτουργία και οι μεταφορές δεδομένων ενδέχεται να καθυστερήσουν. \n\nΜπορείτε να χρησιμοποιήσετε ένα ταχύτερο <xliff:g id="NAME_1">^1</xliff:g> για καλύτερες επιδόσεις."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Κατάσταση μπαταρίας"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Δεν έχει χρησιμοποιηθεί ποτέ)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Βοηθός συντομεύσεων πληκτρολογίου"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Εμφάνιση διαθέσιμων συντομεύσεων"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Προεπιλογή"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Ποντίκι/επιφάνεια αφής"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Ταχύτητα δείκτη"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Χειριστήριο παιχνιδιού"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Χρήση δόνησης"</string>
@@ -1795,7 +1792,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Καθυστέρηση παρατετ. αγγίγματος"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Αντιστροφή χρωμάτων"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Ενδέχεται να επηρεάσει την απόδοση"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Κλικ μετά τη διακοπή της κίνησης του δείκτη"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Κλικ αφού σταμ/σει ο δείκ."</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Καθυστέρηση πριν από το κλικ"</string>
     <string name="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>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Χρήση οθόνης από την πλήρη φόρτιση"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Κατανάλωση οθόνης"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Σάρωση δικτύου κινητής τηλεφωνίας"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Πριν από <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Χρήση εφαρμογών από την πλήρη φόρτιση (πριν από <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Πριν από <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Χρήση εφ/γών από πλ. φόρτ. (πριν <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Χρόνος ενεργοποίησης της οθόνης από την πλήρη φόρτιση"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Χρήση της συσκευής από την πλήρη φόρτιση"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Χρήση μπαταρίας από τη στιγμή της αποσύνδεσης από την τροφοδοσία"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Κάμερα"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Ετοιμότητα κυψέλης"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Κατάσταση αναμονής δικτύου κινητής τηλεφωνίας"</string>
     <string name="power_phone" msgid="5392641106474567277">"Φωνητικές κλήσεις"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Αδράνεια tablet"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Το τηλέφωνο είναι αδρανές"</string>
@@ -2007,8 +2004,8 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Η χρήση της μπαταρίας αποτελεί μια προσέγγιση της χρήσης ενέργειας και δεν περιλαμβάνει κάθε πηγή διαρροής της μπαταρίας. Οι \"διάφορες χρήσεις\" αντανακλούν τη διαφορά μεταξύ της υπολογιζόμενης κατά προσέγγιση χρήσης ενέργειας και της πραγματικής διαρροής που παρατηρείται στη μπαταρία."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Υπερεκτίμηση χρήσης ισχύος"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Χρησιμοποιείται για %1$s"</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_used_for" msgid="2690821851327075443">"Χρησιμοποιείται για <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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ρυθμίσεις φωνητικής εισόδου και εξόδου"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Φωνητική αναζήτηση"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Πληκτρολόγιο Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Ομιλία"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Ρυθμίσεις φωνητικών εντολών"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Φωνητικές εντολές"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Υπηρεσίες φωνητικών εντολών"</string>
@@ -2146,7 +2142,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">"Πρέπε να ορίσετε έναν κωδικό PIN ή έναν κωδικό κλειδώματος οθόνης πριν χρησιμοποιήσετε τον χώρο αποθήκευσης διαπιστευτηρίων."</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>
@@ -2193,7 +2189,7 @@
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"Σύνδεση σε δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>…"</string>
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Προσθήκη δικτύου"</string>
-    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Δεν συνδέθηκε"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Μη συνδεδεμένο"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Προσθήκη δικτύου"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Ανανέωση λίστας"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Παράλειψη"</string>
@@ -2341,7 +2337,7 @@
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Απενέργ. αυτ/του συγχρονισμού;"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Με αυτόν τον τρόπο θα εξοικονομήσετε δεδομένα και χρήση μπαταρίας, αλλά θα πρέπει να συγχρονίσετε κάθε λογαριασμό με μη αυτόματο τρόπο για να συλλέξετε πρόσφατες πληροφορίες. Δεν θα λαμβάνετε ειδοποιήσεις κατά τη διάρκεια των ενημερώσεων."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ημερομηνία επαναφοράς κύκλου χρήσης"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ημερομηνία του κάθε μήνα:"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ημερομηνία κάθε μήνα:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ορισμός"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Ορισμός προειδοποίησης χρήσης δεδομένων"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Ορισμός ορίου χρήσης δεδομένων"</string>
@@ -2537,7 +2533,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Θα γίνει κοινή χρήση του ιστορικού κλήσεων με αυτόν το χρήστη."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Ενεργοποίηση τηλεφωνικών κλήσεων και SMS;"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Θα γίνει κοινή χρήση του ιστορικού κλήσεων και SMS με αυτόν το χρήστη."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Πληροφορίες έκτακτης ανάγκης"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Πληροφ. έκτακτης ανάγκης"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Πληροφορίες και επαφές για τον χρήστη <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Να επιτρέπονται εφαρμογές και περιεχόμενο"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Εφαρμογές με περιορισμούς"</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Χρήση προεπιλογής"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Πάντα"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Εκτός εάν είναι ανοικτή μια άλλη εφαρμογή πληρωμής"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Σε τερματικά που υποστηρίζουν τη λειτουργία \"Πατήστε και πληρώστε\", πληρωμή με:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Σε τερματικά \"Πατήστε και πληρώστε\", πληρωμή με:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Πληρωμή στο τερματικό"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Ρυθμίστε μια εφαρμογή πληρωμής. Στη συνέχεια, ακουμπήστε απλώς το πίσω μέρος του τηλεφώνου σας, σε οποιοδήποτε τερματικό με το σύμβολο ανέπαφης πληρωμής."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Το κατάλαβα"</string>
@@ -2731,12 +2727,14 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ένταση ήχου ειδοποίησης"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Προεπιλεγμ. ήχος ειδοποίησης"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Προσθήκη παρεχόμενου ήχου"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Προεπιλεγμ. ήχος ξυπνητηριού"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Δόνηση στις κλήσεις"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Άλλοι ήχοι"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Ήχοι πληκτρολογίου κλήσης"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ήχοι κλειδώματος οθόνης"</string>
-    <string name="charging_sounds_title" msgid="1132272552057504251">"Φόρτωση ήχων"</string>
+    <string name="charging_sounds_title" msgid="1132272552057504251">"Ήχοι φόρτωσης"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Ήχοι σύνδεσης"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Ήχοι αφής"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Δόνηση κατά το πάτημα"</string>
@@ -2752,7 +2750,7 @@
       <item quantity="other">Ενεργοποιήθηκαν <xliff:g id="ON_COUNT">%d</xliff:g> αυτόματοι κανόνες</item>
       <item quantity="one">Ενεργοποιήθηκε 1 αυτόματος κανόνας</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Προτιμήσεις λειτουργίας \"Μην ενοχλείτε\""</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Προτ/σεις \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Μόνο προτεραιότητας"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Αυτόματοι κανόνες"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ρύθμ. κανόνων \"Μην ενοχλείτε\""</string>
@@ -2761,7 +2759,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Μόνο ειδοποιήσεις"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Πλήρης σίγαση"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Αποκλεισμός οπτικών αντιπερισπασμών"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Αποκλ. οπτικών αντιπ/σμών"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Ήχοι προφίλ εργασίας"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Χρήση ήχων προσωπικού προφίλ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Οι ήχοι είναι ίδιοι για τα προφίλ εργασίας και τα προσωπικά προφίλ"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Να μην εμφανίζονται ποτέ ειδοποιήσεις"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Χαμηλή: Χωρίς ηχητική ή οπτική παρεμβολή"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Μεσαία: Χωρίς ήχο"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Υψηλή: Αναπαραγωγή ήχου"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Έκτακτη: Αναπαραγωγή ήχου και εμφάνιση στην οθόνη"</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="6585849855452076626">"Να επιτρέπεται ο ήχος"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Να μην συνοδεύονται αυτές οι ειδοποιήσεις από ήχο, δόνηση ή προβολή σε αναδυόμενο παράθυρο κατά την προβολή τους στην τρέχουσα οθόνη."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Βοηθός ειδοποιήσεων"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Πρόσβαση \"Μην ενοχλείτε\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Δεν ζητήθηκε πρόσβαση στη λειτουργία \"Μην ενοχλείτε\" από εγκατεστημένες εφαρμογές"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Το Android αποκλείει την εμφάνιση των ειδοποιήσεων αυτής της εφαρμογής σε αυτήν τη συσκευή"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Το Android αποκλείει την εμφάνιση των ειδοποιήσεων αυτής της κατηγορίας σε αυτήν τη συσκευή"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Κατηγορίες"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Άλλα"</string>
     <string name="no_channels" msgid="3077375508177744586">"Αυτή η εφαρμογή δεν έχει δημοσιεύσει ειδοποιήσεις"</string>
@@ -2916,7 +2917,7 @@
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Κανένα"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Ξυπνητήρια"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Υπενθυμίσεις"</string>
-    <string name="zen_mode_events" msgid="7914446030988618264">"Εκδηλώσεις"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"Συμβάντα"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Όλοι οι καλούντες"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Επιλεγμένοι καλούντες"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Καλούντες κατ\' επανάληψη"</string>
@@ -2939,9 +2940,9 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Αλλαγή σε ξυπνητήρια μόνο έως τις <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Αλλαγή σε διακοπές πάντα"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Αποκλεισμός όταν η οθόνη είναι ενεργοπ."</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Αποκλ. όταν η οθόνη είναι ενεργ."</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Αποτρέπει τη σύντομη προβολή ή την εμφάνιση ειδοποιήσεων που έχουν τεθεί σε σίγαση από τη λειτουργία \"Μην ενοχλείτε\""</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Αποκλεισμός όταν η οθόνη είναι απενεργ."</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Αποκλ. όταν η οθόνη είναι απεν."</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Αποτρ. την ενεργ. της οθόνης ή του φωτεινού παλμού ειδοπ. από ειδοποιήσεις που έχουν τεθεί σε σίγαση με τη λειτ. \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Αποτρέπει την ενεργοποίηση της οθόνης από ειδοποιήσεις που έχουν τεθεί σε σίγαση από τη λειτουργία \"Μην ενοχλείτε\""</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Απενεργοποιημένη"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Ενεργό"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Ανενεργό"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Καρφίτσωμα οθόνης"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Όταν είναι ενεργοποιημένη αυτή η ρύθμιση, μπορείτε να χρησιμοποιείτε το καρφίτσωμα οθόνης για να διατηρήσετε την τρέχουσα οθόνη σε προβολή έως ότου την ξεκαρφιτσώσετε.\n\nΓια να χρησιμοποιήσετε το καρφίτσωμα οθόνης:\n\n1. Βεβαιωθείτε ότι το καρφίτσωμα οθόνης είναι ενεργό.\n\n2. Ανοίξτε την οθόνη που θέλετε να καρφιτσώσετε.\n\n3. Πατήστε \"Επισκόπηση\".\n\n4. Σύρετε προς τα πάνω και πατήστε το εικονίδιο με την καρφίτσα."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Όταν είναι ενεργοποιημένη αυτή η ρύθμιση, μπορείτε να χρησιμοποιείτε το καρφίτσωμα οθόνης για να διατηρήσετε την τρέχουσα οθόνη σε προβολή μέχρι να την ξεκαρφιτσώσετε.\n\nΓια να χρησιμοποιήσετε το καρφίτσωμα οθόνης:\n\n1. Βεβαιωθείτε ότι το καρφίτσωμα οθόνης είναι ενεργό.\n\n2. Ανοίξτε την οθόνη που θέλετε να καρφιτσώσετε.\n\n3. Πατήστε \"Επισκόπηση\".\n\n4. Σύρετε προς τα πάνω και πατήστε το εικονίδιο με την καρφίτσα."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Να ζητείται το μοτίβο ξεκλειδώματος πριν από το ξεκαρφίτσωμα"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Να ζητείται το PIN πριν από το ξεκαρφίτσωμα"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Να ζητείται κωδικός πρόσβασης πριν από το ξεκαρφίτσωμα"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Διατήρηση τρέχοντος προσανατολισμού"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Ασφαλής εκκίνηση"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Συνέχεια"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Μπορείτε να προστατεύσετε ακόμα περισσότερο αυτήν τη συσκευή πραγματοποιώντας αίτημα κωδικού PIN πριν από την έναρξη της λειτουργίας της. Μέχρι να αρχίσει να λειτουργεί η συσκευή, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων σας σε περίπτωση κλοπής ή απώλειας της συσκευής σας."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Μπορείτε να προστατεύσετε ακόμα περισσότερο αυτήν τη συσκευή πραγματοποιώντας αίτημα μοτίβου πριν από την έναρξη της λειτουργίας της. Μέχρι να αρχίσει να λειτουργεί η συσκευή, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων σας σε περίπτωση κλοπής ή απώλειας της συσκευής σας."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Μπορείτε να προστατεύσετε ακόμα περισσότερο αυτήν τη συσκευή πραγματοποιώντας αίτημα κωδικού πρόσβασης πριν από την έναρξη της λειτουργίας της. Μέχρι να αρχίσει να λειτουργεί η συσκευή, δεν θα είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων σας σε περίπτωση κλοπής ή απώλειας της συσκευής σας."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Εκτός από τη χρήση του δακτυλικού σας αποτυπώματος για το ξεκλείδωμα της συσκευής, μπορείτε να προστατεύσετε περαιτέρω τη συγκεκριμένη συσκευή, ζητώντας το PIN σας πριν από την εκκίνησή της. Μέχρι να γίνει εκκίνηση της συσκευής, δεν θα είναι δυνατό να λαμβάνει κλήσεις, μηνύματα ή ειδοποιήσεις, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων σε περίπτωση κλοπής ή απώλειας της συσκευής."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Εκτός από τη χρήση του δακτυλικού σας αποτυπώματος για το ξεκλείδωμα της συσκευής, μπορείτε να προστατεύσετε περαιτέρω τη συγκεκριμένη συσκευή, ζητώντας το μοτίβο σας πριν από την εκκίνησή της. Μέχρι να γίνει εκκίνηση της συσκευής, δεν θα είναι δυνατό να λαμβάνει κλήσεις, μηνύματα ή ειδοποιήσεις, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων σε περίπτωση κλοπής ή απώλειας της συσκευής."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Εκτός από τη χρήση του δακτυλικού σας αποτυπώματος για το ξεκλείδωμα της συσκευής, μπορείτε να προστατεύσετε περαιτέρω τη συγκεκριμένη συσκευή, ζητώντας τον κωδικό πρόσβασής σας πριν από την εκκίνησή της. Μέχρι να γίνει εκκίνηση της συσκευής, δεν θα είναι δυνατό να λαμβάνει κλήσεις, μηνύματα ή ειδοποιήσεις, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτή η ρύθμιση συμβάλλει στην προστασία των δεδομένων σε περίπτωση κλοπής ή απώλειας της συσκευής."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Απαίτηση PIN για εκκίνηση της συσκευής"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Απαίτηση μοτίβου για εκκίνηση της συσκευής"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Απαίτηση κωδικού πρόσβασης για εκκίνηση της συσκευής"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Όχι"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Όχι"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Όχι"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του PIN πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται PIN για την έναρξη λειτουργίας της συσκευής;"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του μοτίβου σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται μοτίβο για την έναρξη λειτουργίας της συσκευής;"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του κωδικού πρόσβασής σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται κωδικός πρόσβασης για την έναρξη λειτουργίας της συσκευής;"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Εκτός από τη χρήση του δακτυλικού σας αποτυπώματος για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας το PIN πριν από την εκκίνηση της συσκευής. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών.\n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται PIN για την έναρξη λειτουργίας της συσκευής;"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Εκτός από τη χρήση του δακτυλικού αποτυπώματος για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του μοτίβου σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται μοτίβο για την έναρξη λειτουργίας της συσκευής;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Εκτός από τη χρήση του δακτυλικού αποτυπώματος για το ξεκλείδωμα της συσκευής σας, μπορείτε να προστατεύσετε περαιτέρω αυτήν τη συσκευή ζητώντας την εισαγωγή του κωδικού πρόσβασής σας πριν από την εκκίνησή της. Μέχρι να ξεκινήσει η λειτουργία της συσκευής, δεν είναι δυνατή η λήψη κλήσεων, μηνυμάτων ή ειδοποιήσεων, συμπεριλαμβανομένων των ξυπνητηριών. \n\nΑυτό βοηθά στην προστασία των δεδομένων σε συσκευές που έχουν χαθεί ή κλαπεί. Να απαιτείται κωδικός πρόσβασης για την έναρξη λειτουργίας της συσκευής&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ναι"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Όχι"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Αίτημα κωδικού PIN;"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Αίτημα μοτίβου;"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Αίτημα κωδικού πρόσβασης;"</string>
@@ -3076,7 +3073,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Προεπιλογή)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Σύστημα)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Προεπιλογή συστήματος)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Αποθηκευτικός χώρος εφαρμογών"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Αποθ. χώρος εφαρμογών"</string>
     <string name="usage_access" msgid="5479504953931038165">"Πρόσβαση χρήσης"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Να επιτρέπεται η πρόσβαση χρήσης"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Προτιμήσεις χρήσης εφαρμογής"</string>
@@ -3092,7 +3089,7 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"Μέση χρήση <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"Βελτιστοποίηση μπαταρίας"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"Βελτ/ποίηση μπαταρίας"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Ειδοποιήσεις χρήσης"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Εμφάνιση όλων των εφαρμογών"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Απόκρυψη επιπλέον εφαρμογών"</string>
@@ -3157,8 +3154,8 @@
     <string name="free_memory" msgid="4003936141603549746">"Ελεύθερη"</string>
     <string name="memory_usage_apps" msgid="5650192998273294098">"Μνήμη που χρησιμοποιείται από εφαρμογές"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> εφαρμογές χρησιμοποίησαν την μνήμη κατά τα τελευταία <xliff:g id="DURATION_1">%2$s</xliff:g></item>
-      <item quantity="one">1 εφαρμογή χρησιμοποίησε τη μνήμη κατά τα τελευταία <xliff:g id="DURATION_0">%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>
+      <item quantity="one">1 εφαρμογή χρησιμοποίησε τη μνήμη τις τελευταίες <xliff:g id="DURATION_0">%2$s</xliff:g></item>
     </plurals>
     <string name="running_frequency" msgid="6622624669948277693">"Συχνότητα"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"Μέγιστη χρήση"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Εφαρμογές με άδεια"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Ναι"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Όχι"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Εγκατάσταση άγνωστων εφαρμογών"</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>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"Ναι"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Όχι"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Να επιτρέπονται οι εγκαταστάσεις εφαρμογών"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Επιτρέπεται"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Δεν επιτρέπεται"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Διπλό πάτημα κουμπιού λειτ. για κάμερα"</string>
@@ -3229,7 +3226,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Τρίτη 6:02 μ.μ."</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Τρίτη 6:03 μ.μ."</string>
     <string name="disconnected" msgid="4836600637485526329">"Δεν συνδέθηκε"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"Χρησιμοποιήθηκε το <xliff:g id="AMOUNT">%1$s</xliff:g> των δεδομένων"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Χρησιμοποιήθηκαν <xliff:g id="AMOUNT">%1$s</xliff:g> δεδομένων"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">Ανενεργές για <xliff:g id="COUNT">%d</xliff:g> εφαρμογές</item>
       <item quantity="one">Ανενεργές για 1 εφαρμογή</item>
@@ -3294,7 +3291,7 @@
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Χρήση δεδομένων Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> δεδομένα κινητής τηλεφωνίας"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> δεδ/να κιν. τηλ."</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> δεδομένων Wi-Fi"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> δεδομένων ethernet"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"Προειδοποίηση <xliff:g id="ID_1">%1$s</xliff:g> δεδομένων"</string>
@@ -3321,7 +3318,7 @@
       <item quantity="one">1 εφαρμογή επιτρέπεται να χρησιμοποιεί απεριόριστα δεδομένα όταν είναι ενεργή η Εξοικονόμηση δεδομένων</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Εξοικονόμηση δεδομένων"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Απεριόριστη πρόσβαση σε δεδομένα"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Απερ/στη πρόσβ. δεδ."</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Τα δεδομένα παρασκηνίου είναι απενεργοποιημένα"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Ενεργή"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Απενεργοποιημένη"</string>
@@ -3390,9 +3387,10 @@
     <string name="developer_smallest_width" msgid="7516950434587313360">"Μικρότερο πλάτος"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Δεν ζητήθηκε πρόσβαση σε SMS ειδικής χρέωσης από εγκατεστημένες εφαρμογές"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"Τα SMS ειδικής χρέωσης ενδέχεται να κοστίσουν και θα αυξήσουν το συνολικό ποσό των λογαριασμών σας κινητού τηλεφώνου. Εάν ενεργοποιήσετε την πρόσβαση για μια εφαρμογή, θα μπορείτε να στέλνετε SMS ειδικής χρέωσης χρησιμοποιώντας τη συγκεκριμένη εφαρμογή."</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Πρόσβαση σε SMS ειδικής χρέωσης"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Πρόσβαση σε SMS Premium"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Μη ορατό σε άλλες συσκευές"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Σε σύνδεση με"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Πλακίδια προγραμματιστή για γρήγορες ρυθμίσεις"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Είμαστε εδώ για να σας βοηθήσουμε"</string>
@@ -3462,7 +3460,7 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Πατήστε δύο φορές για να ελέγξετε το tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Πατήστε δύο φορές για να ελέγξετε τη συσκευή"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Για να ελέγξετε γρήγορα τις ειδοποιήσεις σας, κάντε διπλό πάτημα στην οθόνη."</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">"Σηκώστε το tablet για να το ελέγξετε"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Σηκώστε τη συσκευή για να την ελέγξετε"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Για να ελέγξετε γρήγορα τις ειδοποιήσεις σας, σηκώστε το τηλέφωνο."</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(απενεργοποιήθηκε για <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Υπηρεσία αυτόματης συμπλήρωσης"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"αυτόματη, συμπλήρωση, αυτόματη συμπλήρωση"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Ορισμός της εφαρμογής <xliff:g id="APP_NAME_0">%1$s</xliff:g> ως εφαρμογής αυτόματης συμπλήρωσης; Η εφαρμογή <xliff:g id="APP_NAME_1">%1$s</xliff:g> θα έχει τη δυνατότητα να διαβάζει την οθόνη σας και να συμπληρώνει πεδία σε άλλες εφαρμογές."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Βεβαιωθείτε ότι εμπιστεύεστε αυτήν την εφαρμογή&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; χρησιμοποιεί το περιεχόμενο της οθόνης σας για να διαπιστώσει τι μπορεί να συμπληρωθεί αυτόματα."</string>
     <string name="device_theme" msgid="4571803018917608588">"Θέμα συσκευής"</string>
     <string name="default_theme" msgid="7085644992078579076">"Προεπιλογή"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Διαχείριση αποθηκευτικού χώρου: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 1dee36e..395746a 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"None"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"None"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index abad089..abd20d2 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"You don\'t have permission to change Bluetooth settings."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while the Bluetooth settings are open."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Security &amp; Location"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Phone encrypted"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Phone encrypted"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Lock screen preferences"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -431,11 +430,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decryption unsuccessful"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Set screen lock"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notify when a high‑quality public network is available"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Turn on Wi‑Fi automatically"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi will turn back on near high‑quality saved networks, like your home network"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Unavailable because Wi‑Fi scanning is turned off"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Don\'t use a Wi‑Fi network unless it has a good Internet connection"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Only use networks that have a good Internet connection"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configure 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saved networks"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP settings"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi advanced settings are not available for this user"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Off"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"To control what happens when the phone is docked and/or sleeping, turn the screen saver on."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"When to start"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Current screen saver"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start now"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Incoming notification screen"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"System updates cannot be installed on external media."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force stop an app, it may misbehave."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force-stop an app, it may misbehave."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn\'t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"More info on <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Running"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Never used)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Keyboard shortcuts helper"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Display available shortcuts"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Default"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/track pad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Pointer speed"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Game Controller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Use vibrator"</string>
@@ -1779,7 +1776,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
     <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_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_shortcut_service_title" msgid="4779360749706905640">"Shortcut service"</string>
@@ -1877,7 +1874,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="one">1 print service on</item>
     </plurals>
-    <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Printing services"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> ago"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">%1$s</xliff:g> ago)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobile standby"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobile network standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Battery use is an approximation of power use and does not include every source of battery drain. Miscellaneous is the difference between the computed approximate power use and the actual drain observed on the battery."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android keyboard"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Speech"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Voice input settings"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Voice input"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Voice input services"</string>
@@ -2157,7 +2153,7 @@
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Backup account"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Include app data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed up settings and data"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed-up settings and data"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"Backup service isn\'t active"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
@@ -2557,7 +2553,7 @@
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"At a Tap &amp; pay terminal, pay with:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
-    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Understood"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Got it"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"More..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"Always use <xliff:g id="APP">%1$s</xliff:g> when you Tap &amp; pay?"</string>
@@ -2663,7 +2659,7 @@
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Users &amp; accounts"</string>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default Apps"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
     <string name="search_menu" msgid="6283419262313758339">"Search Settings"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Default notification sound"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"App provided sound"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Default notification sound"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Default alarm sound"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"When your device is locked, how do you want profile notifications to be displayed?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profile notifications"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Never show notifications"</string>
@@ -2799,10 +2798,10 @@
     <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 on screen"</string>
-    <string name="notification_importance_min_summary" msgid="8233873580287975662">"Low: No sound or visual interruption"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Medium: No sound"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"High: Make sound"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgent: Make sound and 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
@@ -2825,10 +2824,10 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"When device is in VR"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reduce blur (recommended)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reduce flicker"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-Picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-Picture"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-picture"</string>
     <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_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_on" msgid="6103704909710176555">"Yes"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
@@ -2953,8 +2954,8 @@
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Off"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Screen-pinning"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"When this setting is turned on, you can use screen-pinning to keep the current screen in view until you unpin.\n\nTo use screen-pinning:\n\n1. Make sure that screen-pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Tap Overview.\n\n4. Swipe up and then tap the pin icon."</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Screen pinning"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure that screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Tap Overview.\n\n4. Swipe up and then tap the pin icon."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure start-up"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Require PIN to start device"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Require pattern to start device"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Require password to start device"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"No, thanks"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"No, thanks"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"No, thanks"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Require pattern?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Require password?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Yes"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"No"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Allow app installs"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Allowed"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Not allowed"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Allow from this source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
@@ -3267,7 +3264,7 @@
     <string name="condition_expand_hide" msgid="948507739223760667">"Hide"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot is on"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Portable Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> is active, Wi-Fi for this device is turned off."</string>
-    <string name="condition_airplane_title" msgid="287356299107070503">"Flight mode is on"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"Aeroplane mode is on"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth and mobile network are turned off. You can\'t make phone calls or connect to the Internet."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Do not disturb is on (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Battery Saver is on"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Connected to"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
@@ -3454,7 +3452,7 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to Camera"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Make <xliff:g id="APP_NAME_0">%1$s</xliff:g> your auto-fill app? <xliff:g id="APP_NAME_1">%1$s</xliff:g> will be able to read your screen and fill fields in other apps."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
     <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 1dee36e..395746a 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"None"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"None"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index abad089..abd20d2 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"You don\'t have permission to change Bluetooth settings."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while the Bluetooth settings are open."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Security &amp; Location"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Phone encrypted"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Phone encrypted"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Lock screen preferences"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -431,11 +430,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decryption unsuccessful"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Set screen lock"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notify when a high‑quality public network is available"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Turn on Wi‑Fi automatically"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi will turn back on near high‑quality saved networks, like your home network"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Unavailable because Wi‑Fi scanning is turned off"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Don\'t use a Wi‑Fi network unless it has a good Internet connection"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Only use networks that have a good Internet connection"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configure 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saved networks"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP settings"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi advanced settings are not available for this user"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Off"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"To control what happens when the phone is docked and/or sleeping, turn the screen saver on."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"When to start"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Current screen saver"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start now"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Incoming notification screen"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"System updates cannot be installed on external media."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force stop an app, it may misbehave."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force-stop an app, it may misbehave."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn\'t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"More info on <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Running"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Never used)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Keyboard shortcuts helper"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Display available shortcuts"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Default"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/track pad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Pointer speed"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Game Controller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Use vibrator"</string>
@@ -1779,7 +1776,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
     <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_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_shortcut_service_title" msgid="4779360749706905640">"Shortcut service"</string>
@@ -1877,7 +1874,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="one">1 print service on</item>
     </plurals>
-    <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Printing services"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> ago"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">%1$s</xliff:g> ago)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobile standby"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobile network standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Battery use is an approximation of power use and does not include every source of battery drain. Miscellaneous is the difference between the computed approximate power use and the actual drain observed on the battery."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android keyboard"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Speech"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Voice input settings"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Voice input"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Voice input services"</string>
@@ -2157,7 +2153,7 @@
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Backup account"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Include app data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed up settings and data"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed-up settings and data"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"Backup service isn\'t active"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
@@ -2557,7 +2553,7 @@
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"At a Tap &amp; pay terminal, pay with:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
-    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Understood"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Got it"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"More..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"Always use <xliff:g id="APP">%1$s</xliff:g> when you Tap &amp; pay?"</string>
@@ -2663,7 +2659,7 @@
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Users &amp; accounts"</string>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default Apps"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
     <string name="search_menu" msgid="6283419262313758339">"Search Settings"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Default notification sound"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"App provided sound"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Default notification sound"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Default alarm sound"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"When your device is locked, how do you want profile notifications to be displayed?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profile notifications"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Never show notifications"</string>
@@ -2799,10 +2798,10 @@
     <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 on screen"</string>
-    <string name="notification_importance_min_summary" msgid="8233873580287975662">"Low: No sound or visual interruption"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Medium: No sound"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"High: Make sound"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgent: Make sound and 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
@@ -2825,10 +2824,10 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"When device is in VR"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reduce blur (recommended)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reduce flicker"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-Picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-Picture"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-picture"</string>
     <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_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_on" msgid="6103704909710176555">"Yes"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
@@ -2953,8 +2954,8 @@
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Off"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Screen-pinning"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"When this setting is turned on, you can use screen-pinning to keep the current screen in view until you unpin.\n\nTo use screen-pinning:\n\n1. Make sure that screen-pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Tap Overview.\n\n4. Swipe up and then tap the pin icon."</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Screen pinning"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure that screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Tap Overview.\n\n4. Swipe up and then tap the pin icon."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure start-up"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Require PIN to start device"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Require pattern to start device"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Require password to start device"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"No, thanks"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"No, thanks"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"No, thanks"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Require pattern?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Require password?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Yes"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"No"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Allow app installs"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Allowed"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Not allowed"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Allow from this source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
@@ -3267,7 +3264,7 @@
     <string name="condition_expand_hide" msgid="948507739223760667">"Hide"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot is on"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Portable Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> is active, Wi-Fi for this device is turned off."</string>
-    <string name="condition_airplane_title" msgid="287356299107070503">"Flight mode is on"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"Aeroplane mode is on"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth and mobile network are turned off. You can\'t make phone calls or connect to the Internet."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Do not disturb is on (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Battery Saver is on"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Connected to"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
@@ -3454,7 +3452,7 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to Camera"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Make <xliff:g id="APP_NAME_0">%1$s</xliff:g> your auto-fill app? <xliff:g id="APP_NAME_1">%1$s</xliff:g> will be able to read your screen and fill fields in other apps."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
     <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 1dee36e..395746a 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"None"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"None"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index abad089..abd20d2 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Disconnect?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"This will end your connection with:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"You don\'t have permission to change Bluetooth settings."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while Bluetooth settings is open."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> is visible to nearby devices while the Bluetooth settings are open."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Disconnect <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Broadcasting"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Disable profile?"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Security &amp; Location"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encryption &amp; credentials"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Phone encrypted"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Phone encrypted"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Lock screen preferences"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disabled by admin"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Security status"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Screen lock, fingerprint"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Screen lock"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Manage fingerprints"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Use fingerprint for"</string>
@@ -431,11 +430,11 @@
     <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"Warning: Your device will be wiped after <xliff:g id="COUNT">^1</xliff:g> more failed attempts to be unlocked!"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"Encryption was interrupted and can\'t be completed. As a result, the data on your tablet is no longer accessible. \n\n To resume using your tablet, you need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"Encryption was interrupted and can\'t be completed. As a result, the data on your phone is no longer accessible. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Decryption unsuccessful"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google Account."</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google Account."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your tablet, you will need to perform a factory reset. When you set up your tablet after the reset, you\'ll have an opportunity to restore any data that was backed up to your Google account."</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"The password that you entered is correct, but unfortunately your data is corrupt. \n\nTo resume using your phone, you need to perform a factory reset. When you set up your phone after the reset, you’ll have an opportunity to restore any data that was backed up to your Google account."</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Switch input method"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Set screen lock"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protect your device"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notify when a high‑quality public network is available"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Turn on Wi‑Fi automatically"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi will turn back on near high‑quality saved networks, like your home network"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Unavailable because Wi‑Fi scanning is turned off"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Avoid poor connections"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Don\'t use a Wi‑Fi network unless it has a good Internet connection"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Only use networks that have a good Internet connection"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configure 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 addresses"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saved networks"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP settings"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi advanced settings are not available for this user"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Off"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"To control what happens when the phone is docked and/or sleeping, turn the screen saver on."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"When to start"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Current screen saver"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start now"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Settings"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lift to wake"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Incoming notification screen"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambient display"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Wake screen when you receive notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Make text larger or smaller"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"System updates cannot be installed on external media."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Device admin app can\'t be installed on external media"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Force stop?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force stop an app, it may misbehave."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"If you force-stop an app, it may misbehave."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Couldn\'t move app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferred install location"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"App details"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App installed from <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"More info on <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Running"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Never used)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Keyboard shortcuts helper"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Display available shortcuts"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Default"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/track pad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Pointer speed"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Game Controller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Use vibrator"</string>
@@ -1779,7 +1776,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tap 3 times to zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Tap a button to zoom"</string>
     <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_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_shortcut_service_title" msgid="4779360749706905640">"Shortcut service"</string>
@@ -1877,7 +1874,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
       <item quantity="one">1 print service on</item>
     </plurals>
-    <string name="print_settings_title" msgid="3685449667822217816">"Printing Services"</string>
+    <string name="print_settings_title" msgid="3685449667822217816">"Printing services"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"No services installed"</string>
     <string name="print_no_printers_found" msgid="989018646884973683">"No printers found"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Settings"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Screen usage since full charge"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Screen consumption"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobile network scanning"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> ago"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">%1$s</xliff:g> ago)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ago"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"App usage since full charge (<xliff:g id="TIME">^1</xliff:g> ago)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Amount of time screen has been on since full charge"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Device usage since full charge"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Battery use since unplugged"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobile standby"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobile network standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Voice calls"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet idle"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Phone idle"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Battery use is an approximation of power use and does not include every source of battery drain. Miscellaneous is the difference between the computed approximate power use and the actual drain observed on the battery."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Over-counted power use"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Used for %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Used for <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> used by <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> of overall battery"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown since last full charge"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Voice input &amp; output settings"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Voice search"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android keyboard"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Speech"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Voice input settings"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Voice input"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Voice input services"</string>
@@ -2157,7 +2153,7 @@
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Backup account"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Include app data"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automatic restore"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed up settings and data"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"When reinstalling an app, restore backed-up settings and data"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"Backup service isn\'t active"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"No account is currently storing backed up data"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
@@ -2557,7 +2553,7 @@
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"At a Tap &amp; pay terminal, pay with:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Paying at the terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Set up a payment app. Then just hold the back of your phone up to any terminal with the contactless symbol."</string>
-    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Understood"</string>
+    <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Got it"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"More..."</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"Always use <xliff:g id="APP">%1$s</xliff:g> when you Tap &amp; pay?"</string>
@@ -2663,7 +2659,7 @@
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Apps &amp; notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permissions, default apps"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Users &amp; accounts"</string>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default Apps"</string>
+    <string name="app_default_dashboard_title" msgid="7342549305933047317">"Default apps"</string>
     <string name="system_dashboard_summary" msgid="5797743225249766685">"Languages, time, backup, updates"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
     <string name="search_menu" msgid="6283419262313758339">"Search Settings"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Default notification sound"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"App provided sound"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Default notification sound"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Default alarm sound"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Also vibrate for calls"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"When your device is locked, how do you want profile notifications to be displayed?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profile notifications"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Never show notifications"</string>
@@ -2799,10 +2798,10 @@
     <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 on screen"</string>
-    <string name="notification_importance_min_summary" msgid="8233873580287975662">"Low: No sound or visual interruption"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Medium: No sound"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"High: Make sound"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgent: Make sound and 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Notification assistant"</string>
@@ -2825,10 +2824,10 @@
     <string name="display_vr_pref_title" msgid="8104485269504335481">"When device is in VR"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"Reduce blur (recommended)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"Reduce flicker"</string>
-    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-Picture"</string>
-    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-Picture"</string>
+    <string name="picture_in_picture_title" msgid="5824849294270017113">"Picture-in-picture"</string>
+    <string name="picture_in_picture_empty_text" msgid="685224245260197779">"No installed apps support Picture-in-picture"</string>
     <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_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_on" msgid="6103704909710176555">"Yes"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android is blocking this app\'s notifications from appearing on this device"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android is blocking this category of notifications from appearing on this device"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Other"</string>
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
@@ -2953,8 +2954,8 @@
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Enter admin PIN"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Off"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Screen-pinning"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"When this setting is turned on, you can use screen-pinning to keep the current screen in view until you unpin.\n\nTo use screen-pinning:\n\n1. Make sure that screen-pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Tap Overview.\n\n4. Swipe up and then tap the pin icon."</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Screen pinning"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"When this setting is turned on, you can use screen pinning to keep the current screen in view until you unpin.\n\nTo use screen pinning:\n\n1. Make sure that screen pinning is turned on.\n\n2. Open the screen that you want to pin.\n\n3. Tap Overview.\n\n4. Swipe up and then tap the pin icon."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ask for unlock pattern before unpinning"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ask for PIN before unpinning"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ask for password before unpinning"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Stay in current orientation"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure start-up"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continue"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can\'t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Require PIN to start device"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Require pattern to start device"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Require password to start device"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"No, thanks"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"No, thanks"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"No, thanks"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"You can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"You can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"You can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms. \n\nThis helps protect data on lost or stolen devices. Require password to start your device?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your PIN before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require PIN to start your device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your pattern before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require pattern to start your device?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"In addition to using your fingerprint to unlock your device, you can further protect this device by requiring your password before it starts up. Until the device starts up, it can’t receive calls, messages or notifications, including alarms.\n\nThis helps protect data on lost or stolen devices. Require password to start your device&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Require PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Require pattern?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Require password?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"This permission allows an app to modify system settings."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Yes"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"No"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Allow app installs"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Allowed"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Not allowed"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Allow from this source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Double twist for camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open the camera app by twisting your wrist twice"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press power button twice for camera"</string>
@@ -3267,7 +3264,7 @@
     <string name="condition_expand_hide" msgid="948507739223760667">"Hide"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Hotspot is on"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Portable Wi-Fi hotspot <xliff:g id="ID_1">%1$s</xliff:g> is active, Wi-Fi for this device is turned off."</string>
-    <string name="condition_airplane_title" msgid="287356299107070503">"Flight mode is on"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"Aeroplane mode is on"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth and mobile network are turned off. You can\'t make phone calls or connect to the Internet."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Do not disturb is on (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Battery Saver is on"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Connected to"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"We\'re here to help"</string>
@@ -3454,7 +3452,7 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Quick gestures to control your phone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Quick gestures to control your tablet"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Quick gestures to control your device"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to Camera"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Jump to camera"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"To quickly open camera, press the power button twice. Works from any screen."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Flip camera"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disabled for user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Auto-fill service"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fill, auto-fill"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Make <xliff:g id="APP_NAME_0">%1$s</xliff:g> your auto-fill app? <xliff:g id="APP_NAME_1">%1$s</xliff:g> will be able to read your screen and fill fields in other apps."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Make sure that you trust this app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Auto-fill&gt;%1$s&lt;/xliff:g&gt; uses what\'s on your screen to determine what can be auto-filled."</string>
     <string name="device_theme" msgid="4571803018917608588">"Device theme"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 0377b52..d40bb83 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ninguno"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ninguno"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 7ec4399..9b34e73 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"¿Desconectar?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Esto pondrá fin a tu conexión con:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"No tienes permiso para cambiar la configuración de Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Los dispositivos cercanos pueden ver a <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si la configuración de Bluetooth está abierta."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Los dispositivos cercanos podrán ver tu <xliff:g id="DEVICE_NAME">%1$s</xliff:g> si está abierta la configuración de Bluetooth."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"¿Desconectar <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisión"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"¿Inhabilitar perfil?"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Seguridad y ubicación"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación y credenciales"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Teléfono encriptado"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Teléfono encriptado"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferencias de pantalla bloqueada"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacidad"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"El administrador inhabilitó esta opción"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estado de seguridad"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo de pantalla, huella digital"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Huella digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Adm. huellas digitales"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar huella dig. para"</string>
@@ -353,7 +352,7 @@
       <item quantity="one">Se configuró <xliff:g id="COUNT_0">%1$d</xliff:g> huella digital.</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Usar huella digital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquea con huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usa tus huellas digitales"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo toca el sensor de huellas digitales para desbloquear tu teléfono, autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: Tu huella digital puede ser menos segura que un PIN o un patrón eficaz."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Toca el sensor de huellas digitales para autorizar compras o acceder a las apps. Ten cuidado con las personas que agregas, ya que todas las huellas digitales que agregues podrán realizar estas acciones.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, comunícate con el administrador de la organización."</string>
@@ -570,7 +569,7 @@
     <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>
-    <string name="manage_device_admin" msgid="537804979483211453">"Apps del dispositivo del administrador"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Apps de administración"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"No hay apps activas"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> apps activas</item>
@@ -588,8 +587,8 @@
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"Bluetooth"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"Administrar conexiones, establecer nombre y detección del dispositivo"</string>
-    <string name="bluetooth_pairing_request" msgid="2605098826364694673">"¿Sincronizar con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
-    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"Código de sincronización Bluetooth"</string>
+    <string name="bluetooth_pairing_request" msgid="2605098826364694673">"¿Vincular con <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
+    <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"Código de vinculación Bluetooth"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"Ingresa el código de sincronización y luego presiona Intro."</string>
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"El PIN contiene letras o símbolos."</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"Por lo general, 0000 o 1234"</string>
@@ -652,7 +651,7 @@
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Habilitar pantalla inalámbrica"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"No se encontraron dispositivos cercanos."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Conectando"</string>
-    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectada"</string>
+    <string name="wifi_display_status_connected" msgid="8364125226376985558">"Conectado"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"En uso"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"No disponible"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"Configuración de visualización"</string>
@@ -671,7 +670,7 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Activa NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC intercambia datos entre este dispositivo y otras orientaciones o dispositivos cercanos, como terminales de pago, lectores de acceso o etiquetas."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para transmitir el contenido de la aplicación a través de NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para transmitir contenido de aplicaciones por NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivada"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible porque NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notificarme cuando haya una red pública de alta calidad"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activar Wi-Fi automáticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"El Wi-Fi se volverá a activar automáticamente cerca de redes guardadas de alta calidad, como tu red doméstica"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"La opción no está disponible porque la búsqueda de redes Wi-Fi está desactivada"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar malas conexiones"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Usar solo redes con una conexión a Internet estable"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subred"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Direcciones IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Redes guardadas"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configuración de IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"La configuración avanzada de Wi‑Fi no está disponible para este usuario"</string>
@@ -963,7 +961,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"Brillo"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Se optimiza el nivel de brillo según la luz disponible."</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Inhabilitado"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"El nivel de brillo preferido es muy bajo"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"El nivel de brillo preferido es bajo"</string>
@@ -1007,7 +1005,7 @@
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Personalizado"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Cambiar fondo de pantalla"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personalizar tu pantalla"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elegir fondo de pantalla de"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elegir fondo de pantalla"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Protector de pantalla"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Mientras se carga o está conectado"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"En ambos casos"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Apagado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar qué sucede cuando el teléfono está conectado o suspendido, activa el protector de pantalla."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Cuándo comenzar"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Protector de pantalla actual"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Comenzar ahora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuración"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Notificaciones entrantes"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activar la pantalla al recibir notificaciones"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o reduce el tamaño del texto en pantalla"</string>
@@ -1281,7 +1278,7 @@
     <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_network_desc" msgid="5547979398298881406">"Se restablecerán las opciones de configuración de todas redes, lo que incluye:\n\n"<li>"Wi‑Fi"</li>\n<li>"datos móviles"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_desc" msgid="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>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Restablecer configuración"</string>
@@ -1320,11 +1317,11 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Anclaje a red Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Anclaje a red"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Hotspot y conexión mediante dispositivo portátil"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Hotspots y dispositivos portátiles"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot activado, conexión mediante dispositivo portátil"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot activado"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Conexión mediante dispositivo portátil"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No se puede realizar una conexión mediante dispositivo portátil ni usar hotspot portátil cuando se activa el modo Ahorro de datos"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"No podrán establecerse conexiones a través del dispositivo portátil ni hotspots portátiles cuando se active el modo de ahorro de datos."</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Anclaje a red USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Conectado al USB, verificar el anclaje a redes"</string>
@@ -1370,7 +1367,7 @@
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ahorro de batería"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Solo en dispositivo"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Ubicación desactivada"</string>
-    <string name="location_app_level_permissions" msgid="1825588230817081339">"Permisos a nivel de la app"</string>
+    <string name="location_app_level_permissions" msgid="1825588230817081339">"Permisos en las apps"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Solicitudes de ubicaciones recientes"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Ninguna aplicación solicitó la ubicación recientemente."</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Servicios de ubicación"</string>
@@ -1524,7 +1521,7 @@
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Desinstalar en todos los usuarios"</string>
     <string name="install_text" msgid="884360662922471113">"Instalar"</string>
     <string name="disable_text" msgid="6544054052049395202">"Inhabilitar"</string>
-    <string name="enable_text" msgid="9217362512327828987">"Activar"</string>
+    <string name="enable_text" msgid="9217362512327828987">"Habilitar"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Eliminar datos"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Desinstalar las actualizaciones"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"Has elegido lanzar esta aplicación de manera predeterminada para algunas acciones."</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalles de la app"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"La app se instaló desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Más información en <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operaciones de las aplicaciones"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"En curso"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Sin utilizar)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Asistente de combinación de teclas"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar accesos directos disponibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predeterminadas"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse y panel táctil"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de juegos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibración"</string>
@@ -1760,7 +1757,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Configuración de accesibilidad"</string>
     <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 puede cambiarse más tarde en Configuració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="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>
@@ -1772,7 +1769,7 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Presiona los elementos en tu pantalla para escuchar la lectura en voz alta"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítulos"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Ampliación"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Ampliar al presionar tres veces"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Ampliar presionando tres veces"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Ampliar con el botón"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Ampliar con el botón y al presionar tres veces"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Acercar en la pantalla"</string>
@@ -1781,22 +1778,22 @@
     <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 a la accesibilidad"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso directo"</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">"Cuando actives la combinación de teclas, puedes presionar los dos botones de volumen durante 3 segundos para iniciar una función de accesibilidad."</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_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>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Cortar con el botón de encendido"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Puntero del mouse grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinar canales al reproducir audio"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinar canales cuando se reproduce audio"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Tiempo de respuesta táctil"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inversión de color"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Puede afectar el rendimiento"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Hacer clic después de que el puntero deja de moverse"</string>
-    <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Tiempo de demora antes de hacer clic"</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>
@@ -1888,7 +1885,7 @@
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Agregar impresora"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Buscar"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"Buscando impresoras"</string>
-    <string name="print_service_disabled" msgid="7739452396114245222">"Servicio inhabilitado"</string>
+    <string name="print_service_disabled" msgid="7739452396114245222">"Servicio desactivado"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Trabajos de impresión"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Trabajo de impresión"</string>
     <string name="print_restart" msgid="8373999687329384202">"Reiniciar"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Escaneo de redes móviles"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"hace <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde la última carga completa (hace <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde la última carga (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que estuvo encendida la pantalla desde la última carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la última carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se desconectó"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Dispositivo inactivo"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Red móvil en modo de espera"</string>
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ausente"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"El uso de la batería es un cálculo aproximado del uso de energía y no incluye todas las fuentes de consumo de batería. El uso variado es la diferencia entre el uso de energía variado computado y el consumo real observado en la batería."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculada"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Se usó durante %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Se usó durante <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
@@ -2034,7 +2031,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"con <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Porcentaje de batería"</string>
-    <string name="battery_percentage_description" msgid="8511658577507384014">"Mostrar porcentaje de batería en barra de estado"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Muestra el porcentaje de la batería en la barra de estado"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas para geeks sobre procesos activos"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado de Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Voz"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Configuración de entrada de voz"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Entrada de voz"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Servicios de entrada de voz"</string>
@@ -2145,7 +2141,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Credenciales borradas"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Imposible borrar almac credenc"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"El almacenamiento de credenciales está activado."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Debes establecer un PIN o contraseña de la pantalla de bloqueo antes de usar el almacenamiento de credenciales."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para usar el almacenamiento de credenciales, debes establecer un PIN o una contraseña para la pantalla de bloqueo."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Acceso a datos de uso"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer el comportamiento cuando se establece una llamada de emergencia"</string>
@@ -2340,14 +2336,14 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Cualquier cambio que realices en tus cuentas en la Web se copiará automáticamente en el teléfono.\n\nAlgunas cuentas también podrían copiar de forma automática en la Web los cambios que realices en el teléfono. Una cuenta de Google funciona de esta manera."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar sinc. automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Así ahorrarás datos y energía, pero tendrás que sincronizar cada cuenta manualmente para recopilar la información reciente. Por otro lado, no se te notificarán las actualizaciones."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Fecha de restablecimiento del ciclo de uso"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Elige el día de inicio cada ciclo"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Fecha de cada mes:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Configurar"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Configurar advertencia acerca del uso de datos"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Establecer el límite de uso de datos"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Límite del uso de datos"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitar el uso de datos"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tu tablet desactivará los datos móviles cuando se alcance el límite especificado.\n\nDebido a que los datos registrados por tu tablet y proveedor pueden ser diferentes, considera establecer un límite prudente."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Tu teléfono desactivará los datos móviles cuando se alcance el límite especificado.\n\nDebido a que los datos registrados por tu teléfono y proveedor pueden ser diferentes, considera establecer un límite prudente."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"La tablet desactivará los datos móviles cuando alcance el límite especificado.\n\nRecuerda que los datos registrados por la tablet y el proveedor pueden ser diferentes. Trata de establecer un límite prudente."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"El teléfono desactivará los datos móviles cuando alcance el límite especificado.\n\nRecuerda que los datos registrados por el teléfono y el proveedor pueden ser diferentes. Trata de establecer un límite prudente."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"¿Restringir el uso de datos en segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Si restringes los datos móviles en segundo plano, algunas apps y servicios no funcionarán a menos que te conectes a una red Wi-Fi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Si restringes los datos móviles en segundo plano, algunas apps y servicios no funcionarán a menos que te conectes a una red Wi-Fi.\n\nEsta configuración afecta a todos los usuarios de esta tablet."</string>
@@ -2656,7 +2652,7 @@
       <item quantity="other">Mostrar %d elementos ocultos</item>
       <item quantity="one">Mostrar %d elemento oculto</item>
     </plurals>
-    <string name="network_dashboard_title" msgid="4771589228992391573">"Internet y red"</string>
+    <string name="network_dashboard_title" msgid="4771589228992391573">"Internet y redes"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, móvil, uso de datos, hotspot"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, transmisión, NFC"</string>
@@ -2721,7 +2717,7 @@
     <string name="status_tag_not_writable" msgid="2511611539977682175">"No se puede escribir en la etiqueta NFC. Prueba con una etiqueta diferente."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sonido predeterminado"</string>
     <string name="sound_settings_summary" msgid="4100853606668287965">"Volumen de tono: <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volumen, vibración, No interrumpir"</string>
+    <string name="sound_dashboard_summary" msgid="3402435125958012986">"Volumen, vibración, No molestar"</string>
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Timbre en vibración"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Timbre en silencio"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volumen de tono: 80%"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificación"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Sonido predeterminado"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Sonido que proporcionó la app"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Sonido de notificaciones predeterminado"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Alarma: sonido predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar también en llamadas"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Otros sonidos"</string>
@@ -2752,10 +2750,10 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> reglas automáticas activadas</item>
       <item quantity="one">1 regla automática activada</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencias de No interrumpir"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencias de No molestar"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo prioridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas de automatización"</string>
-    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Reglas para No interrumpir"</string>
+    <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Reglas para No molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar sonido y vibración"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Solo prioridad"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
@@ -2781,7 +2779,7 @@
     <string name="profile_section_header" msgid="2320848161066912001">"Notificaciones de trabajo"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"En la pantalla bloqueada"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de notificaciones"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas las notificaciones"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar contenido confidencial de notificaciones"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"No mostrar notificaciones"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"¿Cómo deseas ver las notificaciones cuando el dispositivo esté bloqueado?"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"¿Cómo deseas ver las notificaciones de perfil cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificaciones de perfil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificaciones"</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_blocked" msgid="7938180808339386300">"No mostrar notificaciones"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Baja: No emitir sonido ni mostrar"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Media: Sin sonido"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Alta: Emitir sonido"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgente: Emitir sonido y 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="6585849855452076626">"Habilitar sonido"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"No emitir sonido, vibrar ni mostrar estas notificaciones en la pantalla actual."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificaciones"</string>
@@ -2831,9 +2830,11 @@
     <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_on" msgid="6103704909710176555">"Sí"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</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 solicitó acceso a No molestar."</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea las notificaciones de esta app para que no aparezcan en el dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea esta categoría de notificaciones para que no aparezca en el dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Otros"</string>
     <string name="no_channels" msgid="3077375508177744586">"Esta app no publicó ninguna notificación"</string>
@@ -2856,8 +2857,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar notificaciones en el panel ni en dispositivos periféricos"</string>
     <string name="notification_badge_title" msgid="7166470350070693657">"Ícono con insignia de la app"</string>
     <string name="notification_badge_summary" msgid="3944771498030335669">"Mostrar notificaciones como insignias en la app de Google Home, si es compatible."</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular No interrumpir"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificaciones sigan interrumpiendo cuando No interrumpir esté configurado como Solo prioridad"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Anular No molestar"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Permitir que estas notificaciones sigan interrumpiendo cuando No molestar esté configurado como Solo prioridad"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla bloqueada"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Prioridad"</string>
@@ -2917,7 +2918,7 @@
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Todos los emisores"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Emisores seleccionados"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Repetir emisores"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Llamadas repetidas"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Permitir llamada si la misma persona llama por segunda vez en un período de <xliff:g id="MINUTES">%d</xliff:g> minuto(s)"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activar automáticam."</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nunca"</string>
@@ -2939,7 +2940,7 @@
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear con la pantalla encendida"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Impide que las notificaciones silenciadas por \"No molestar\" se visualicen o aparezcan en la pantalla"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear cuando la pantalla está apagada"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear con la pantalla apagada"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Impide que las notificaciones silenciadas por \"No molestar\" se activen en la pantalla o enciendan la luz de notificación"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Impide que las notificaciones silenciadas por \"No molestar\" activen la pantalla"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desactivada"</string>
@@ -2967,18 +2968,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicio seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Puedes solicitar el PIN del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta configuración ayuda a proteger los datos en dispositivos perdidos o robados."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Puedes solicitar el patrón del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta configuración ayuda a proteger los datos en dispositivos perdidos o robados."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Puedes solicitar la contraseña del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta configuración ayuda a proteger los datos en dispositivos perdidos o robados."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Además de desbloquear este dispositivo con tu huella digital, puedes incrementar la protección del dispositivo si configuras que solicite un PIN antes de iniciarse. Hasta que el dispositivo se inicie, no podrá recibir llamadas, mensajes ni notificaciones, y tampoco sonarán las alarmas.\n\nEsta opción te permitirá proteger los datos del dispositivo en caso de pérdida o robo."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Además de desbloquear este dispositivo con tu huella digital, puedes incrementar la protección del dispositivo si configuras que solicite un patrón antes de iniciarse. Hasta que el dispositivo se inicie, no podrá recibir llamadas, mensajes ni notificaciones, y tampoco sonarán las alarmas.\n\nEsta opción te permitirá proteger los datos del dispositivo en caso de pérdida o robo."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Además de desbloquear este dispositivo con tu huella digital, puedes incrementar la protección del dispositivo si configuras que solicite una contraseña antes de iniciarse. Hasta que el dispositivo se inicie, no podrá recibir llamadas, mensajes ni notificaciones, y tampoco sonarán las alarmas.\n\nEsta opción te permitirá proteger los datos del dispositivo en caso de pérdida o robo."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Solicitar PIN para iniciar dispositivo"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Solicitar patrón para iniciar dispositivo"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Solicitar contraseña para iniciar dispositivo"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"No"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"No"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"No"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Puedes solicitar el PIN del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el PIN para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Puedes solicitar el patrón del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el patrón para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Puedes solicitar la contraseña del dispositivo antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar contraseña para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar el PIN antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes, ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el PIN para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar el patrón antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar el patrón para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Además de usar tu huella digital para desbloquear el dispositivo, puedes solicitar la contraseña antes de iniciarlo para aumentar la protección. Mientras el dispositivo se inicia, no puede recibir llamadas, mensajes ni notificaciones, incluidas las alarmas.\n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados. ¿Deseas solicitar contraseña para iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"¿Solicitar PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"¿Solicitar patrón?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"¿Solicitar contraseña?"</string>
@@ -2990,7 +2987,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Ranura <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Abrir de forma predeterminada"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Vínculos de apertura"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Abrir vínculos"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Abrir vínculos admitidos"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Abrir sin preguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Vínculos admitidos"</string>
@@ -3028,7 +3025,7 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"No se otorgaron permisos"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"No se solicitaron permisos"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"Todas las aplicaciones"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Todas las apps"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"Apps instaladas"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"Apps instantáneas"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personales"</string>
@@ -3046,7 +3043,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Apps que usan <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Presionar para activar"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Presiona dos veces en cualquier lugar de la pantalla para activar el dispositivo."</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Vínculos de apertura"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Abrir vínculos"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"No abrir los vínculos admitidos"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Abrir el dominio <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> y otras URL"</string>
@@ -3074,7 +3071,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predeterminada de sistema)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Almacenamiento de aplicaciones"</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="app_usage_preference" msgid="7065701732733134991">"Preferencias de uso de la aplicación"</string>
@@ -3161,11 +3158,11 @@
     <string name="running_frequency" msgid="6622624669948277693">"Frecuencia"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"Uso máximo"</string>
     <string name="no_data_usage" msgid="9131454024293628063">"No se utilizaron datos."</string>
-    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"¿Deseas permitir que la aplicación <xliff:g id="APP">%1$s</xliff:g> tenga acceso a la función No molestar?"</string>
+    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"¿Quieres que la app <xliff:g id="APP">%1$s</xliff:g> tenga acceso en No molestar?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"La aplicación podrá activar y desactivar la función No molestar y realizar cambios de configuración relacionados."</string>
     <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Debe seguir activado porque el acceso a las notificaciones está activado"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"¿Deseas revocar el acceso de <xliff:g id="APP">%1$s</xliff:g> al modo No interrumpir?"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Se quitarán todas las normas del modo No interrumpir que creó esta app."</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"¿Quieres revocar el acceso de la app <xliff:g id="APP">%1$s</xliff:g> en No molestar?"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Se quitarán todas las normas del modo No molestar que creó esta app."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"No optimizar"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimizar"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Puede agotar la batería más rápido"</string>
@@ -3202,9 +3199,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Este permiso admite que una aplicación modifique la configuración del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Sí"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"No"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Permitir la instalación de apps"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Permitida"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"No permitida"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Confiar en esta fuente"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Gira la muñeca dos veces para la cámara"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación de la cámara"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botón de encendido dos veces para cámara"</string>
@@ -3212,7 +3209,7 @@
     <string name="screen_zoom_title" msgid="5233515303733473927">"Tamaño de la pantalla"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Aumenta o reduce el tamaño de los elementos en pantalla"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"densidad de la pantalla, zoom de la pantalla, escala"</string>
-    <string name="screen_zoom_summary" msgid="6445488991799015407">"Aumenta o reduce el tamaño de los elementos en pantalla. Algunas apps de tu pantalla pueden cambiar su posición."</string>
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Aumenta o reduce el tamaño de los elementos en pantalla. Algunas apps pueden cambiar de posición."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Vista previa"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Reducir el tamaño"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Aumentar el tamaño"</string>
@@ -3267,7 +3264,7 @@
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"El hotspot Wi-Fi portátil <xliff:g id="ID_1">%1$s</xliff:g> está activado. La conexión Wi-Fi está desactivada en este dispositivo."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"El modo de avión está activado"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"La conexión Wi-Fi, el Bluetooth y la red móvil están desactivados. No es posible hacer llamadas ni conectarse a Internet."</string>
-    <string name="condition_zen_title" msgid="2679168532600816392">"No interrumpir activado (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"No molestar activado (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Ahorro de batería activado"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Se reduce el rendimiento y se desactivan los Servicios de ubicación y los datos en segundo plano."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Datos móviles desactivados"</string>
@@ -3305,7 +3302,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restricciones</item>
       <item quantity="one">1 restricción</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"El cálculo de datos de tu proveedor puede diferir del que hace tu dispositivo"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"El cálculo de datos del proveedor puede diferir del que hace el dispositivo."</string>
     <string name="data_used_template" msgid="3245919669966296505">"Datos usados: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Configurar advertencia"</string>
     <string name="data_warning" msgid="209133958008062117">"Advertencia de datos"</string>
@@ -3319,10 +3316,10 @@
       <item quantity="one">1 app tiene permiso para usar datos sin restricción cuando Reducir datos está activada</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Reducir datos"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acceso a datos sin restricción"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Datos sin restricciones"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Se desactivaron los datos en segundo plano"</string>
-    <string name="data_saver_on" msgid="6774217590237934709">"Activada"</string>
-    <string name="data_saver_off" msgid="6892309031162738794">"Desactivada"</string>
+    <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
+    <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso de datos sin restricción"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Acceso a datos sin restricción"</string>
     <string name="home_app" msgid="4066188520886810030">"App de la página principal"</string>
@@ -3390,7 +3387,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Conectado a"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de configuración rápida para programadores"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aquí para ayudarte"</string>
@@ -3460,16 +3458,16 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Presiona dos veces la tablet para revisarla"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Presiona dos veces el dispositivo para revisarlo"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Para revisar tus notificaciones rápidamente, presiona dos veces tu pantalla."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levanta el teléfono para revisarlo"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar el teléfono para revisarlo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levanta la tablet para revisarla"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levanta el dispositivo para revisarlo"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Para revisar tus notificaciones rápidamente, agarra tu teléfono."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Para revisar las notificaciones rápidamente, levanta el teléfono."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Para revisar tus notificaciones rápidamente, agarra tu tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Para revisar tus notificaciones rápidamente, agarra tu dispositivo."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Desliza la huella digital para ver notificaciones"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior de tu teléfono."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior de tu tablet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior de tu dispositivo."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Desliza tu huella para ver notificaciones"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior del teléfono."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior de la tablet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver las notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales que está en la parte posterior del dispositivo."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de asistencia"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidad"</string>
@@ -3579,7 +3577,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(se inhabilitó para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servicio autocompletar"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, completar, autocompletar"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"¿Quieres que <xliff:g id="APP_NAME_0">%1$s</xliff:g> sea tu app de autocompletar? <xliff:g id="APP_NAME_1">%1$s</xliff:g> podrá leer tu pantalla y completar campos en otras apps."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Asegúrate de que esta app sea confiable.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; usa el contenido de tu pantalla para determinar qué se puede autocompletar."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Administrador de almacenamiento: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 6ee0eb1..ea13054 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ninguno"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ninguno"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -281,7 +283,7 @@
     <item msgid="2603878814882344450">"volumen principal"</item>
     <item msgid="7136963238377062018">"volumen de la voz"</item>
     <item msgid="4270236897655923007">"volumen del tono"</item>
-    <item msgid="6325739889222559394">"volumen multimedia"</item>
+    <item msgid="6325739889222559394">"volumen de multimedia"</item>
     <item msgid="5762123934816216821">"volumen de la alarma"</item>
     <item msgid="785049718065337473">"volumen de las notificaciones"</item>
     <item msgid="6700305533746877052">"volumen de Bluetooth"</item>
@@ -348,7 +350,7 @@
     <item msgid="2098976479485046797">"Volumen principal"</item>
     <item msgid="5660213838861789350">"Volumen de la voz"</item>
     <item msgid="7983336752371254444">"Volumen del tono"</item>
-    <item msgid="7878027809189330917">"Volumen multimedia"</item>
+    <item msgid="7878027809189330917">"Volumen de multimedia"</item>
     <item msgid="7260546305036218513">"Volumen de la alarma"</item>
     <item msgid="9103719301075748925">"Volumen de notificaciones"</item>
     <item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index b39dbaf..ea83417 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -203,7 +203,7 @@
     <string name="radio_info_band_mode_label" msgid="8730871744887454509">"Seleccionar banda de señal móvil"</string>
     <string name="radio_info_voice_network_type_label" msgid="1443496502370667071">"Tipo de red de voz:"</string>
     <string name="radio_info_data_network_type_label" msgid="7094323145105149312">"Tipo de red de datos:"</string>
-    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Establecer tipo de red preferida:"</string>
+    <string name="radio_info_set_perferred_label" msgid="3511830813500105512">"Establecer tipo de red preferido:"</string>
     <string name="radio_info_ping_hostname_v4" msgid="7045103377818314709">"Hacer ping a IPv4 de nombre de host (www.google.com):"</string>
     <string name="radio_info_ping_hostname_v6" msgid="1130906124160553954">"Hacer ping a IPv6 de nombre de host (www.google.com):"</string>
     <string name="radio_info_http_client_test" msgid="2382286093023138339">"Prueba de cliente HTTP:"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Cuentas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Seguridad y ubicación"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cifrado y credenciales"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Teléfono cifrado"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferencias de la pantalla de bloqueo"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Teléfono cifrado"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Ajustes de la pantalla de bloqueo"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacidad"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Inhabilitada por el administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estado de seguridad"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo de pantalla y huella digital"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo de pantalla"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Huella digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Administrar huellas"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar huella para"</string>
@@ -353,11 +352,11 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> huella digital configurada</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueo con huella"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloqueo con huella digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usar tu huella digital"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyes.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Solo tienes que tocar el sensor de huellas digitales para autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyes.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, ponte en contacto con el administrador de tu organización."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyes.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyas.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Solo tienes que tocar el sensor de huellas digitales para autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyas.\n\nNota: No puedes usar tu huella digital para desbloquear este dispositivo. Para obtener más información, ponte en contacto con el administrador de tu organización."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Solo tienes que tocar el sensor de huellas digitales para desbloquear el teléfono, autorizar compras o iniciar sesión en aplicaciones. Cualquier huella digital que añadas podrá realizar estas acciones, por lo que debes tener cuidado con las huellas que incluyas.\n\nNota: Es posible que tu huella digital sea menos segura que un buen patrón o PIN."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Saltar"</string>
@@ -441,7 +440,7 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Protege tu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utilizar huella digital"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear con tu huella digital"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elige un bloqueo"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Elige un bloqueo de pantalla"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Bloqueo de trabajo"</string>
     <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>
@@ -577,7 +576,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aplicación activa</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agentes de confianza"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Para usarlo, debes establecer una pantalla de bloqueo"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Para usar esta opción, debes establecer una pantalla de bloqueo"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Ninguno"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> agentes de confianza activos</item>
@@ -672,10 +671,10 @@
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"La tecnología NFC permite intercambiar datos entre este dispositivo y otros dispositivos u objetivos cercanos, como terminales de pago, lectores de acceso y etiquetas o anuncios interactivos."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Listo para compartir contenido de aplicaciones por NFC"</string>
-    <string name="android_beam_off_summary" msgid="4663095428454779138">"No"</string>
+    <string name="android_beam_off_summary" msgid="4663095428454779138">"Desactivado"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"No disponible porque la función NFC está desactivada"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Si esta función está activada, puedes compartir contenido de la aplicación con otro dispositivo con NFC. Para ello, mantén los dispositivos cerca. Por ejemplo, puedes compartir páginas web, vídeos de YouTube, contactos y mucho más.\n\nSolo tienes que juntar los dispositivos (normalmente, por la parte de atrás) y tocar la pantalla. La aplicación decide el contenido que se comparte."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Si esta función está activada, puedes compartir contenido de la aplicación con otro dispositivo mediante NFC. Para ello, mantén los dispositivos cerca. Por ejemplo, puedes compartir páginas web, vídeos de YouTube, contactos y mucho más.\n\nSolo tienes que juntar los dispositivos (normalmente, por la parte de atrás) y tocar la pantalla. La aplicación decide el contenido que se comparte."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activar conexión Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Recibir una notificación si hay una red pública de alta calidad disponible"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activar Wi-Fi automáticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"La conexión Wi-Fi se volverá a activar automáticamente cerca de las redes de alta calidad guardadas, por ejemplo, la de tu casa"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"No está disponible porque la búsqueda de redes Wi-Fi está desactivada"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Solo conexiones estables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"No usar una red Wi-Fi a menos que tenga una buena conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Solo usar redes con buena conexión a Internet"</string>
@@ -786,7 +786,7 @@
     <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>
-    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Rechazar"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"Denegar"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"¿Iniciar sesión para conectar?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> requiere que inicies sesión para conectarte."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"CONECTAR"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subred"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Direcciones IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Redes guardadas"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Ajustes de IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Este usuario no puede utilizar los ajustes avanzados de Wi‑Fi"</string>
@@ -850,8 +848,8 @@
     <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_checkbox_text_summary" msgid="5347703013899354452">"Usar la conexión móvil para proporcionar una red Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Se ha dejado de compartir la conexión a Internet del tablet mediante un punto de acceso"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Se ha dejado de compartir la conexión a Internet del teléfono mediante un punto de acceso"</string>
+    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"No se comparte la conexión a Internet del tablet mediante un punto de acceso"</string>
+    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"No se comparte la conexión a Internet del teléfono mediante un punto de acceso"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona Wi-Fi…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona Wi-Fi…"</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
@@ -991,11 +989,11 @@
     <string name="night_display_start_time_title" msgid="8918016772613689584">"Hora de inicio"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"Hora de finalización"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"Intensidad"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"No. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off" msgid="7009821232380000786">"Desactivado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"No se activará nunca automáticamente."</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"Se activará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"Se activará automáticamente al anochecer."</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"Sí. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"Activado. <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"No se desactivará nunca automáticamente."</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Se desactivará automáticamente a esta hora: <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Se desactivará automáticamente al amanecer."</string>
@@ -1007,27 +1005,26 @@
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Personalizado"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Cambia el fondo de pantalla"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personaliza la pantalla"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elige una categoría"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Seleccionar fondo de..."</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Salvapantallas"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Durante la carga o si está conectado a una base"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Ambos casos"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Durante la carga"</string>
     <string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Con el dispositivo en un dock"</string>
     <string name="screensaver_settings_summary_never" msgid="5165622985174349585">"Nunca"</string>
-    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"No"</string>
+    <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar lo que ocurre cuando el teléfono está en un dock o inactivo, activa el salvapantallas."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Cuándo empezar"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Salvapantallas actual"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar ahora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ajustes"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar el dispositivo para activarlo"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Pantalla al recibir notificaciones"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"Activar la pantalla al recibir notificaciones"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Activar pantalla al recibir notificaciones"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño de la fuente"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumenta o disminuye el tamaño del texto"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo tarjeta SIM"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Ajustes de bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Bloqueo de tarjeta SIM"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Desactivado"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Bloqueada"</string>
@@ -1037,7 +1034,7 @@
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Solicitar PIN para utilizar el teléfono"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Solicitar PIN para utilizar el tablet"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Solicitar PIN para utilizar el teléfono"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"Cambiar PIN de tarjeta SIM"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Cambiar PIN de la tarjeta SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN de la tarjeta SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquear tarjeta SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Desbloquear tarjeta SIM"</string>
@@ -1179,7 +1176,7 @@
     <string name="storage_volume_summary" msgid="7023441974367853372">"Usado: <xliff:g id="USED">%1$s</xliff:g> de <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
     <string name="storage_volume_used" msgid="1303803057698959872">"En uso de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_volume_used_total" msgid="6113121714019000244">"Total utilizado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used_total" msgid="6113121714019000244">"Total usado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> se ha activado"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"Error al activar <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> se ha expulsado de forma segura"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistema"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorar <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"En Otros se incluyen los archivos compartidos que han guardado las aplicaciones, los archivos descargados de Internet o por Bluetooth, los archivos de Android, etc. \n\nPara ver el contenido visible de <xliff:g id="NAME">^1</xliff:g>, toca Explorar."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"El sistema incluye archivos utilizados para ejecutar la versión <xliff:g id="VERSION">%s</xliff:g> de Android"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"\"Sistema\" incluye los archivos necesarios para que Android <xliff:g id="VERSION">%s</xliff:g> funcione."</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> ha guardado fotos, música, aplicaciones u otros datos que ocupan <xliff:g id="SIZE">^2</xliff:g> del almacenamiento. \n\nPara ver más detalles, cambia a <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurar tu <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utilizar como almacenamiento portátil"</string>
@@ -1320,7 +1317,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona Wi-Fi portátil"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Compartir por Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Compartir Internet"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Punto de acceso/conexión con dispositivo portátil"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Punto de acceso/conexión con dispositivo"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Punto de acceso activado, conexión mediante dispositivo portátil"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Punto de acceso activado"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Conexión mediante dispositivo portátil"</string>
@@ -1350,7 +1347,7 @@
     <string name="tethering_help_button_text" msgid="656117495547173630">"Ayuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Red móvil"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Plan móvil"</string>
-    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplicación de SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Cambiar aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"¿Usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"¿Usar <xliff:g id="NEW_APP">%s</xliff:g> como aplicación de SMS?"</string>
@@ -1380,7 +1377,7 @@
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Usa las redes móviles, la conexión Wi-Fi, el Bluetooth o el GPS para determinar la ubicación"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Usa las redes móviles, la conexión Wi‑Fi o el Bluetooth para determinar la ubicación"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Determinar ubicación con el GPS"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Buscando"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Búsqueda"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Búsqueda de redes Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Los servicios y las aplicaciones del sistema pueden detectar redes Wi‑Fi en cualquier momento para mejorar la precisión de la ubicación."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Búsqueda de dispositivos Bluetooth"</string>
@@ -1489,7 +1486,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Igual que el bloqueo de pantalla del dispositivo"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Administrar aplicaciones"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Administrar y quitar aplicaciones instaladas"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Información de la aplicación"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Información de las aplicaciones"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Administrar aplicaciones y configurar accesos directos de inicio rápido"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ajustes de aplicación"</string>
     <string name="install_applications" msgid="4872012136210802181">"Orígenes desconocidos"</string>
@@ -1537,7 +1534,7 @@
     <string name="unknown" msgid="1592123443519355854">"Desconocido"</string>
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ordenar por nombre"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Ordenar por tamaño"</string>
-    <string name="show_running_services" msgid="5736278767975544570">"Servicios en ejecución"</string>
+    <string name="show_running_services" msgid="5736278767975544570">"Servicios en uso"</string>
     <string name="show_background_processes" msgid="2009840211972293429">"Procesos en caché"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Aplicación Emergencia"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Restablecer preferencias"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"Las actualizaciones del sistema no se pueden instalar en ubicaciones externas."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"La aplicación del administrador de dispositivos no se puede instalar en ubicaciones externas"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"¿Forzar detención?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Si se detiene una aplicación, es posible que no funcione correctamente."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Si fuerzas que se detenga una aplicación, puede que no funcione correctamente."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"No se ha podido mover la aplicación (<xliff:g id="REASON">%1$s</xliff:g>)."</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Tienda"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalles de la aplicación"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplicación instalada desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Más información en <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operaciones de la aplicación"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"En curso"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Sin utilizar)"</string>
@@ -1676,7 +1674,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Ajustes del teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Pulsa la barra espaciadora dos veces para insertar el carácter \".\""</string>
     <string name="show_password" msgid="4837897357002495384">"Mostrar contraseñas"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Muestra los caracteres brevemente al escribir"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Mostrar los caracteres brevemente al escribir"</string>
     <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>
@@ -1688,10 +1686,9 @@
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Teclado físico"</string>
     <string name="show_ime" msgid="2658582193437188227">"Mostrar teclado virtual"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Debe seguir en pantalla mientras el teclado físico esté activo"</string>
-    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ayuda de combinaciones de teclas"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar combinaciones de teclas disponibles"</string>
+    <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ayuda de accesos directos de teclado"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar accesos directos de teclado disponibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predeterminado"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Ratón/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidad del puntero"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Mandos de videojuegos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibración"</string>
@@ -1771,7 +1768,7 @@
     <string name="talkback_summary" msgid="8331244650729024963">"El lector de pantalla está destinado principalmente a personas ciegas y con problemas de visión"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Toca cualquier elemento de la pantalla para oírlo"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Subtítulos"</string>
-    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Ampliación"</string>
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Ampliar"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Ampliar con tres toques"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Ampliar con botón"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Amplía con un botón y tres toques"</string>
@@ -1779,9 +1776,9 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca tres veces para hacer zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toca un botón para ampliar"</string>
     <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>"Solo tienes que"</b>" 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_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">"Atajo a accesibilidad"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Acceso a accesibilidad"</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>
@@ -1790,7 +1787,7 @@
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Actualizar ampliación de la pantalla al cambiar aplicaciones"</string>
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"El botón de encendido cuelga"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Puntero del ratón grande"</string>
-    <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
+    <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio en mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinar canales al reproducir audio"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retraso al mantener pulsado"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Invertir colores"</string>
@@ -1798,8 +1795,8 @@
     <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">"SÍ"</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"NO"</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>
     <string name="daltonizer_type" msgid="1124178250809091080">"Modo de corrección"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -1823,8 +1820,8 @@
       <item quantity="one">Retraso muy largo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Ajustes"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Sí"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"No"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activado"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivado"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opciones estándar"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
@@ -1882,8 +1879,8 @@
     <string name="print_no_printers_found" msgid="989018646884973683">"No se encontraron impresoras"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ajustes"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Añadir impresoras"</string>
-    <string name="print_feature_state_on" msgid="8098901852502441048">"Sí"</string>
-    <string name="print_feature_state_off" msgid="7294876968403966040">"No"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Activado"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Desactivado"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Añadir servicio"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Añadir impresora"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Buscar"</string>
@@ -1909,14 +1906,14 @@
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> para completar la carga"</string>
     <string name="background_activity_title" msgid="8618384801540759730">"Actividad en segundo plano"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"Permite que la aplicación se ejecute en segundo plano"</string>
-    <string name="background_activity_summary_on" msgid="649282072540085599">"La aplicación se puede ejecutar en segundo plano cuando no se está utilizando"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"La aplicación puede funcionar en segundo plano cuando no se está usando"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"La actividad de la aplicación en segundo plano es limitada cuando no se está utilizando"</string>
-    <string name="background_activity_summary_disabled" msgid="3710669050484599847">"La aplicación no se puede ejecutar en segundo plano"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde carga completa"</string>
+    <string name="background_activity_summary_disabled" msgid="3710669050484599847">"La aplicación no puede funcionar en segundo plano"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Uso de la pantalla desde la última carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo de la pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Búsqueda de redes móviles"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Hace <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de las aplicaciones desde la última carga completa (hace <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"hace <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde la carga completa (hace <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tiempo que la pantalla ha estado encendida desde la carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso del dispositivo desde la carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
@@ -1938,7 +1935,7 @@
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tiempo de conexión Wi-Fi"</string>
     <string name="advanced_battery_title" msgid="2068039111517508622">"Uso de la batería avanzado"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Detalles del historial"</string>
-    <string name="battery_details_title" msgid="6101394441569858580">"Uso de la batería"</string>
+    <string name="battery_details_title" msgid="6101394441569858580">"Uso de batería"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Detalles de uso"</string>
     <string name="controls_subtitle" msgid="390468421138288702">"Cómo reducir el uso de la batería"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"Paquetes incluidos"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Dispositivo inactivo"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Red móvil en espera"</string>
     <string name="power_phone" msgid="5392641106474567277">"Llamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
@@ -2007,18 +2004,18 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"El uso de batería es un cálculo aproximado de consumo de energía que no incluye todas las fuentes de consumo de la batería. El uso de batería variado es la diferencia entre el consumo de energía aproximado calculado y el consumo real de batería."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uso de potencia sobrecalculado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Utilizada durante %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Usada durante <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> del total de batería"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Desglose desde la última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"El tiempo de batería restante es aproximado y puede variar en función del uso"</string>
-    <string name="battery_detail_foreground" msgid="3350401514602032183">"Durante el uso activo"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"En uso activo"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"En segundo plano"</string>
-    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso de la batería"</string>
+    <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso de batería"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> del total del uso de las aplicaciones (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Desde la carga completa"</string>
-    <string name="battery_detail_manage_title" msgid="9094314252105828014">"Administrar uso de la batería"</string>
+    <string name="battery_detail_manage_title" msgid="9094314252105828014">"Gestionar uso de la batería"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Tiempo restante estimado"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"Hasta completar la carga"</string>
     <string name="estimated_time_description" msgid="8760210909000037089">"La estimación puede variar en función del uso"</string>
@@ -2034,7 +2031,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nunca"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"con un <xliff:g id="PERCENT">%1$s</xliff:g> de batería"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Porcentaje de batería"</string>
-    <string name="battery_percentage_description" msgid="8511658577507384014">"Muestra el porcentaje de batería en la barra de estado"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Mostrar el porcentaje de batería en la barra de estado"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Estadísticas de procesos"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Estadísticas técnicas sobre procesos en ejecución"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Uso de memoria"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado de Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Voz"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Ajustes de entrada de voz"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Entrada de voz"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Servicios de entrada de voz"</string>
@@ -2096,14 +2092,14 @@
     <string name="tts_install_voices_text" msgid="5292606786380069134">"Accede a la aplicación <xliff:g id="TTS_APP_NAME">%s</xliff:g> para instalar voces"</string>
     <string name="tts_install_voices_open" msgid="667467793360277465">"Abrir aplicación"</string>
     <string name="tts_install_voices_cancel" msgid="4711492804851107459">"Cancelar"</string>
-    <string name="tts_reset" msgid="2661752909256313270">"Recuperar ajustes"</string>
+    <string name="tts_reset" msgid="2661752909256313270">"Restablecer"</string>
     <string name="tts_play" msgid="2628469503798633884">"Reproducir"</string>
     <string name="gadget_title" msgid="5519037532720577836">"Control de energía"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"Actualizando configuración de la conexión Wi-Fi..."</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"Actualización de la configuración de la conexión 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">"sí"</string>
-    <string name="gadget_state_off" msgid="5220212352953066317">"no"</string>
+    <string name="gadget_state_on" msgid="6909119593004937688">"activado"</string>
+    <string name="gadget_state_off" msgid="5220212352953066317">"desactivado"</string>
     <string name="gadget_state_turning_on" msgid="3395992057029439039">"activando"</string>
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"desactivando"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi-Fi"</string>
@@ -2114,7 +2110,7 @@
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"automático"</string>
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"completo"</string>
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"medio"</string>
-    <string name="gadget_brightness_state_off" msgid="946382262872753084">"no"</string>
+    <string name="gadget_brightness_state_off" msgid="946382262872753084">"desactivado"</string>
     <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Almacenamiento de credenciales"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Instalar desde memoria"</string>
@@ -2146,14 +2142,14 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"No se ha podido borrar el almacenamiento de credenciales."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacenamiento de credenciales habilitado"</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Debes establecer una contraseña o un PIN para la pantalla de bloqueo para usar el almacenamiento de credenciales."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Aplicaciones con acceso de uso"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apps con acceso de uso"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tono de emergencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Establecer comportamiento al realizar una llamada de emergencia"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Copia de seguridad"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Copia de seguridad"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Copiar mis datos"</string>
-    <string name="backup_data_summary" msgid="708773323451655666">"Crear copia de seguridad de los datos de las aplicaciones, las contraseñas Wi-Fi y otros ajustes en los servidores de Google"</string>
+    <string name="backup_data_summary" msgid="708773323451655666">"Crear copia de seguridad de los datos de las aplicaciones, las contraseñas de redes Wi-Fi y otros ajustes en los servidores de Google"</string>
     <string name="backup_configure_account_title" msgid="3790872965773196615">"Cuenta de copia de seguridad"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluir datos de aplicaciones"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
@@ -2161,9 +2157,9 @@
     <string name="backup_inactive_title" msgid="685838037986644604">"El servicio de copia de seguridad no está activo"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Ninguna cuenta está almacenando datos con copia de seguridad en estos momentos."</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"¿Quieres dejar de crear copias de seguridad de las contraseñas Wi-Fi, de los marcadores y de otros ajustes y datos de aplicaciones, además de borrar todas las copias de los servidores de Google?"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"¿Quieres dejar de crear copias de seguridad de las contraseñas de redes Wi-Fi, de los marcadores y de otros ajustes y datos de aplicaciones, además de borrar todas las copias de los servidores de Google?"</string>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"¿Quieres detener la copia de seguridad de los datos del dispositivo (como las contraseñas de redes Wi-Fi y el historial de llamadas) y de las aplicaciones (como la configuración y los archivos guardados) y borrar todas las copias de los servidores remotos?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"Realiza una copia de seguridad automática de los datos del dispositivo (como las contraseñas de redes Wi-Fi y el historial de llamadas) y de los datos de las aplicaciones (como sus ajustes y archivos guardados) de forma remota.\n\nAl activar la copia de seguridad automática, los datos del dispositivo y de las aplicaciones se guardan periódicamente de forma remota. Los datos de las aplicaciones pueden ser cualquier tipo de información que guarden (en función de la configuración de los desarrolladores), incluidos los datos que pueden ser confidenciales (como contactos, mensajes y fotos)."</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Realiza una copia de seguridad automática de los datos del dispositivo (como las contraseñas de redes Wi-Fi y el historial de llamadas) y de los datos de las aplicaciones (como sus ajustes y archivos guardados) de forma remota.\n\nAl activar la copia de seguridad automática, los datos del dispositivo y de las aplicaciones se guardan periódicamente de forma remota. Los datos de las aplicaciones pueden ser cualquier tipo de información que guarden (en función de los ajustes de los desarrolladores), incluidos los datos que pueden ser confidenciales (como contactos, mensajes y fotos)."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"Ajustes del administrador de dispositivos"</string>
     <string name="active_device_admin_msg" msgid="578748451637360192">"Aplicación de administrador de dispositivos"</string>
     <string name="remove_device_admin" msgid="9207368982033308173">"Desactivar esta aplicación de administrador de dispositivos"</string>
@@ -2338,7 +2334,7 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"¿Activar sincronización automática?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Los cambios que hagas en tus cuentas en la Web se copiarán automáticamente en el tablet.\n\nEs posible que algunas cuentas copien también en la Web los cambios que hagas en el tablet. Así funcionan las cuentas de Google."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Los cambios que hagas en tus cuentas en la Web se copiarán automáticamente en el teléfono.\n\nEs posible que algunas cuentas copien también en la Web los cambios que hagas en el teléfono. Así funcionan las cuentas de Google."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar sincronización automática?"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"¿Desactivar la sincronización automática?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Esto te permitirá ahorrar datos y batería, pero tendrás que sincronizar cada cuenta de forma manual para obtener información reciente y no recibirás notificaciones cuando haya actualizaciones."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Elige el día en el que empezará cada ciclo"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Día de cada mes:"</string>
@@ -2363,7 +2359,7 @@
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Restricciones de red"</string>
     <string name="data_usage_metered_body" msgid="7655851702771342507">"Las redes sin tarifa plana se tratan como redes móviles cuando se restringe el uso de datos en segundo plano. Las aplicaciones pueden mostrar una advertencia antes de usar estas redes para descargar archivos grandes."</string>
     <string name="data_usage_metered_mobile" msgid="5423305619126978393">"Redes móviles"</string>
-    <string name="data_usage_metered_wifi" msgid="1761738002328299714">"Redes Wi‑Fi de uso medido"</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 de uso medido, activa el Wi‑Fi."</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>
@@ -2510,7 +2506,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Los perfiles restringidos no pueden añadir cuentas"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Eliminar a <xliff:g id="USER_NAME">%1$s</xliff:g> de este dispositivo"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Ajustes de pantalla de bloqueo"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Añadir usuarios en la pantalla de bloqueo"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Añadir usuarios desde la pantalla de bloqueo"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nuevo usuario"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Perfil nuevo"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"¿Eliminarte a ti mismo?"</string>
@@ -2587,7 +2583,7 @@
     <string name="access_point_names" msgid="1381602020438634481">"Nombre de punto de acceso"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Modo 4G LTE mejorado"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Usar datos LTE para mejorar la voz y las comunicaciones (recomendado)"</string>
-    <string name="preferred_network_type_title" msgid="3431041717309776341">"Tipo de red preferida"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"Tipo de red preferido"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (recomendado)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"SIM de trabajo"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Acceso a contenido y aplicaciones"</string>
@@ -2659,7 +2655,7 @@
     <string name="network_dashboard_title" msgid="4771589228992391573">"Red e Internet"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, móvil, uso de datos, punto de acceso"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Dispositivos conectados"</string>
-    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
+    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Enviar pantalla, NFC"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Aplicaciones y notificaciones"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Permisos, aplicaciones predeterminadas"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Usuarios y cuentas"</string>
@@ -2725,12 +2721,14 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Timbre en vibración"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Timbre en silencio"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volumen del timbre al 80%"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volumen multimedia"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volumen de multimedia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de la alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volumen del tono"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificaciones"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Sonido de notificación predeterminado"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Sonido proporcionado de app"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Sonido de notificación predeterminado"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Sonido de alarma predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar también en llamadas"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Otros sonidos"</string>
@@ -2753,7 +2751,7 @@
       <item quantity="one">1 regla automática activada</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencias de No molestar"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Permitir solo con prioridad"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridad solo permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Reglas automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir reglas de No molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitar sonido y vibración en algunos momentos"</string>
@@ -2761,7 +2759,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Solo alarmas"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Silencio total"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear alteraciones visuales"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquear interrupciones visuales"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sonidos del perfil de trabajo"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utilizar sonidos del perfil personal"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Los sonidos de los perfiles personal y de trabajo son los mismos"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"¿Cómo quieres que se muestren las notificaciones del perfil cuando el dispositivo esté bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificaciones del perfil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificaciones"</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_blocked" msgid="7938180808339386300">"No mostrar notificaciones nunca"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Baja: sin sonido ni interrupción visual"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Media: sin sonido"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Alta: emitir sonido"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgente: emitir sonido y 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="6585849855452076626">"Permitir sonido"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"No emitir sonido, vibrar ni mostrar notificaciones en la pantalla actual."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificaciones"</string>
@@ -2833,9 +2832,11 @@
     <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_on" msgid="6103704909710176555">"Sí"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso de No molestar"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea las notificaciones de esta aplicación para que no aparezcan en el dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea esta categoría de notificaciones para que no aparezcan en el dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Otros"</string>
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicación no ha publicado ninguna notificación"</string>
@@ -2856,8 +2857,8 @@
     <string name="app_notification_block_summary" msgid="4744020456943215352">"No mostrar nunca estas notificaciones"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostrar notificaciones"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"No mostrar nunca notificaciones en el panel de notificaciones ni en dispositivos periféricos"</string>
-    <string name="notification_badge_title" msgid="7166470350070693657">"Incluir icono de la aplicación"</string>
-    <string name="notification_badge_summary" msgid="3944771498030335669">"Mostrar notificaciones como insignias en la aplicación Home (si es compatible)"</string>
+    <string name="notification_badge_title" msgid="7166470350070693657">"Mostrar icono de la aplicación"</string>
+    <string name="notification_badge_summary" msgid="3944771498030335669">"Mostrar notificaciones como iconos en la aplicación Home (si es compatible)"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Priorizar"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"No bloquear notificaciones cuando la opción No molestar esté establecida en Solo prioritarias"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"En la pantalla de bloqueo"</string>
@@ -2876,7 +2877,7 @@
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Nombre de regla ya en uso"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"Añadir más"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Eliminar regla"</string>
-    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Seleccionar tipo de regla"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Selecciona un tipo de regla"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"¿Quieres eliminar la regla \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Eliminar"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipo de regla"</string>
@@ -2896,7 +2897,7 @@
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"Sí o quizás"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Sí"</string>
     <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"No se ha encontrado esa regla."</string>
-    <string name="zen_mode_rule_summary_enabled_combination" msgid="976098744828219297">"Sí / <xliff:g id="MODE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_rule_summary_enabled_combination" msgid="976098744828219297">"Activado / <xliff:g id="MODE">%1$s</xliff:g>"</string>
     <string name="zen_mode_rule_summary_provider_combination" msgid="2101201392041867409">"<xliff:g id="PACKAGE">%1$s</xliff:g>\n<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Días"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Ninguno"</string>
@@ -2939,20 +2940,20 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Cambiar a Solo alarmas hasta las <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Cambiar a interrumpir siempre"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear con la pantalla activada"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Impide que las notificaciones silenciadas por el modo No molestar aparezcan en la pantalla"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear con la pantalla desactivada"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Impide que las notificaciones silenciadas por el modo No molestar activen la pantalla o la luz de notificación"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Bloquear con pantalla activada"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Impedir que las notificaciones silenciadas por el modo No molestar aparezcan en la pantalla"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Bloquear con pantalla desactivada"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Impedir que las notificaciones silenciadas por el modo No molestar activen la pantalla o la luz de notificación"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Impedir que las notificaciones silenciadas por el modo No molestar activen la pantalla"</string>
-    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"No"</string>
+    <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Desactivado"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Con la pantalla activada"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Con la pantalla desactivada"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"Con la pantalla activada o desactivada"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar sugerencias sobre el dispositivo"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Introducir el PIN del administrador"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"Sí"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"No"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"Activado"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Desactivado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fijar pantalla"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"Si esta opción está activada, puedes utilizar el bloqueo de pantalla para mantener visible la pantalla actual hasta que dejes de fijarla.\n\nPara ello, sigue estos pasos:\n\n1. Comprueba que el bloqueo de pantalla esté activado.\n\n2. Abre la pantalla que quieras fijar.\n\n3. Toca Aplicaciones recientes.\n\n4. Desliza el dedo hacia arriba y, a continuación, toca el icono para fijarla."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Solicitar patrón de desbloqueo para desactivar"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mantener orientación actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicio seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Para aumentar la protección del dispositivo, puedes solicitar un PIN al iniciarlo. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones (como alarmas). \n\nEsta opción ayuda a proteger los datos en caso de pérdida o robo del dispositivo."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Puedes solicitar el patrón del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, como alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Puedes solicitar la contraseña del dispositivo antes de iniciarlo para aumentar la protección. Hasta que el dispositivo no se inicie, no podrá recibir llamadas, mensajes ni notificaciones, como alarmas. \n\nEsta opción ayuda a proteger los datos en dispositivos perdidos o robados."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Además de desbloquear este dispositivo con tu huella digital, puedes protegerlo aún más haciendo que sea necesario introducir un PIN cuando se inicia. Hasta que el dispositivo se inicie, no podrá recibir llamadas, mensajes ni notificaciones, y tampoco sonarán las alarmas.\n\nEsto te permitirá proteger los datos del dispositivo en caso de pérdida o robo."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Además de desbloquear este dispositivo con tu huella digital, puedes protegerlo aún más haciendo que sea necesario introducir un patrón cuando se inicia. Hasta que el dispositivo se inicie, no podrá recibir llamadas, mensajes ni notificaciones, y tampoco sonarán las alarmas.\n\nEsto te permitirá proteger los datos del dispositivo en caso de pérdida o robo."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Además de desbloquear este dispositivo con tu huella digital, puedes protegerlo aún más haciendo que sea necesario introducir una contraseña cuando se inicia. Hasta que el dispositivo se inicie, no podrá recibir llamadas, mensajes ni notificaciones, y tampoco sonarán las alarmas.\n\nEsto te permitirá proteger los datos del dispositivo en caso de pérdida o robo."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Solicitar PIN para iniciar el dispositivo"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Requerir patrón para iniciar dispositivo"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Requerir contraseña para iniciar dispositivo"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"No, gracias"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"No, gracias"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"No, gracias"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Para proteger aún más tu dispositivo, haz que solicite el PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir PIN al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Para proteger aún más tu dispositivo, haz que solicite el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir patrón al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Para proteger aún más tu dispositivo, haz que solicite la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia. \n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite el PIN antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir el PIN al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite el patrón antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir patrón al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Además de utilizar la huella digital para desbloquear el dispositivo, puedes protegerlo aún más si haces que solicite la contraseña antes de iniciarse. El dispositivo no puede recibir llamadas, mensajes ni notificaciones (incluidas alarmas) hasta que no se inicia.\n\nEsto es útil para proteger tus datos si pierdes el dispositivo o te lo roban. ¿Pedir contraseña al iniciar el dispositivo?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sí"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"¿Solicitar PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"¿Solicitar patrón?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"¿Solicitar contraseña?"</string>
@@ -2992,7 +2989,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Información relacionada con el IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(N.º <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Abrir de forma predeterminada"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Enlaces de apertura"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Abrir enlaces"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Abrir enlaces compatibles"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Se abren sin preguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Enlaces compatibles"</string>
@@ -3048,7 +3045,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Aplicaciones que utilizan <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Tocar para activar"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Toca dos veces cualquier punto de la pantalla para activar el dispositivo"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Enlaces de apertura"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Abrir enlaces"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"No se abren enlaces compatibles"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Abre <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Abrir <xliff:g id="DOMAIN">%s</xliff:g> y otras URL"</string>
@@ -3063,21 +3060,21 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"No reconocido"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Predeterminadas"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Predeterminadas para trabajo"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistencia y entrada voz"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Asistencia y entrada de voz"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Aplicación de asistencia"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"¿Quieres que <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> sea tu asistente?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"El asistente podrá consultar información sobre las aplicaciones en uso del sistema, como información visible en la pantalla o a la que se pueda acceder a través de las aplicaciones."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Aceptar"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"No aceptar"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Seleccionar entrada de voz"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación Navegador"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Aplicación de navegador"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Sin navegador predeterminado"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Aplicación Teléfono"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Aplicación de teléfono"</string>
     <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predeterminados del sistema)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Almacenamiento de aplicaciones"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Acceso de uso"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Almacenamiento de apps"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Acceso a uso"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acceso de uso"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferencias de uso de aplicaciones"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"El acceso de uso permite que una aplicación controle las aplicaciones que utilizas y con qué frecuencia, así como tu operador, los ajustes de idioma y otros detalles."</string>
@@ -3128,7 +3125,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utilizar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utilizar USB para"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Cargar el dispositivo"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Cargando el dispositivo"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Suministrar energía"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"Transferir archivos"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"Transferir fotos (PTP)"</string>
@@ -3136,7 +3133,7 @@
     <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>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"Permitir que la aplicación de asistencia acceda a los contenidos de la pantalla como texto"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"Permitir que la aplicación de asistencia acceda a los contenidos de la pantalla (como texto)"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Usar captura de pantalla"</string>
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Permitir que la aplicación de asistencia acceda a una imagen de la pantalla"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Hacer parpadear la pantalla"</string>
@@ -3173,7 +3170,7 @@
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"La batería se puede agotar más rápido"</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Recomendado para mejorar la duración de la batería"</string>
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"¿Permitir que <xliff:g id="APP">%s</xliff:g> ignore las optimizaciones de la batería?"</string>
-    <string name="app_list_preference_none" msgid="108006867520327904">"Ninguna"</string>
+    <string name="app_list_preference_none" msgid="108006867520327904">"Nada"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Al desactivar el acceso de uso de esta aplicación, no evitas que el administrador registre los datos de uso de las aplicaciones de tu perfil de trabajo"</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> caracteres utilizados"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"Mostrar sobre otras apps"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cuando se concede este permiso, la aplicación puede modificar los ajustes del sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sí"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Sí"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"No"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Permitir descargas de aplicaciones"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Autorizadas"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"No autorizadas"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Autorizar descargas de esta fuente"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Doble giro para abrir la cámara"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Gira la muñeca dos veces para abrir la aplicación Cámara"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botón de encendido dos veces para cámara"</string>
@@ -3246,8 +3243,8 @@
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Usuario actual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Has iniciado sesión como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"Aplicación predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"SÍ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"NO"</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"ACTIVADO / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_off_summary" msgid="6474350053215707957">"DESACTIVADO"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Copia de seguridad inhabilitada"</string>
     <string name="about_summary" msgid="924181828102801010">"Actualizado a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Acción no permitida"</string>
@@ -3309,7 +3306,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"El uso de datos del operador puede ser diferente al calculado por el dispositivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Datos usados: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Definir advertencia de datos"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Establecer advertencia de datos"</string>
     <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>
@@ -3317,16 +3314,16 @@
     <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">
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicaciones pueden usar datos no restringidos cuando el ahorro de datos está activado</item>
-      <item quantity="one">1 aplicación puede usar datos no restringidos cuando el ahorro de datos está activado</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplicaciones pueden usar datos sin restricción cuando el ahorro de datos está activado</item>
+      <item quantity="one">1 aplicación puede usar datos sin restricción cuando el ahorro de datos está activado</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Ahorro de datos"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acceso a datos no restringidos"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acceso a datos no restringido"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Las conexiones automáticas están desactivadas"</string>
-    <string name="data_saver_on" msgid="6774217590237934709">"Sí"</string>
-    <string name="data_saver_off" msgid="6892309031162738794">"No"</string>
-    <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso de datos no restringidos"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"No restringir datos si el ahorra de datos está activado"</string>
+    <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
+    <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
+    <string name="unrestricted_app_title" msgid="4465437191723332066">"Uso de datos sin restricción"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"No restringir datos si el ahorro de datos está activado"</string>
     <string name="home_app" msgid="4066188520886810030">"Aplicación de inicio"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Sin aplicación de inicio predeterminada"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Inicio seguro"</string>
@@ -3335,8 +3332,8 @@
     <string name="lockpattern_settings_require_password_before_startup_summary" msgid="6818285221244966231">"Solicitar contraseña para iniciar el dispositivo. Si el dispositivo está apagado, no puede recibir llamadas, mensajes, notificaciones ni alarmas."</string>
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Añade otra huella digital"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Desbloquear con un dedo diferente"</string>
-    <string name="battery_saver_on_summary" msgid="9072203872401530722">"Sí/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_off_summary" msgid="8309471955051162327">"No/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_on_summary" msgid="9072203872401530722">"Activado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Desactivado/<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"No activar automáticamente"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Activar automáticamente con un %1$s de batería"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"No se está utilizando la optimización de la batería"</string>
@@ -3373,10 +3370,10 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ninguno"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Falta un objeto de la clasificación."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"El objeto de la clasificación no incluye esta tecla."</string>
-    <string name="special_access" msgid="3458780842491881155">"Acceso especial a las aplicaciones"</string>
+    <string name="special_access" msgid="3458780842491881155">"Acceso especial de aplicaciones"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden utilizar datos no restringidos</item>
-      <item quantity="one">1 aplicación puede utilizar datos no restringidos</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicaciones pueden utilizar datos sin restricción</item>
+      <item quantity="one">1 aplicación puede utilizar datos sin restricción</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"¿Seguro que quieres borrar los datos de usuario y convertirlos a cifrado de archivo?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Borrar y convertir"</string>
@@ -3390,9 +3387,10 @@
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ancho más pequeño"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Ninguna aplicación instalada ha solicitado acceso SMS premium"</string>
     <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 SMS premium"</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_connected_summary" msgid="8733997010923307915">"Conectado con"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ajustes rápidos de mosaicos de desarrolladores"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Queremos ayudarte"</string>
@@ -3456,7 +3454,7 @@
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestos rápidos para controlar el dispositivo"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Abrir cámara"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pulsa dos veces el botón de encendido para abrir la cámara rápidamente. Funciona desde cualquier pantalla."</string>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Cambiar cámara"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Cambiar de cámara"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Tocar el teléfono dos veces para comprobar notificaciones"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar el tablet dos veces para comprobar notificaciones"</string>
@@ -3468,15 +3466,15 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Coge el teléfono para consultar las notificaciones rápidamente."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Coge el tablet para consultar las notificaciones rápidamente."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Coge el dispositivo para consultar las notificaciones rápidamente."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar la huella digital para abrir las notificaciones"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Deslizar la huella para abrir notificaciones"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del teléfono."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para ver tus notificaciones, desliza el dedo hacia abajo en el sensor de huellas digitales situado en la parte trasera del dispositivo."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Gesto de asistencia"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilidad"</string>
-    <string name="gesture_setting_on" msgid="3455094265233870280">"Sí"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"No"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Activado"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Desactivado"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"El gestor de arranque ya está desbloqueado"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Conectarse a Internet primero"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Conéctate a Internet o ponte en contacto con el operador"</string>
@@ -3493,7 +3491,7 @@
     <string name="auto_sync_account_title" msgid="898796354710116383">"Sincronizar datos automáticamente"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Sincronizar datos personales automáticamente"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"Sincronizar datos del trabajo automáticamente"</string>
-    <string name="auto_sync_account_summary" msgid="692499211629185107">"Permite que las aplicaciones actualicen los datos automáticamente"</string>
+    <string name="auto_sync_account_summary" msgid="692499211629185107">"Permitir que las aplicaciones actualicen los datos automáticamente"</string>
     <string name="account_sync_title" msgid="7214747784136106491">"Sincronización de la cuenta"</string>
     <string name="enterprise_privacy_settings" msgid="1177106810374146496">"Información sobre el dispositivo administrado"</string>
     <string name="enterprise_privacy_settings_summary_generic" msgid="5853292305730761128">"Cambios y ajustes administrados por tu organización"</string>
@@ -3569,10 +3567,10 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Otras aplicaciones"</string>
     <string name="storage_files" msgid="8581083146777364063">"Archivos"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Almacenamiento del tablet"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Almacenamiento teléfono"</string>
+    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Almacenamiento del teléfono"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Utilizado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"en uso"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"Usado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Borrar aplicación"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"¿Quieres quitar esta aplicación instantánea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Juegos"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(opción inhabilitada para <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servicio Autocompletar"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, completar, autocompletar"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"¿Quieres establecer <xliff:g id="APP_NAME_0">%1$s</xliff:g> como tu aplicación para autocompletar? <xliff:g id="APP_NAME_1">%1$s</xliff:g> podrá leer la pantalla y rellenar campos en otras aplicaciones."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Asegúrate de que confías en esta aplicación&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autocompletar de Google&gt;%1$s&lt;/xliff:g&gt; utiliza el contenido que se muestra en la pantalla para determinar el texto que se puede autocompletar."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Administrador de Almacenamiento: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 3af2af9..d8534ad 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Mitte ükski"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM-kaart"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Puudub"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 062d3bb..9a394ef 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -78,7 +78,7 @@
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Kustuta SD-kaart"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"Eelvaade"</string>
     <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"Eelvaade, <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>. leht <xliff:g id="NUM_PAGES">%2$d</xliff:g>-st"</string>
-    <string name="font_size_summary" msgid="1690992332887488183">"Muutke ekraanil kuvatud tekst suuremaks või väiksemaks."</string>
+    <string name="font_size_summary" msgid="1690992332887488183">"Muutke ekraanil kuvatavat tekst suuremaks või väiksemaks."</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"Vähendamine"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"Suurendamine"</string>
     <!-- no translation found for font_size_preview_text (4818424565068376732) -->
@@ -274,7 +274,7 @@
     <string name="airplane_mode" msgid="8837269988154128601">"Lennurežiim"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Rohkem"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Traadita ühendus ja võrgud"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"WiFi, Bluetoothi, lennukirežiimi ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"WiFi, Bluetoothi, lennurežiimi ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"Mobiilne andmeside"</string>
     <string name="calls_title" msgid="3544471959217176768">"Kõned"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS-sõnumid"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontod"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Asukoht"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontod"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Turvalisus ja asukoht"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Krüpteerimine ja mandaat"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon on krüpteeritud"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon on krüpteeritud"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Lukustuskuva eelistused"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Määrake oma asukoht, ekraani avamine, mandaadi talletuslukk"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privaatsus"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administraatori keelatud"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Turvalisuse olek"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Ekraanilukk, sõrmejälg"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekraanilukk"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sõrmejälg"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Sõrmejälgede haldamine"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sõrmej. kasutatakse:"</string>
@@ -650,7 +649,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Jäta seaded meelde"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Ülekandmine"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Luba juhtmeta ekraaniühendus"</string>
-    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Läheduses seadmeid ei leitud."</string>
+    <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Läheduses olevaid seadmeid ei leitud."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Ühendamine"</string>
     <string name="wifi_display_status_connected" msgid="8364125226376985558">"Ühendatud"</string>
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"Kasutusel"</string>
@@ -666,8 +665,8 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"Rakendus <xliff:g id="REQUESTER">%s</xliff:g> soovib WiFi sisse lülitada"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"Rakendus <xliff:g id="REQUESTER">%s</xliff:g> soovib WiFi välja lülitada"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Lubab andmete vahetust, kui tahvelarvuti puudutab teist seadet"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lubab andmete vahetust, kui telefon puudutab teist seadet"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Lubab andmevahetuse, kui tahvelarvuti puudutab teist seadet"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Lubab andmevahetuse, kui telefon puudutab teist seadet"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC sisselülitamine"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC vahetab andmeid selle seadme ja muude läheduses asuvate seadmete või sihtmärkide vahel (nt makseterminalid, juurdepääsulugejad ja interaktiivsed reklaamid või märgendid)."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
@@ -675,7 +674,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Väljas"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Pole saadaval, kuna NFC on välja lülitatud"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Kui see funktsioon on sisse lülitatud, saate rakenduse sisu teise NFC-toega seadmesse kiirega saata, kui hoiate seadmeid üksteise lähedal. Nii saate kiirega edastada näiteks veebilehti, YouTube\'i videoid, kontakte ja muud.\n\nLihtsalt hoidke seadmeid lähestikku (tavaliselt tagakülgi koos) ja seejärel puudutage seadme ekraani. Rakendus määrab, mida kiirega edastatakse."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Kui see funktsioon on sisse lülitatud, saate rakenduse sisu teise NFC-toega seadmesse saata, kui hoiate seadmeid üksteise lähedal. Nii saate edastada näiteks veebilehti, YouTube\'i videoid, kontakte ja muud.\n\nLihtsalt hoidke seadmeid lähestikku (tavaliselt tagakülgi koos) ja seejärel puudutage seadme ekraani. Rakendus määrab, mida edastatakse."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Lülita WiFi sisse"</string>
     <string name="wifi_settings" msgid="29722149822540994">"WiFi"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Teavita, kui kvaliteetne avalik võrk on saadaval"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Lülita WiFi automaatselt sisse"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"WiFi lülitub uuesti sisse kvaliteetsete salvestatud võrkude, näiteks teie koduse võrgu läheduses"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Pole saadaval, kuna WiFi skannimine on välja lülitatud"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Väldi halbu ühendusi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ära kasuta WiFi-võrku, kui selle Interneti-ühendus on halb"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Kasuta ainult võrke, millel on hea Interneti-ühendus"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"WiFi seadistamine"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alamvõrgu mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-aadressid"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Salvestatud võrgud"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-seaded"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"WiFi täpsemad seaded pole selle kasutaja jaoks saadaval"</string>
@@ -847,16 +845,16 @@
     <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">"Kaasaskantav WiFi-tugijaam"</string>
+    <string name="wifi_tether_checkbox_text" msgid="1847167643625779136">"Mobiilne WiFi-kuumkoht"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"WiFi-leviala"</string>
     <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Kasuta WiFi-võrgu loomiseks mobiilse andmeside ühendust"</string>
     <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Tahvelarvuti Interneti-ühendust ei jagata leviala kaudu"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Telefoni Interneti-ühendust ei jagata leviala kaudu"</string>
+    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Telefoni Interneti-ühendust ei jagata mobiilse kuumkoha kaudu"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Leviala sisselülitamine ..."</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Leviala väljalülitamine ..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
     <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Kaasaskantava WiFi-tugijaama viga"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WiFi-tugijaama seadistamine"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"WiFi-kuumkoha seadistamine"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"WiFi-leviala seadistamine"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK leviala"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> leviala"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Välja"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Kui soovite juhtida, mis juhtub telefoni dokkimisel ja/või puhkerežiimi lülitamisel, siis lülitage ekraanisäästja sisse."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Alustamise aeg"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Praegune ekraanisäästja"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Alusta kohe"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Seaded"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tõstke äratamiseks"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Sissetuleva märguande ekraan"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambientne ekraan"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ekraan aktiveerub, kui saate märguandeid"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Teksti suuremaks või väiksemaks muutmine"</string>
@@ -1281,7 +1278,7 @@
     <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_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_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>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Lähtesta seaded"</string>
@@ -1320,7 +1317,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Kantav tööpunkt"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetoothi jagamine"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Jagamine"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Leviala ja jagamine"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Kuumkoht ja jagamine"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Leviala on sees, jagamine"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Leviala on sees"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Jagamine"</string>
@@ -1342,11 +1339,11 @@
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Telefoni Interneti-ühenduse jag. Bluetoothi kaudu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> seadmega"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Seadme <xliff:g id="DEVICE_NAME">%1$d</xliff:g> Interneti-ühenduse jag. Bluetoothi kaudu"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Tahvelarv. Interneti-üh. ei jag. Bluetoothi kaudu"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Telef. Interneti-ühendust ei jag. Bluetoothi kaudu"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Telefoni Interneti-ühendust ei jagata Bluetoothi kaudu"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Jagamata"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Ei saa jagada rohkem kui <xliff:g id="MAXCONNECTION">%1$d</xliff:g> seadmele."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Seadme <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ühenduse jagamine lõpetatakse."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Muudele seadmetele Interneti-ühenduse pakkumiseks kasutage leviala ja jagamise võimaldamist mobiilse andmesideühenduse kaudu."</string>
+    <string name="tethering_footer_info" msgid="7287131664937054043">"Muudele seadmetele Interneti-ühenduse pakkumiseks mobiilse andmesideühenduse kaudu kasutage ühenduse jagamise funktsiooni mobiilse kuumkohaga."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Abi"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobiilsidevõrk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobiilipakett"</string>
@@ -1379,7 +1376,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Asukoharežiim"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Asukoha määramine GPS-i, WiFi-, Bluetoothi või mobiilsidevõrgu abil"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Asukoha määramine WiFi-, Bluetoothi või mobiilsidevõrgu abil"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Kasutage asukoha määramiseks GPS-i"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Asukoha määramiseks GPS-i kasutamine"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Skannimine"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"WiFi skannimine"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Parandab asukoha täpsust, lubades süsteemirakendustel ja -teenustel mis tahes ajal tuvastada WiFi-võrke."</string>
@@ -1489,7 +1486,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Sama mis seadme ekraanilukk"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Halda rakendusi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Installitud rakenduste haldamine ja eemaldamine"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Rakenduse teave"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Rakenduste teave"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Rakenduste haldamine, kiirkäivituse otseteede seadistamine"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Rakenduse seaded"</string>
     <string name="install_applications" msgid="4872012136210802181">"Tundmatud allikad"</string>
@@ -1498,7 +1495,7 @@
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"Teie telefon ja isiklikud andmed on tundmatute rakenduste rünnakute suhtes haavatavamad. Sellest allikast rakendusi installides nõustute, et vastutate telefoni kahjude ja andmekao eest, mis võib selliste rakenduste kasutamisest tuleneda."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Täpsemad seaded"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Luba rohkem seadete valikuid"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"Rakenduse teave"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"Rakenduste teave"</string>
     <string name="storage_label" msgid="8700867073480107253">"Mäluruum"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Avamine vaikimisi"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Vaikeseaded"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Pood"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Rakenduse üksikasjad"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Rakendus installiti poest <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Lisateavet leiate teenusest <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Rakenduse tööd"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Töötab"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Pole kasutatud)"</string>
@@ -1642,7 +1640,7 @@
     <string name="running_processes_header_footer" msgid="723908176275428442">"Rakenduse RAM-i kasutus"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Süsteem"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Rakendused"</string>
-    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Tasuta"</string>
+    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Vaba"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Kasutati"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"Vahemälus"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> RAM-i"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Klaviatuuri otseteede abiline"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Saadaolevate otseteede kuvamine"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Vaikeseade"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Hiir/puuteplaat"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kursori kiirus"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Mängukontroller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Kasuta värinat"</string>
@@ -1856,7 +1853,7 @@
     <string name="color_yellow" msgid="9112680561610873529">"Kollane"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Fuksia"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Kas soovite kasutada teenust <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> peab:"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> teeb järgmist:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Seaded ei saa teie vastust kinnitada, sest rakendus varjab loataotlust."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Kui lülitate sisse teenuse <xliff:g id="SERVICE">%1$s</xliff:g>, ei kasuta seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Kuna lülitasite sisse juurdepääsetavuse teenuse, siis ei kasuta teie seade andmete krüpteerimise täiustamiseks ekraanilukku."</string>
@@ -1864,7 +1861,7 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma PIN-koodi."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Kuna teenuse <xliff:g id="SERVICE">%1$s</xliff:g> sisselülitamine mõjutab andmete krüpteerimist, peate kinnitama oma parooli."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Toimingute jälgimine"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Saama märguandeid, kui te kasutate rakendust."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Märguannete vastuvõtmine rakenduse kasutamise ajal."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Kas peatan teenuse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Kui puudutate valikut OK, siis teenus <xliff:g id="SERVICE">%1$s</xliff:g> peatub."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ühtki teenust pole installitud"</string>
@@ -1912,11 +1909,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Kui rakendust ei kasutata, võib see taustal töötada"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Kui rakendust ei kasutata, on selle tegevus taustal piiratud"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Rakendusel ei ole lubatud taustal töötada"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Ekraani kasutus alates viimasest täislaadimisest"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Ekraani kasutus alates täislaadimisest"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekraani energiatarve"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiilivõrgustiku skannimine"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> tagasi"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Rakenduste akukasutus alates viimasest täislaadimisest (<xliff:g id="TIME">%1$s</xliff:g> tagasi)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> tagasi"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Rakenduste kasutus alates täislaadimisest (<xliff:g id="TIME">^1</xliff:g> tagasi)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Ekraani töötamise aeg alates viimasest täislaadimisest"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Seadme kasutus alates viimasest täislaadimisest"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akukasutus alates lahutamisest"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kaamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobiiltelefon ooterežiimil"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobiilsidevõrk on ooterežiimis"</string>
     <string name="power_phone" msgid="5392641106474567277">"Tavakõned"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tahvelarvuti on ooterežiimis"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon tegevuseta"</string>
@@ -1979,7 +1976,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Arvutatud energiatarbimine"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Tuvastatud energiatarbimine"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Sunni peatuma"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Rakenduse teave"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Rakenduste teave"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Rakenduse seaded"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Ekraani seaded"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"WiFi-seaded"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Akukasutus näitab ligikaudset energiatarbimist ega sisalda iga energiatarbimise allikat. Kategooria Muu kajastab arvutatud ligikaudse energiatarbimise ja aku tegeliku tarbimise vahet."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Liigselt arvestatud energiatarbimine"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Kasutatud %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Kasutatud <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> kasutab <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kogu akumahust"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Üksikasjalik teave alates viimasest täislaadimisest"</string>
@@ -2061,7 +2058,7 @@
     <string name="mem_use_native_type" msgid="5976704902328347400">"Kohalikud"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Tuuma vahemälud"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRami vahetus"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Tasuta"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Vaba"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Kokku"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 tundi"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 tundi"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Kõnesisendi ja -väljundi seaded"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Häälotsing"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Androidi klaviatuur"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Kõne"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Häälsisendi seaded"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Häälsisend"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Häälsisendi teenused"</string>
@@ -2154,7 +2150,7 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Isikuandmed"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Minu andmete varundamine"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Varundage rakenduse andmed, WiFi-paroolid ja muud seaded Google\'i serverites"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Varukonto"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Varunduskonto"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Kaasa rakenduse andmed"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Automaatne taastamine"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Rakenduse uuesti installimisel taasta varundatud seaded ja andmed"</string>
@@ -2284,7 +2280,7 @@
     <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>
     <string name="data_usage_app" msgid="4970478397515423303">"Rakenduse kasutamine"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"RAKENDUSE TEAVE"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"RAKENDUSTE TEAVE"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobiilne andmeside"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"Andmemahupiirangu määramine"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Andmete kasutamistsükkel"</string>
@@ -2323,7 +2319,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G–3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobiilne"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Mitte ükski"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobiiliandmed"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobiilne andmeside"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G–3G-andmeside"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-andmeside"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Esiplaanil:"</string>
@@ -2347,7 +2343,7 @@
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Andmekasutuse piirangu määramine"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Andmekasutuse piiramine"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Tahvelarvuti lülitab teie määratud piiranguni jõudes mobiilse andmeside välja.\n\nKuna andmekasutust mõõdab tahvelarvuti ja operaator võib andmekasutust teisiti mõõta, kaaluge konservatiivse piirangu määramist."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon lülitab teie määratud piiranguni jõudes mobiilse andmeside välja.\n\nKuna andmekasutust mõõdab telefon ja operaator võib andmekasutust teisiti mõõta, kaaluge konservatiivse piirangu määramist."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefon lülitab teie määratud piiranguni jõudes mobiilse andmeside välja.\n\nKuna andmekasutust mõõdab telefon ja teie operaator võib arvestada kasutust teisiti, siis võiksite määrata konservatiivse limiidi."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Kas soovite taustandmeid piirata?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Kui piirate taustal kasutatavat mobiilset andmesidet, siis toimivad mõned rakendused ja teenused ainult siis, kui seade on ühendatud WiFi-võrku."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Kui piirate taustal kasutatavat mobiilset andmesidet, siis toimivad mõned rakendused ja teenused ainult siis, kui seade on ühendatud WiFi-võrku.\n\nSee seade mõjutab kõiki selle tahvelarvuti kasutajaid."</string>
@@ -2450,10 +2446,10 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Mandaat eemaldati: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Ühtegi kasutaja mandaati ei ole installitud"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Õigekirjakontroll"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Sisestage oma täieliku varukoopia praegune parool siia"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Sisestage täielike varukoopiate uus parool siia"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Sisestage siia uuesti oma täieliku varukoopia uus parool"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Varukoopia määramine"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Sisestage oma täieliku varunduse praegune parool siia"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Sisestage täielike varunduste uus parool siia"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Sisestage siia uuesti oma täieliku varunduse uus parool"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Määra varundusparool"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Tühista"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Süsteemi lisavärskendused"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Keelatud"</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Kasuta vaikerakendust"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Alati"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Välja arvatud siis, kui mõni teine makserakendus on avatud"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Maksa funktsiooni Puuduta ja maksa terminalis rakendusega"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Maksa teenuse Puuduta ja maksa terminalis rakendusega"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Terminali kaudu maksmine"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Seadistage makserakendus. Seejärel peate oma telefoni tagakülge hoidma lihtsalt mis tahes terminali suunas, millel on kontaktivaba makse sümbol."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Selge"</string>
@@ -2582,7 +2578,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 ülekanded"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Hädaolukorra märguanded"</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>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Märguande helitugevus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Märguande vaikeheli"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Rakenduse esitatud heli"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Märguande vaikeheli"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Äratuse vaikeheli"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreeri ka kõnede puhul"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Muud helid"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kuidas tuleks profiili märguanded kuvada siis, kui seade on lukus?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profiili märguanded"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Ära kunagi kuva märguandeid"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Väike: heli ega visuaalset märguannet ei esitata"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Keskmine: heli puudub"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Suur: esita heli"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Kiireloomuline: esita heli ja 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Märguannete abi"</string>
@@ -2812,7 +2811,7 @@
       <item quantity="other">%d rakendust saavad lugeda märguandeid</item>
       <item quantity="one">%d rakendus saab lugeda märguandeid</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"Ükski installitud rakendus pole taotlenud märguande juurdepääsu."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"Ükski installitud rakendus pole taotlenud juurdepääsu märguannetele."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Kas lubada teenusel <xliff:g id="SERVICE">%1$s</xliff:g> märguannetele juurde pääseda?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"Teenus <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> saab lugeda kõiki märguandeid, sh isiklikke andmeid, nagu kontaktide nimed ja teile saadetud tekstsõnumid. See saab ka loobuda märguannetest või aktiveerida märguannetes olevaid toimingunuppe. \n\nSee võimaldab ka rakendusel lülitada sisse või välja funktsiooni Mitte segada ja muuta sellega seotud seadeid."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Kui lülitate teenuse <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> jaoks juurdepääsu märguannetele välja, võidakse välja lülitada ka juurdepääs funktsioonile Mitte segada."</string>
@@ -2833,9 +2832,11 @@
     <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_on" msgid="6103704909710176555">"Jah"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Ei"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Juurdepääs funktsioonile Mitte segada"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokeerib selle rakenduse märguannete kuvamise selles seadmes"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokeerib selle märguandekategooria kuvamise selles seadmes"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategooriad"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Muu"</string>
     <string name="no_channels" msgid="3077375508177744586">"See rakendus pole postitanud ühtegi märguannet"</string>
@@ -2913,7 +2914,7 @@
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Kõigilt"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Ainult kontaktidelt"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Ainult tärniga tähistatud kontaktidelt"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"Puudub"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Mitte kelleltki"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmid"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Meeldetuletused"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Sündmused"</string>
@@ -2940,7 +2941,7 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Muudetakse valikule Ainult alarmid kuni kella <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Muudetakse valikule Katkesta alati"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokeeri, kui ekraan on sees"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Keelab režiimiga Mitte segada vaigistatud märguannete piilumise või ekraanile ilmumise"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Keelab režiimiga Mitte segada vaigistatud märguannete eelvaated või ekraanile ilmumise"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokeeri, kui ekraan on väljas"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Keelab režiimiga Mitte segada vaigistatud märguannetel ekraani sisse lülitada või märguandetuld vilgutada"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Keelatakse režiimiga Mitte segada vaigistatud märguannete sisselülitamine ekraanil"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Sees"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Väljas"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekraanikuva kinnitamine"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Kui seade on s. lülitatud, võite ekraanikuva kinnitada. Nii jääb kuva avatuks, kuni selle tühistate.\n\nEkraanikuva kinnit. tehke järgmist.\n\n1. Veenduge, et ekraanikuva kinnit. oleks sisse lülitatud.\n\n2. Avage kuva, mille soovite kinnitada.\n\n3. Puud. valikut Ülevaade.\n\n4. Pühkige üles ja puud. kinnitamisikooni."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Kui seade on sees, saab ekraanikuva kinnitada. Nii jääb kuva avatuks, kuni selle tühistate.\n\nKuva kinnitamiseks tehke järgmist.\n\n1. Veenduge, et ekraanikuva kinnitamine oleks sisse lülitatud.\n\n2. Avage kuva, mille soovite kinnitada.\n\n3. Puudutage Ülevaade.\n\n4. Pühkige üles ja puudutage kinnitamisikooni."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Enne vabastamist küsi avamismustrit"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Enne vabastamist küsi PIN-koodi"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Enne vabastamist küsi parooli"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Praeguse suuna säilitamine"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Turvaline käivitamine"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jätka"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Seadme täiendavaks kaitsmiseks võite määrata, et seade nõuab käivitumiseks PIN-koodi sisestamist. Kuni seade pole käivitunud, ei saa see vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta andmeid seadme kaotsimineku või varguse korral."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Seadme täiendavaks kaitsmiseks võite määrata, et seade nõuab käivitumiseks mustri sisestamist. Kuni seade pole käivitunud, ei saa see vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta andmeid seadme kaotsimineku või varguse korral."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Seadme täiendavaks kaitsmiseks võite määrata, et seade nõuab käivitumiseks parooli sisestamist. Kuni seade pole käivitunud, ei saa see vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme. \n\nSee aitab kaitsta andmeid seadme kaotsimineku või varguse korral."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Lisaks sõrmejälje kasutamisele seadme avamiseks saate oma seadet kaitsta ka PIN-koodi küsimisega enne käivitamist. Enne seadme käivitamist ei saa see vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kadunud või varastatud seadmes olevaid andmeid."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Lisaks sõrmejälje kasutamisele seadme avamiseks saate oma seadet kaitsta ka mustri küsimisega enne käivitamist. Enne seadme käivitamist ei saa see vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kadunud või varastatud seadmes olevaid andmeid."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Lisaks sõrmejälje kasutamisele seadme avamiseks saate oma seadet kaitsta ka parooli küsimisega enne käivitamist. Enne seadme käivitamist ei saa see vastu võtta kõnesid, sõnumeid ega märguandeid, sh alarme.\n\nSee aitab kaitsta kadunud või varastatud seadmes olevaid andmeid."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Nõua seadme käivitamiseks PIN-koodi sisestamist"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Nõua seadme käivitamiseks mustri sisestamist"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Nõua seadme käivitamiseks parooli sisestamist"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Tänan, ei"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Tänan, ei"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Tänan, ei"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Seadme tõhusamaks kaitsmiseks saate nõuda PIN-koodi sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks PIN-koodi sisestamist?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Seadme tõhusamaks kaitsmiseks saate nõuda mustri sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks mustri sisestamist?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Seadme tõhusamaks kaitsmiseks saate nõuda parooli sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks parooli sisestamist?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Peale sõrmejäljega avamise funktsiooni saate seadme tõhusamaks kaitsmiseks nõuda PIN-koodi sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks PIN-koodi sisestamist?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Peale sõrmejäljega avamise funktsiooni saate seadme tõhusamaks kaitsmiseks nõuda mustri sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks mustri sisestamist?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Peale sõrmejäljega avamise funktsiooni saate seadme tõhusamaks kaitsmiseks nõuda parooli sisestamist, enne kui seade käivitub. Enne käivitumist ei saa seadmega kõnesid, sõnumeid ega märguandeid, sealhulgas alarme, vastu võtta. \n\nSee aitab kaitsta kaotsiläinud või varastatud seadmetes olevaid andmeid. Kas soovite nõuda seadme käivitamiseks parooli sisestamist?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Jah"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ei"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Kas nõuda PIN-koodi?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Kas nõuda mustrit?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Kas nõuda parooli?"</string>
@@ -3044,7 +3041,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Täpsemad"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Rakenduste seadistamine"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Tundmatu rakendus"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"Rakenduse load"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Rakenduste load"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Rakendused, millel on rakenduse <xliff:g id="APPS">%1$s</xliff:g> luba"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Puudutusega äratamine"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Seadme äratamiseks topeltpuudutage ekraani"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Luba võimaldab rakendusel muuta süsteemiseadeid."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Jah"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Jah"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ei"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Luba rakenduste installimine"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Lubatud"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Pole lubatud"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Luba sellest allikast"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Pöörake kaks korda kaamera avamiseks"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Avage kaamerarakendus, pöörates rannet kaks korda"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kaamera avam. vajut. 2 korda toitenuppu"</string>
@@ -3267,7 +3264,7 @@
     <string name="condition_expand_hide" msgid="948507739223760667">"Peida"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"Leviala on sees"</string>
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Teisaldatav WiFi-leviala <xliff:g id="ID_1">%1$s</xliff:g> on aktiivne, WiFi on selles seadmes välja lülitatud."</string>
-    <string name="condition_airplane_title" msgid="287356299107070503">"Lennukirežiim on sees"</string>
+    <string name="condition_airplane_title" msgid="287356299107070503">"Lennurežiim on sees"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"WiFi, Bluetooth ja mobiilne andmeside on välja lülitatud. Te ei saa helistada ega Internetiga ühendust luua."</string>
     <string name="condition_zen_title" msgid="2679168532600816392">"Režiim Mitte segada on sees (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Akusäästja on sisse lülitatud"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Ühendatud:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Arendaja kiirseadete paanid"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Oleme valmis teid aitama"</string>
@@ -3462,7 +3460,7 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Topeltpuudutage tahvelarvuti kontrollimiseks"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Topeltpuudutage seadme kontrollimiseks"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Märguannete kiireks kontrollimiseks topeltpuudutage ekraani."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefoni kontrollimiseks tõstke seda"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefoni kontrollimiseks tõstmine"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tahvelarvuti kontrollimiseks tõstke seda"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Seadme kontrollimiseks tõstke seda"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Märguannete kiireks kontrollimiseks võtke telefon kätte."</string>
@@ -3579,9 +3577,9 @@
     <string name="audio_files_title" msgid="4777048870657911307">"Helifailid"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(desinstall. kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(keelatud kasutaja <xliff:g id="USER">%s</xliff:g> jaoks)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Automaatse täitmise teenus"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Automaattäite teenus"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automaatne, täide, automaattäide"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Kas soovite määrata rakenduse <xliff:g id="APP_NAME_0">%1$s</xliff:g> automaattäite rakenduseks? <xliff:g id="APP_NAME_1">%1$s</xliff:g> saab lugeda teie ekraani ja täita teistes rakendustes väljasid."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Veenduge, et rakendus oleks usaldusväärne&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google\'i automaatne täitmine&gt;%1$s&lt;/xliff:g&gt; kasutab automaatse täitmise sisestuse määramiseks ekraanil kuvatut."</string>
     <string name="device_theme" msgid="4571803018917608588">"Seadme teema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Vaikeseade"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Salvestusruumi haldur: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index 0feddd8..25c162d 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Bat ere ez"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Bat ere ez"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 7051bb2..2c6fe3e 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Deskonektatu?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Gailu honekin duzun konexioa amaituko da:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Ez daukazu Bluetooth-ezarpenak aldatzeko baimenik."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth konexioa aktibo badago, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Bluetooth ezarpenak irekita badaude, inguruko gailuek <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ikusi ahal izango dute."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> deskonektatu nahi duzu?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Igorpena"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Profila desgaitu?"</string>
@@ -190,7 +190,7 @@
     <string name="radio_info_gprs_service_label" msgid="4209624131644060517">"Datu-zerbitzua:"</string>
     <string name="radio_info_roaming_label" msgid="6141505430275138647">"Ibiltaritzan:"</string>
     <string name="radio_info_imei_label" msgid="1220524224732944192">"IMEI:"</string>
-    <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Deien desbideratzea:"</string>
+    <string name="radio_info_call_redirect_label" msgid="2743797189722106231">"Dei-desbideratzea:"</string>
     <string name="radio_info_ppp_resets_label" msgid="3587319503902576102">"PPP berrezarpen kopurua abiarazi ezkero:"</string>
     <string name="radio_info_current_network_label" msgid="9151285540639134945">"Uneko sarea:"</string>
     <string name="radio_info_ppp_received_label" msgid="363579470428151850">"Jasotako datuak:"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontuak"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kokapena"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontuak"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Segurtasuna eta kokapena"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptatzea eta kredentzialak"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Enkriptatuta dago telefonoa"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Pantaila blokeatuaren hobespenak"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Enkriptatuta dago telefonoa"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Pant. blokeatuaren hobespenak"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ezarri Nire kokapena, pantailaren desblokeoa, SIM txartelaren blokeoa, kredentzialen biltegiaren blokeoa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ezarri Nire kokapena, pantailaren desblokeoa, kredentzialen biltegiaren blokeoa."</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Pribatutasuna"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administratzaileak desgaitu du"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Segurtasunaren egoera"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Pantailaren blokeoa, hatz-marka"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Pantailaren blokeoa"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Hatz-marka digitala"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Kudeatu hatz-markak"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Hatz-marken erabilera"</string>
@@ -450,7 +449,7 @@
     <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>
-    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Aukeratu pantailaren blokeoaren ordezko metodoa"</string>
+    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Aukeratu pantaila blokeatzeko ordezko metodoa"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Pantailaren blokeoa"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>: inaktibo ezarri bezain laster"</string>
     <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> inaktibo ezarri ondoren"</string>
@@ -469,12 +468,12 @@
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Pasahitza"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Segurtasun handia"</string>
     <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Orain ez"</string>
-    <string name="current_screen_lock" msgid="4104091715420072219">"Aukeratu duzun pantailaren blokeoa"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Unekoa"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Hatz-marka digitala + eredua"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Hatz-marka digitala + PIN kodea"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Hatz-marka digitala + pasahitza"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Egin aurrera hatz-markarik gabe"</string>
-    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Hatz-marka erabil dezakezu telefonoa desblokeatzeko. Segurtasuna ziurtatzeko, ordezko blokeo-aukera bat konfiguratu behar da."</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Hatz-marka erabil dezakezu telefonoa desblokeatzeko. Segurtasuna bermatzeko, pantaila blokeatzeko ordezko metodo bat konfiguratu behar da."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Administratzaileak, enkriptatze-gidalerroek edo kredentzialen biltegiak desgaituta"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Bat ere ez"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Hatza pasatzea"</string>
@@ -675,7 +674,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Desaktibatuta"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Ez dago erabilgarri NFC desaktibatuta dagoelako"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC erabiltzen duten beste gailu batzuekin, gailuak bata besteari hurbilduta. Besteak beste, web-orriak, YouTube bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (bizkarrez bizkar jarri behar izaten dira normalean), eta sakatu pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Eginbide hau aktibatzen baduzu, NFC bidez parteka dezakezu aplikazioen edukia NFC erabiltzen duten beste gailu batzuekin, gailuak bata besteari hurbilduta. Besteak beste, web-orriak, YouTube bideoak, kontaktuak eta beste hainbat gauza parteka ditzakezu.\n\nHori egiteko, hurbildu gailuak bata bestearengana (atzealdeak elkartu behar izan ohi dira), eta sakatu pantaila. Aplikazioak zehaztuko du partekatu beharrekoa zer den."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Aktibatu Wi-Fia"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Jakinarazi kalitate handiko sare publikoak erabilgarri daudenean"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktibatu Wi-Fi konexioa automatikoki"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi konexioa berriro aktibatuko da gordetako kalitate handiko sare batetik gertu zaudenean (adibidez, etxeko sarea)"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ez dago erabilgarri, Wi-Fi sareak bilatzeko aukera desaktibatuta dagoelako"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Saihestu konexio ahulak"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ez erabili Wi-Fi sareak ez badute Interneteko konexio onik"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Erabili Interneteko konexio ona duten sareak soilik"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguratu Wi‑Fi sarea"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Azpisarearen maskara"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 helbideak"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Gordetako sareak"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ezarpenak"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Erabiltzaile honek ezin ditu erabili Wi-Fi aurreratuaren ezarpenak"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desaktibatuta"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Telefonoa oinarrira konektatuta edo lo dagoenean zer gertatzen den kontrolatzeko, aktiba ezazu pantaila-babeslea."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Noiz abiarazi"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Uneko pantaila-babeslea"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Erabili"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ezarpenak"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Distira automatikoa"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktibatu eskuetan hartzen denean"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Sarrerako jakinarazpenen pantaila"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Giroaren araberako pantaila"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Argitu pantaila jakinarazpenak jasotzen dituzunean"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Letra-tipoaren tamaina"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Handitu edo txikitu testua"</string>
@@ -1380,7 +1377,7 @@
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Erabili GPS sistema edota Wi‑Fi, Bluetooth edo telefonia mugikorreko sareak kokapena zehazteko"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Erabili Wi‑Fi, Bluetooth edo telefonia mugikorreko sareak kokapena zehazteko"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Erabili GPS sistema kokapena zehazteko"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Bilatzea"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Bilaketa"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi sareak bilatzea"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Hobetu kokapenaren zehaztasuna sistemaren aplikazioei eta zerbitzuei Wi-Fi sareak edonoiz hautemateko aukera emanda."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth gailuak bilatzea"</string>
@@ -1441,12 +1438,12 @@
     <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. Derrigorrez marraztu behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_pin" msgid="8048122891934295280">"Aurrera egiteko, idatzi gailuaren PIN kodea. Derrigorrez idatzi behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_device_password" msgid="9007679426540259125">"Aurrera egiteko, idatzi gailuaren pasahitza. Derrigorrez idatzi behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pattern" msgid="7462071286473121099">"Aurrera egiteko, marraztu laneko eredua. Derrigorrez marraztu behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_pin" msgid="809763184419127790">"Aurrera egiteko, idatzi laneko PIN kodea. Derrigorrez idatzi behar da gailua berrabiaraztean."</string>
-    <string name="lockpassword_strong_auth_required_reason_restart_work_password" msgid="8923861444535970646">"Aurrera egiteko, idatzi laneko pasahitza. Derrigorrez idatzi behar da gailua berrabiaraztean."</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_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>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"Sistemaren eguneratzeak ezin dira kanpoko euskarri batean instalatu."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Gailua administratzeko aplikazioa ezin da instalatu kanpoko euskarri batean"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Gelditzera behartu?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Aplikazioak gelditzera behartzen badituzu, agian portaera okerra izan dezakete."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Aplikazioak gelditzera behartzen badituzu, baliteke behar bezala ez funtzionatzea."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Ezin izan da aplikazioa eraman. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Instalazioaren kokapen hobetsia"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Denda"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Aplikazioaren xehetasunak"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"<xliff:g id="APP_STORE">%1$s</xliff:g> dendatik instalatu da aplikazioa"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Informazio gehiago duzu hemen: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Aplikazioen eragiketak"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Abian"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ez da inoiz erabili)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Teklatuko lasterbideen laguntza"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Bistaratu erabilgarri dauden lasterbideak"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Lehenetsia"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Sagua / Ukipen-panela"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Erakuslearen abiadura"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Bideojoko-kontrolatzailea"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Erabili dardara."</string>
@@ -1773,28 +1770,28 @@
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Azpitituluak"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Lupa"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Lupa aplikatzeko, sakatu hiru aldiz"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Aplikatu lupa botoiarekin"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Aplikatu lupa botoiarekin eta hiru aldiz sakatuta"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Lupa aplikatzeko, erabili botoia"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Lupa aplikatzeko, erabili botoia eta sakatu hiru aldiz"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Handitu pantaila"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Sakatu hirutan zooma aplikatzeko"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Zooma aplikatzeko, sakatu hirutan"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Zooma aplikatzeko, sakatu botoi bat"</string>
     <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_shortcut_service_title" msgid="4779360749706905640">"Lasterbide-zerbitzua"</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_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>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Amaitu deiak etengailuarekin"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Amaitu deiak pizteko botoiarekin"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Saguaren erakusle handia"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio monofonikoa"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Konbinatu kanalak audioa erreproduzitzean"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Sakatuta edukitzearen atzerapena"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Kolore-alderantzikatzea"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Baliteke funtzionamenduan eragina izatea"</string>
+    <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>
@@ -1856,7 +1853,7 @@
     <string name="color_yellow" msgid="9112680561610873529">"Horia"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Magenta"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> erabili nahi duzu?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak hau egin behar du:"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> zerbitzuak hauek egin behar ditu:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Aplikazio bat baimen-eskaera oztopatzen ari denez, ezarpenek ezin dute egiaztatu erantzuna."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"<xliff:g id="SERVICE">%1$s</xliff:g> aktibatzen baduzu, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Erabilerraztasun-zerbitzua aktibatu duzunez, gailuak ez du pantailaren blokeoa erabiliko datuen enkriptatzea hobetzeko."</string>
@@ -1888,7 +1885,7 @@
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Gehitu inprimagailua"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Bilatu"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"Inprimagailuak bilatzen"</string>
-    <string name="print_service_disabled" msgid="7739452396114245222">"Zerbitzua desgaitu da"</string>
+    <string name="print_service_disabled" msgid="7739452396114245222">"Zerbitzua desgaituta dago"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Inprimatze-lanak"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Inprimatze-lana"</string>
     <string name="print_restart" msgid="8373999687329384202">"Berrabiarazi"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Pantailaren erabilera gailua guztiz kargatu zenetik"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Pantailaren kontsumoa"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Sare mugikorra bilatzen"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Duela <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Aplikazioen erabilera gailua guztiz kargatu zenetik (duela <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Duela <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Aplikazioen erabilera gailua guztiz kargatu zenetik (duela <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Gailua guztiz kargatu zenetik pantaila piztuta egon den denbora"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Gailuaren erabilera hura guztiz kargatu zenetik"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateriaren erabilera entxufea atera ondoren"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Sare mugikorraren bilaketa"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Sare mugikorra egonean dagoela"</string>
     <string name="power_phone" msgid="5392641106474567277">"Ahots-deiak"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableta inaktibo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonoa inaktibo"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Bateriaren erabilerari buruzko datuetan, energiaren gutxi gorabeherako erabilera adierazten da eta ez dira bateria agortzen duten iturburu guztiak aipatzen. Bestelako erabileretan, kalkulatutako gutxi gorabeherako erabileraren eta bateriaren benetako kontsumoaren arteko desberdintasuna adierazten da."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Uste baino energia gutxiago erabili da."</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Erabilitako denbora: %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Erabilera-denbora: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> erabili du <xliff:g id="APP">%2$s</xliff:g> aplikazioak"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Bateria osoaren <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Guztiz kargatu zen azken aldiaz geroztik emandako erabilerari buruzko datuak"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Guztiz kargatu zenetik emandako erabileraren datuak"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Azkenekoz guztiz kargatu zenetik"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Gelditzen den bateriari buruzko informazioa gutxi gorabeherakoa da eta aldatu egin liteke erabileraren arabera"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiboki erabili bitartean"</string>
@@ -2029,7 +2026,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android sistema eragilea"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Multimedia-zerbitzaria"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Aplikazio-optimizazioa"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Bateria aurrezlea"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Bateria-aurrezlea"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Aktibatu automatikoki"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Inoiz ez"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"bateriaren maila <xliff:g id="PERCENT">%1$s</xliff:g> denean"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ahots-sarreraren eta -irteeraren ezarpenak"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ahots bidezko bilaketa"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android teklatua"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Hizketa"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Ahots bidezko idazketaren ezarpenak"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Ahots bidezko idazketa"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ahots bidezko idazketa-zerbitzuak"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Ezin izan da kredentzialen biltegia ezabatu."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Kredentzialen biltegia gaitu da."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kredentzialen biltegia erabili aurretik, pantaila blokeatzeko PIN kodea edo pasahitza ezarri behar duzu."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Erabilera-datuak atzi ditzaketenak"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Erabilera-baimena dutenak"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Larrialdi-tonua"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ezarri larrialdi-deiak egitean izan beharreko portaera."</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Babeskopiak"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Jakinarazpenen bolumena"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonoaren tonu-jotzailea"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Jakinarazpenen soinu lehenetsia"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Aplikazioaren soinua"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Jakinarazpenen soinu lehenetsia"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Alarmaren soinu lehenetsia"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Egin dar-dar deietan ere"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Beste soinu batzuk"</string>
@@ -2757,7 +2755,7 @@
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Arau automatikoak"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Ezarri \"Ez molestatu\" arauak"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Mugatu soinuak eta dardarak ordu jakinetara"</string>
-    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Lehentasunezkoak"</string>
+    <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Lehentasuna dutenak soilik"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmak soilik"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Isiltasun osoa"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Gailua blokeatuta dagoenean, nola ikusi nahi dituzu profileko jakinarazpenak?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profileko jakinarazpenak"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Ez erakutsi jakinarazpenik inoiz"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Txikia: ez egin soinurik eta ez erakutsi"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Ertaina: ez egin soinurik"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Handia: egin soinua"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Premiazkoa: egin soinua eta 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Jakinarazpenen laguntzailea"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Aplikazio honen jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Kategoria honetako jakinarazpenak gailu honetan erakustea galarazten ari da Android"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategoriak"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Beste batzuk"</string>
     <string name="no_channels" msgid="3077375508177744586">"Aplikazioak ez du argitaratu jakinarazpenik"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Aktibatuta"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desaktibatuta"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Pantaila ainguratzea"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Ezarpen hau aktibatzen baduzu, pantailak aingura ditzakezu, aukeratzen duzun ikuspegi hori egon dadin ikusgai aharik eta aingura kentzen diozun arte.\n\nPantaila ainguratzeko:\n\n1. Aktibatu pantaila ainguratzeko eginbidea.\n\n2. Ireki ainguratu nahi duzun pantaila.\n\n3. Sakatu Ikuspegi orokorra.\n\n4. Pasatu hatza gora eta sakatu ainguraren ikonoa."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Ezarpen hau aktibatzen baduzu, pantailak aingura ditzakezu, aukeratzen duzun ikuspegi hori egon dadin ikusgai aharik eta aingura kentzen diozun arte.\n\nHorretarako:\n\n1. Aktibatu pantaila ainguratzeko eginbidea.\n\n2. Ireki ainguratu nahi duzun pantaila.\n\n3. Sakatu Ikuspegi orokorra.\n\n4. Pasatu hatza gora eta sakatu ainguraren ikonoa."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Eskatu desblokeatzeko eredua aingura kendu aurretik"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Eskatu PIN kodea aingura kendu aurretik"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Eskatu pasahitza aingura kendu aurretik"</string>
@@ -2964,23 +2965,19 @@
     <string name="experimental_preference" msgid="7083015446690681376">"(Esperimentala)"</string>
     <string name="display_auto_rotate_title" msgid="7119684966039069439">"Gailuaren biraketa"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Aldatu pantailaren orientazioa"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Jarraitu modu bertikalean"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Jarraitu ikuspegi bertikalean"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Jarraitu modu horizontalean"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ez aldatu pantailaren orientazioa"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Abio segurua"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jarraitu"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Gailua are gehiago babes dezakezu abiarazi aurretik PIN kodea eskatuta. Gailua abiarazi arte, ezingo duzu jaso deirik, mezurik edo jakinarazpenik, alarmak barne. \n\nHorrela, gailua galdu edo lapurtuz gero, datuak babestuta egongo dira."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Gailua are gehiago babes dezakezu abiarazi aurretik eredua eskatuta. Gailua abiarazi arte, ezingo duzu jaso deirik, mezurik edo jakinarazpenik, alarmak barne. \n\nHorrela, gailua galdu edo lapurtuz gero, datuak babestuta egongo dira."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Gailua are gehiago babes dezakezu abiarazi aurretik pasahitza eskatuta. Gailua abiarazi arte, ezingo duzu jaso deirik, mezurik edo jakinarazpenik, alarmak barne. \n\nHorrela, gailua galdu edo lapurtuz gero, datuak babestuta egongo dira."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Gailua desblokeatzeko hatz-marka erabiltzeaz gain, gailua are gehiago babes dezakezu hura abiarazi baino lehen PIN kodea eskatuta. Gailua abiarazten den arte, ezingo du deirik, mezurik edo jakinarazpenik jaso, alarmak barne.\n\nHorri esker, galdutako edo lapurtutako gailuetako datuak babesten dira."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Gailua desblokeatzeko hatz-marka erabiltzeaz gain, gailua are gehiago babes dezakezu hura abiarazi baino lehen eredua eskatuta. Gailua abiarazten den arte, ezingo du deirik, mezurik edo jakinarazpenik jaso, alarmak barne.\n\nHorri esker, galdutako edo lapurtutako gailuetako datuak babesten dira."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Gailua desblokeatzeko hatz-marka erabiltzeaz gain, gailua are gehiago babes dezakezu hura abiarazi baino lehen pasahitza eskatuta. Gailua abiarazten den arte, ezingo du deirik, mezurik edo jakinarazpenik jaso, alarmak barne.\n\nHorri esker, galdutako edo lapurtutako gailuetako datuak babesten dira."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Eskatu PIN kodea gailua abiarazteko"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Eskatu eredua gailua abiarazteko"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Eskatu pasahitza gailua abiarazteko"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ez, eskerrik asko"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ez, eskerrik asko"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ez, eskerrik asko"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Gailua are gehiago babesteko, PIN kodea eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. PIN kodea eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Gailua are gehiago babesteko, eredua eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek.\n Eredua eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Gailua are gehiago babesteko, pasahitza eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Pasahitza eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Hatz-marka erabiltzeaz gain, gailua are gehiago babesteko, PIN kodea eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. PIN kodea eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Hatz-marka erabiltzeaz gain, gailua are gehiago babesteko, eredua eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Eredua eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Hatz-marka erabiltzeaz gain, gailua are gehiago babesteko, pasahitza eska dezakezu gailua abiarazi ahal izateko. Abiarazi arte ezingo du jaso deirik, mezurik edo jakinarazpenik, ezta alarmarik jo ere. \n\nGaldutako edo lapurtutako gailuen datuak babesteko balio du neurri horrek. Pasahitza eskatu nahi duzu gailua abiarazi ahal izateko?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Bai"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ez"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN kodea eskatzea nahi duzu?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Eredua eskatzea nahi duzu?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Pasahitza eskatzea nahi duzu?"</string>
@@ -3063,7 +3060,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Ez da ezagutzen"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Lehenetsia"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Lanerako aplikazio lehenetsiak"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Laguntza eta ahots-idazketa"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Laguntza eta ahozko idazketa"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Laguntza-aplikazioa"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> laguntzaile gisa ezarri nahi duzu?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Zure sistemak darabiltzan aplikazioei buruzko informazioa irakurri ahal izango du laguntzaileak, besteak beste, pantailan ikusgai duzun edo aplikazioetatik atzi daitekeen informazioa."</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Baimen honekin, sistemaren ezarpenak alda ditzakete aplikazioek."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Bai"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ez"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Bai"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ez"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Baimendu aplikazioak instalatzea"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Baimena dauka"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Ez dauka baimenik"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Baimendu iturburu hau"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera irekitzeko, biratu birritan"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ireki kameraren aplikazioa eskumuturra birritan biratuta"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Ireki kamera etengailua birritan sakatuta"</string>
@@ -3392,13 +3389,14 @@
     <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_connected_summary" msgid="8733997010923307915">"Hona konektatuta:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ezarpen bizkorretako garatzaileentzako lauzak"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Laguntzeko gauzkazu"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Laguntzeko prest gauzkazu beti, gau eta egun."</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"Laguntzeko prest gauzkazu beti, gau eta egun"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"Arazoak konpontzen laguntzeko prest duzu gure laguntza-zerbitzua"</string>
+    <string name="support_escalation_summary" msgid="8473084168776014405">"Arazoak konpontzen laguntzeko prest duzu gure laguntza-taldea"</string>
     <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"Gure laguntza-taldea laguntzeko prest izango duzu egunero-egunero, gau eta egun"</string>
     <string name="support_escalation_closed_summary" msgid="2240967274380168303">"Bilatu laguntzan edo itzuli laguntza eskaintzen dugun orduetan (bertako orduan):&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"Telefono bidezko laguntza-zerbitzuaren ordutegia (bertako orduan)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
@@ -3483,7 +3481,7 @@
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"Ezin da erabili operadore bakarra erabil dezaketen gailuetan"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"Guztira, <xliff:g id="SIZE">%1$s</xliff:g> utzi dira libre.\n\nAzken exekuzio-data: <xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"Zuzeneko aplikazioak"</string>
-    <string name="web_action_enable_summary" msgid="3108127559723396382">"Ireki estekak aplikazioetan, nahiz eta aplikazio horiek instalatuta ez egon"</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="domain_url_section_title" msgid="7046835219056428883">"Instalatutako aplikazioak"</string>
@@ -3569,7 +3567,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Beste aplikazio batzuk"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fitxategiak"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Tabletaren memoria"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonoko memoria"</string>
+    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonoaren memoria"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Memoria osotik (<xliff:g id="TOTAL">%1$s</xliff:g>) erabilitakoa"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"erabilita"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> - desgaituta)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Betetze automatikoaren zerbitzua"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"bete, automatikoki, betetze automatiko"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> erabili nahi duzu eremuak automatikoki betetzeko? Pantaila irakurri eta beste aplikazio batzuetako eremuak betetzeko gai izango da <xliff:g id="APP_NAME_1">%1$s</xliff:g>."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Ziurtatu aplikazioa fidagarria dela&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; eginbideak pantailan dagoena erabiltzen du automatikoki bete daitekeena zehazteko."</string>
     <string name="device_theme" msgid="4571803018917608588">"Gailuaren gaia"</string>
     <string name="default_theme" msgid="7085644992078579076">"Lehenetsia"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Memoria-kudeatzailea: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index fc5bf4c..32ca0b7 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"هیچ‌کدام"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"سیم کارت"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"هیچ‌کدام"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -250,11 +252,11 @@
     <item msgid="1061584358377390581">"GPS"</item>
     <item msgid="5387405117297558954">"لرزش"</item>
     <item msgid="3434165993711230924">"خواندن مخاطبین"</item>
-    <item msgid="616161687718081936">"اصلاح مخاطبین"</item>
+    <item msgid="616161687718081936">"تغییر مخاطبین"</item>
     <item msgid="7638002295329050091">"خواندن گزارش تماس"</item>
-    <item msgid="6546959730920410907">"اصلاح گزارش تماس"</item>
+    <item msgid="6546959730920410907">"تغییر گزارش تماس"</item>
     <item msgid="446877710771379667">"خواندن تقویم"</item>
-    <item msgid="7674458294386319722">"اصلاح تقویم"</item>
+    <item msgid="7674458294386319722">"تغییر تقویم"</item>
     <item msgid="8281201165558093009">"‏جستجوی شبکه Wi‑Fi"</item>
     <item msgid="8694611243479480497">"اعلان"</item>
     <item msgid="7776439107987345446">"جستجوی شبکه سلولی"</item>
@@ -268,14 +270,14 @@
     <item msgid="7125408150230860501">"ارسال پیامک"</item>
     <item msgid="7080337936612188061">"‏خواندن پیامک ICC"</item>
     <item msgid="587124103118495063">"‏نوشتن پیامک ICC"</item>
-    <item msgid="2320577158869025503">"اصلاح تنظیمات"</item>
+    <item msgid="2320577158869025503">"تغییر تنظیمات"</item>
     <item msgid="1545733463471924009">"در بالا طراحی کنید"</item>
     <item msgid="3609046903962454582">"اعلان‌های دسترسی"</item>
     <item msgid="4671646036128214513">"دوربین"</item>
     <item msgid="1097324338692486211">"ضبط صدا"</item>
     <item msgid="5031552983987798163">"پخش صدا"</item>
     <item msgid="8374996688066472414">"خواندن کلیپ بورد"</item>
-    <item msgid="3045529469061083747">"اصلاح بریده‌دان"</item>
+    <item msgid="3045529469061083747">"تغییر بریده‌دان"</item>
     <item msgid="5124443975763747838">"دکمه‌های رسانه‌ای"</item>
     <item msgid="4547883971364273343">"فوکوس صدا"</item>
     <item msgid="2603878814882344450">"میزان کنترل"</item>
@@ -317,11 +319,11 @@
     <item msgid="1660743989948992916">"موقعیت مکانی"</item>
     <item msgid="8791172739860195290">"لرزش"</item>
     <item msgid="383413555642128046">"خواندن مخاطبین"</item>
-    <item msgid="3654594895269697313">"اصلاح مخاطبین"</item>
+    <item msgid="3654594895269697313">"تغییر مخاطبین"</item>
     <item msgid="7928393476362362538">"خواندن گزارش تماس"</item>
-    <item msgid="6248591205254641116">"اصلاح گزارش تماس"</item>
+    <item msgid="6248591205254641116">"تغییر گزارش تماس"</item>
     <item msgid="6093344633066170692">"خواندن تقویم"</item>
-    <item msgid="1334886368750347692">"اصلاح تقویم"</item>
+    <item msgid="1334886368750347692">"تغییر تقویم"</item>
     <item msgid="1638204101698708656">"موقعیت مکانی"</item>
     <item msgid="2154671955760380322">"اعلان پست"</item>
     <item msgid="4282477730595931828">"موقعیت مکانی"</item>
@@ -342,7 +344,7 @@
     <item msgid="1720492593061838172">"ضبط صدا"</item>
     <item msgid="3493046322001257041">"پخش صدا"</item>
     <item msgid="136815868796597058">"خواندن کلیپ بورد"</item>
-    <item msgid="5238692940326972503">"اصلاح کردن کلیپ بورد"</item>
+    <item msgid="5238692940326972503">"تغییر بریده‌دان"</item>
     <item msgid="5753789168376302997">"دکمه‌های رسانه‌"</item>
     <item msgid="3265262911688671938">"فوکوس صدا"</item>
     <item msgid="2098976479485046797">"میزان صدای اصلی"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 4e9073f..d44d695 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"حساب‌ها"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مکان"</string>
     <string name="account_settings_title" msgid="626177544686329806">"حساب‌ها"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"امنیت و مکان"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"رمزگذاری و اعتبارنامه"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"تلفن رمزگذاری شده است"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"تلفن رمزگذاری شده است"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"تنظیمات برگزیده صفحه درحالت قفل"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل حافظه اطلاعات کاربری"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل حافظه اطلاعات کاربری"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"حریم خصوصی"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"غیرفعال‌شده توسط سرپرست"</string>
     <string name="security_status_title" msgid="5848766673665944640">"وضعیت امنیتی"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"مدیریت اثر انگشت"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"استفاده از اثر انگشت برای"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏در دسترس نیست چون اسکن Wi‑Fi خاموش است"</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>
@@ -726,7 +726,7 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال به شبکه"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"به خاطر سپردن شبکه"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"فراموش کردن شبکه"</string>
-    <string name="wifi_menu_modify" msgid="2068554918652440105">"اصلاح کردن شبکه"</string>
+    <string name="wifi_menu_modify" msgid="2068554918652440105">"تغییر شبکه"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏نوشتن در برچسب NFC"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"‏برای مشاهده شبکه‌های در دسترس، Wi-Fi را روشن کنید."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"‏درحال جستجوی شبکه‌های Wi-Fi…"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"‏پیکربندی 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"پوشش زیرشبکه"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏نشانی‌های IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"شبکه‌های ذخیره شده"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"‏تنظیمات IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"‏تنظیمات پیشرفته Wi‑Fi برای این کاربر در دسترس نیست"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"خاموش"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"برای کنترل اینکه وقتی تلفن روی پایه اتصال قرار دارد و/یا در حالت خواب است چه اتفاقی بیفتد، محافظ صفحه را روشن کنید."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"زمان شروع شدن"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"محافظ کنونی صفحه"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"اکنون شروع شود"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"تنظیمات"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"بیدار شدن با بالا بردن"</string>
-    <string name="doze_title" msgid="5389406335828323273">"صفحه ورودی اعلان"</string>
+    <string name="doze_title" msgid="2259176504273878294">"نمایشگر محیط"</string>
     <string name="doze_summary" msgid="3846219936142814032">"روشن شدن صفحه‌نمایش هنگامی که اعلانی دریافت می‌کنید"</string>
     <string name="title_font_size" msgid="4405544325522105222">"اندازه قلم"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"نوشتار را بزرگ‌تر یا کوچک‌تر کنید"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(تاکنون استفاده نشده)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"راهنمای میانبرهای صفحه‌کلید"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"میان‌برهای در دسترس نمایشگر"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"پیش‌فرض"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"موشواره/پد لمسی"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"سرعت اشاره‌گر"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"دسته کنترل بازی"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"استفاده از لرزاننده"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"مصرف صفحه‌نمایش از زمان شارژ کامل"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"مصرف صفحه‌نمایش"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"اسکن شبکه تلفن همراه"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> قبل"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"مصرف برنامه از زمان شارژ کامل (<xliff:g id="TIME">%1$s</xliff:g> قبل)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"مصرف برنامه از زمان شارژ کامل (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"مدت‌زمان مصرف صفحه‌نمایش از زمان شارژ کامل"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"مصرف دستگاه از زمان شارژ کامل"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"استفاده از باتری از زمان جدا شدن"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"دوربین"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"بلوتوث"</string>
-    <string name="power_cell" msgid="6596471490976003056">"حالت آماده به کار تماس"</string>
+    <string name="power_cell" msgid="3392999761958982492">"شبکه تلفن همراه درحالت آماده‌به‌کار"</string>
     <string name="power_phone" msgid="5392641106474567277">"تماس‌های صوتی"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"رایانهٔ لوحی آماده به کار"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"حالت بلااستفاده تلفن"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"استفاده از باتری، استفاده از توان تقریبی است و هر منبع تخلیه شارژ باتری را شامل نمی‌شود. متفرقه تفاوت میان استفاده از توان محاسبه شده تقریبی و تخلیه شارژ واقعی مشاهده شده در باتری است."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"نیروی مصرفی بیش از حد محاسبه شده"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> میلی‌آمپرساعت"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"‏استفاده‌ به مدت %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"مدت‌ زمان استفاده <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"تنظیمات ورودی و خروجی گفتاری"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"جستجوی گفتاری"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"‏صفحه‌کلید Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"گفتاری"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"تنظیمات ورودی گفتاری"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ورودی گفتار"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"سرویس‌های ورودی گفتاری"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"میزان صدای اعلان"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"صدای اعلان پیش‌فرض"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"صدای ارائه‌شده توسط برنامه"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"صدای اعلان پیش‌فرض"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"صدای زنگ پیش‌فرض"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"برای تماس‌ لرزش هم داشته باشد"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"سایر صداها"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"هرگز اعلان‌ها نمایش داده نشوند"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"کم: بدون وقفه صوتی و تصویری"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"متوسط: بدون‌صدا"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"زیاد: پخش صدا"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"فوری: پخش صدا و صفحه بازشو"</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="6585849855452076626">"صدادار باشد"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"بدون صدا و لرزش یا نمایش این اعلان‌ها در صفحه‌نمایش کنونی."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"دستیار اعلان"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"دسترسی به «مزاحم نشوید»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"هیچ برنامه نصب شده‌ای دسترسی به «مزاحم نشوید» را درخواست نکرده است"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"‏Android نمایش اعلان‌های این برنامه را در این دستگاه مسدود می‌کند"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"‏Android نمایش این دسته از اعلان‌ها را در این دستگاه مسدود می‌کند"</string>
     <string name="notification_channels" msgid="5346841743182627500">"دسته‌ها"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"موارد دیگر"</string>
     <string name="no_channels" msgid="3077375508177744586">"این برنامه هیچ اعلانی پست نکرده است"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ماندن در جهت کنونی"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"راه‌اندازی امن"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ادامه"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"می‌توانید برای محافظت بیشتر از دستگاه، قبل از راه‌اندازی آن، پینتان را درخواست کنید. تا زمانی که دستگاه راه‌اندازی نشود، نمی‌تواند نمی‌تواند تماس، پیام، یا اعلانی، از جمله هشدار، دریافت کند. \n\nاین امر به حفاظت از اطلاعات در دستگاه‌های گم‌شده یا دزدیده‌شده کمک می‌کند."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"می‌توانید برای محافظت بیشتر از دستگاه، قبل از راه‌اندازی آن، الگویتان را درخواست کنید. تا زمانی که دستگاه راه‌اندازی نشود، نمی‌تواند نمی‌تواند تماس، پیام، یا اعلانی، از جمله هشدار، دریافت کند. \n\nاین امر به حفاظت از اطلاعات در دستگاه‌های گم‌شده یا دزدیده‌شده کمک می‌کند."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"می‌توانید برای محافظت بیشتر از دستگاه، قبل از راه‌اندازی آن، گذرواژه‌تان را درخواست کنید. تا زمانی که دستگاه راه‌اندازی نشود، نمی‌تواند نمی‌تواند تماس، پیام، یا اعلانی، از جمله هشدار، دریافت کند. \n\nاین امر به حفاظت از اطلاعات در دستگاه‌های گم‌شده یا دزدیده‌شده کمک می‌کند."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاهتان، می‌توانید برای محافظت بیشتر، کد پین را برای راه‌اندازی این دستگاه درخواست کنید. تا زمانی که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان (از جمله هشدار) دریافت کند.\n\nاین کار به حفاظت از اطلاعات در دستگاه‌های گم شده یا به سرقت رفته کمک می‌کند."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاهتان، می‌توانید برای محافظت بیشتر، الگویتان را برای راه‌اندازی این دستگاه درخواست کنید. تا زمانی که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان (از جمله هشدار) دریافت کند.\n\nاین کار به حفاظت از اطلاعات در دستگاه‌های گم شده یا به سرقت رفته کمک می‌کند."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاهتان، می‌توانید برای محافظت بیشتر، گذرواژه‌تان را برای راه‌اندازی این دستگاه درخواست کنید. تا زمانی که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام، یا اعلان (از جمله هشدار) دریافت کند.\n\nاین کار به حفاظت از اطلاعات در دستگاه‌های گم شده یا به سرقت رفته کمک می‌کند."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"برای راه‌اندازی دستگاه، پین مورد نیاز است"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"برای راه‌اندازی دستگاه، کشیدن الگو مورد نیاز است"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"برای راه‌اندازی دستگاه، گذرواژه مورد نیاز است"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"نه متشکرم"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"نه متشکرم"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"نه متشکرم"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"برای محافظت بیشتر از دستگاه، می‌توانید راه‌اندازی آن را به وارد کردن پین موکول کنید. تا‌ زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس، پیام یا اعلان (ازجمله هشدار) دریافت کند. \n\nاین امر به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن پین الزامی است؟"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"برای محافظت بیشتر از دستگاه، می‌توانید راه‌اندازی آن را به وارد کردن الگو موکول کنید. تا‌ زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس، پیام یا اعلان (ازجمله هشدار) دریافت کند. \n\nاین امر به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن الگو الزامی است؟"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"برای محافظت بیشتر از دستگاه، می‌توانید راه‌اندازی آن را به وارد کردن گذرواژه‌ موکول کنید. تا‌ زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس، پیام یا اعلان (ازجمله هشدار) دریافت کند. \n\nاین امر به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن گذرواژه الزامی است؟"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاه، برای محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن پین موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن پین الزامی است؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاه، برای محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن الگو موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن الگو الزامی است؟"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"‏علاوه بر استفاده از اثر انگشت برای باز کردن قفل دستگاه، برای محافظت بیشتر می‌توانید راه‌اندازی آن را به وارد کردن گذرواژه‌ موکول کنید. تا زمانی‌که دستگاه راه‌اندازی نشود، نمی‌تواند تماس تلفنی، پیام یا اعلان (ازجمله هشدار) دریافت کند.\n\nاین کار به محافظت از داده‌ها در دستگاه‌های گم‌شده یا به‌سرقت‌رفته کمک می‌کند. برای راه‌اندازی دستگاهتان وارد کردن گذرواژه الزامی است&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"بله"</string>
+    <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>
@@ -3193,7 +3190,7 @@
     <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>
+    <string name="keywords_write_settings" msgid="6415597272561105138">"نوشتن تغییر تنظیمات سیستم"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%1$d</xliff:g> برنامه از <xliff:g id="COUNT_1">%2$d</xliff:g> برنامه می‌توانند تنظیمات سیستم را تغییر دهند"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"می‌توانند برنامه‌های دیگری نصب کنند"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"می‌توانند تنظیمات سیستم را تغییر دهند"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"بله"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"نه"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"اجازه دادن برای نصب برنامه"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"مجاز"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"مجاز نیست"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"دو ضربه روی دکمه روشن/خاموش برای دوربین"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"متصل به"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"کاشی‌های برنامه‌نویسی تنظیمات سریع"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"ما اینجاییم تا به شما کمک کنیم"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(برای کاربر <xliff:g id="USER">%s</xliff:g> غیرفعال شد)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"سرویس تکمیل خودکار"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"خودکار، پر کردن، تکمیل خودکار"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> برنامه تکمیل خودکار پیش‌فرض شما شود؟ <xliff:g id="APP_NAME_1">%1$s</xliff:g> می‌تواند صفحه شما را بخواند و فیلدهای سایر برنامه‌ها را پر کند."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"‏&lt;b&gt;مطمئن شوید به این برنامه اطمینان دارید&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=تکمیل خودکار Google&gt;%1$s&lt;/xliff:g&gt; برای تعیین مواردی که می‌توانند به‌طور خودکار تکمیل شوند، از آنچه روی صفحه‌نمایش شما است استفاده می‌کند."</string>
     <string name="device_theme" msgid="4571803018917608588">"طرح زمینه دستگاه"</string>
     <string name="default_theme" msgid="7085644992078579076">"پیش‌فرض"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"مدیریت حافظه: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index f3b6936..88cea35 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"–"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ei mitään"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 54b1e6f..5217e04 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tilit"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Sijainti"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tilit"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Suojaus ja sijainti"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Salaus ja kirjautumistiedot"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Puhelimen tiedot on salattu."</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Puhelimen tiedot on salattu."</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Lukitusnäytön asetukset"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Tietosuoja"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Järjestelmänvalvojan estämä"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Suojaustila"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Näytön lukitus, sormenjälki"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Näytön lukitus"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sormenjälki"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Sormenjälkien hallinta"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sormenj. käyttökohde"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Ilmoita, kun käytettävissä on laadukkaita julkisia verkkoja."</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ota Wi-Fi käyttöön automaattisesti"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi otetaan automaattisesti käyttöön, kun lähistöllä on kotiverkkosi tai muita laadukkaita tallennettuja verkkoja."</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ei käytettävissä, koska Wi‑Fi-haku on pois päältä."</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vältä huonoja yhteyksiä"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Älä käytä Wi-Fi-verkkoa, jos sillä on huono internetyhteys"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Käytä vain verkkoja, joiden yhteyslaatu on hyvä"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Määritä Wi‑Fi-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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Aliverkon peite"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-osoitteet"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Tallennetut verkot"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-asetukset"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi-lisäasetukset eivät ole tämän käyttäjän käytettävissä."</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Pois käytöstä"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Ota näytönsäästäjä käyttöön, niin voit hallita puhelimen toimintaa telakoituna ja/tai lepotilassa."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Aloitus"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Nykyinen näytönsäästäjä"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Aloita nyt"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Asetukset"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Herätä nostamalla"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Saapuva ilmoitus ‑näyttö"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambient-näyttö"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivoi näyttö, kun saat ilmoituksia."</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Suurenna tai pienennä tekstiä."</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Kauppa"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Sovelluksen tiedot"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Sovelluksen asennuslähde: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Lisätietoja kohteesta <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Sovellusten toiminta"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Käynnissä"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ei käytetä)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pikanäppäinapuri"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Näytä käytettävissä olevat pikanäppäimet."</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Oletus"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Hiiri/ohjauslevy"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Osoittimen nopeus"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Peliohjaimet"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Käytä värinää"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Näytön käyttö täyden latauksen jälkeen"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Näytön virrankulutus"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiiliverkkojen haku"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> sitten"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="TIME">%1$s</xliff:g> sitten)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> sitten"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Sovellusten virrankulutus edellisen täyden latauksen jälkeen (<xliff:g id="TIME">^1</xliff:g> sitten)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Näytön käyttöaika edellisen täyden latauksen jälkeen"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Laitteen käyttö edellisen täyden latauksen jälkeen"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akun käyttö laturin irrottamisen jälkeen"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Kennot virransäästötilassa"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobiiliverkon valmiustila"</string>
     <string name="power_phone" msgid="5392641106474567277">"Äänipuhelut"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet pois käytöstä"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Puhelin on käyttämätön"</string>
@@ -2007,11 +2004,11 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Akun käyttö on arvio virrankäytöstä eikä se sisällä kaikkia akkua kuluttavia toimintoja. Sekalainen virrankäyttö on lasketun virrankulutusarvion ja todellisen virrankulutuksen erotus."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Yliarvioitu virrankulutus"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Käytetty %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Käyttöaika: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> on käyttänyt <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kaikesta virrankulutuksesta"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Erittely virrankulutuksesta edellisen täyden latauksen jälkeen"</string>
-    <string name="battery_last_full_charge" msgid="7151251641099019361">"Edellisen täyden latauksen jälkeen"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Erittely edellisen täyden latauksen jälkeen"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Edellinen täysi lataus"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Akun jäljellä oleva varaus on arvio ja voi muuttua käytön perusteella."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiivisen käytön aikana"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Taustalla"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Äänisyöte- ja -tulo-asetukset"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Puhehaku"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-näppäimistö"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Puhe"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Äänisyöteasetukset"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Äänisyöte"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Äänisyötepalvelut"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ilmoituksen äänenvoimakkuus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Ilmoituksen oletusääni"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Sovelluksen oletusääni"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Ilmoituksen oletusääni"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Herätyksen oletusääni"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Värinä myös puheluille"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Muut äänet"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Miten haluat profiilin ilmoitusten näkyvän, kun laite on lukittu?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profiilin ilmoitukset"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Ilmoitukset"</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_blocked" msgid="7938180808339386300">"Älä näytä ilmoituksia"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Matala: ei ääntä tai näkyvää ilmoitusta"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Keskitaso: ei ääntä"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Korkea: toista ääni"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Kiireinen: toista ääni ja näytä ilmoitus 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Ilmoitusapuri"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android estää tämän sovelluksen ilmoituksien näyttämisen tällä laitteella."</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android estää tähän luokkaan kuuluvien ilmoituksien näyttämisen tällä laitteella."</string>
     <string name="notification_channels" msgid="5346841743182627500">"Luokat"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Muut"</string>
     <string name="no_channels" msgid="3077375508177744586">"Tämä sovellus ei ole lähettänyt ilmoituksia."</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Säilytä nykyinen suunta"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Turvallinen käynnistys"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Jatka"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Voit parantaa tämän laitteen suojausta vaatimalla PIN-koodin ennen käynnistystä. Ennen käynnistystä laite ei vastaanota puheluita, viestejä eikä ilmoituksia, mukaan lukien hälytykset. \n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen sisältämät tiedot."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Voit parantaa tämän laitteen suojausta vaatimalla kuvion ennen käynnistystä. Ennen käynnistystä laite ei vastaanota puheluita, viestejä eikä ilmoituksia, mukaan lukien hälytykset. \n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen sisältämät tiedot."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Voit parantaa tämän laitteen suojausta vaatimalla salasanan ennen käynnistystä. Ennen käynnistystä laite ei vastaanota puheluita, viestejä eikä ilmoituksia, mukaan lukien hälytykset. \n\nTämä auttaa suojaamaan kadonneen tai varastetun laitteen sisältämät tiedot."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Laitteen lukitus voidaan avata vain sormenjäljen avulla. Tämän lisäksi voit vielä parantaa laitteen suojausta edellyttämällä PIN-koodin ennen laitteen käynnistymistä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluita, viestejä tai ilmoituksia (myöskään herätykset eivät toimi). \n\nTämä auttaa suojaamaan kadotettujen tai varastettujen laitteiden tietoja."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Laitteen lukitus voidaan avata vain sormenjäljen avulla. Tämän lisäksi voit vielä parantaa laitteen suojausta edellyttämällä käyttäjää antamaan kuvion ennen laitteen käynnistymistä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluita, viestejä tai ilmoituksia (myöskään herätykset eivät toimi). \n\nTämä auttaa suojaamaan kadotettujen tai varastettujen laitteiden tietoja."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Laitteen lukitus voidaan avata vain sormenjäljen avulla. Tämän lisäksi voit vielä parantaa laitteen suojausta edellyttämällä salasanan ennen laitteen käynnistymistä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluita, viestejä tai ilmoituksia (myöskään herätykset eivät toimi). \n\nTämä auttaa suojaamaan kadotettujen tai varastettujen laitteiden tietoja."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Vaadi PIN-koodi laitteen käynnistämiseksi."</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Vaadi kuvio laitteen käynnistämiseksi"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Vaadi salasana laitteen käynnistämiseksi"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ei kiitos"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ei kiitos"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ei kiitos"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Voit parantaa laitteen suojausta vaatimalla PIN-koodin antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia. \n\nTämä auttaa suojaamaan laitteen tietoja, jos laite katoaa tai varastetaan. Vaaditaanko PIN-koodin antamista laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Voit parantaa laitteen suojausta vaatimalla kuvion antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko kuvion antamista laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Voit parantaa laitteen suojausta vaatimalla salasanan antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko salasanan antamista laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Sen lisäksi, että käytät lukituksen avaamiseen sormenjälkeäsi, voit parantaa laitteen suojausta vaatimalla PIN-koodin antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko PIN-koodin antamista laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Sen lisäksi, että käytät lukituksen avaamiseen sormenjälkeäsi, voit parantaa laitteen suojausta vaatimalla kuvion antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko kuvion antamista laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Sen lisäksi, että käytät lukituksen avaamiseen sormenjälkeäsi, voit parantaa laitteen suojausta vaatimalla salasanan antamista laitteen käynnistyksen yhteydessä. Ennen kuin laite käynnistyy, se ei voi vastaanottaa puheluja, viestejä tai herätyksiä ja muita ilmoituksia.\n\nTämä auttaa suojaamaan laitteella olevia tietoja, jos laite katoaa tai varastetaan. Vaaditaanko salasanan antamista laitteen käynnistyksen yhteydessä?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Kyllä"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ei"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vaaditaanko PIN-koodi?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vaaditaanko kuvio?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vaaditaanko salasana?"</string>
@@ -3049,7 +3046,7 @@
     <string name="tap_to_wake" msgid="7211944147196888807">"Herätä napauttamalla"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Herätä laite napauttamalla näyttöä kahdesti."</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Linkkien avautuminen"</string>
-    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Älä avaa tuettuja linkkejä"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Älä avaa tuettuja linkkejä."</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Avaa <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Avaa <xliff:g id="DOMAIN">%s</xliff:g> ja muut URL-osoitteet."</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Ei tuettuja linkkejä avaavia sovelluksia"</string>
@@ -3103,7 +3100,7 @@
     <string name="high_power_desc" msgid="6283926163708585760">"Älä optimoi akun käyttöä. Tämä voi kuluttaa akkua nopeammin."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Annetaanko sovellukselle oikeus toimia aina taustalla?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Jos <xliff:g id="APP_NAME">%1$s</xliff:g> saa toimia aina taustalla, laitteen akku voi kulua loppuun nopeammin. \n\nVoit muuttaa tätä asetusta myöhemmin kohdassa Asetukset &gt; Sovellukset ja ilmoitukset."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> %% käytetty täyteen lataamisen jälkeen"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> käytetty täyteen lataamisen jälkeen"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Virranhallinta"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Ei akun käyttöä täyteen lataamisen jälkeen"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Sovellusasetukset"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Tämä käyttöoikeus sallii sovelluksen muokata järjestelmäasetuksia."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Kyllä"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ei"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Kyllä"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ei"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Salli sovellusten asentaminen"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Sallittu"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Ei sallittu"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Salli tästä lähteestä"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kaksoiskääntäminen kameraa varten"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Avaa kamerasovellus kääntämällä rannettasi kahdesti"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera: paina virtapainiketta kahdesti"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Yhdistetty laitteeseen"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pika-asetusosiot kehittäjille"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Autamme mielellämme"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(poistettu käytöstä: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Automaattinen täyttö ‑palvelu"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automaattinen, täyttää, automaattinen täyttö"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Haluatko, että <xliff:g id="APP_NAME_0">%1$s</xliff:g> on automaattisen täytön sovelluksesi? <xliff:g id="APP_NAME_1">%1$s</xliff:g> voi lukea näyttösi sisällön ja täyttää kenttiä muissa sovelluksissa."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Varmista, että luotat tähän sovellukseen&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; päättelee näytöllä olevien kohteiden perusteella, mitä voidaan täyttää automaattisesti."</string>
     <string name="device_theme" msgid="4571803018917608588">"Laitteen teema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Oletus"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Tallennustilan hallinta: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 96eac07..6a85506 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Aucun"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Aucun"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 471257e..b8d53ef 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Voulez-vous vraiment vous déconnecter?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cette opération va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible dans les appareils à proximité si les paramètres Bluetooth sont ouverts."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Lorsque le Bluetooth est activé, votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible par les appareils à proximité."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil?"</string>
@@ -294,14 +294,14 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"Date et heure"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Régler la date et l\'heure"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Configurer la date, l\'heure, le fuseau horaire et les formats"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"Date/Heure automatique"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"Date et heure automatiques"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Utiliser la date et l\'heure fournies par le réseau"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Utiliser la date et l\'heure fournies par le réseau"</string>
     <string name="zone_auto" msgid="334783869352026648">"Fuseau horaire automatique"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Utiliser le fuseau horaire fourni par le réseau"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Utiliser le fuseau horaire fourni par le réseau"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Format 24 heures"</string>
-    <string name="date_time_24hour" msgid="1193032284921000063">"Utiliser le format sur 24 h"</string>
+    <string name="date_time_24hour" msgid="1193032284921000063">"Utiliser le format 24 h"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Heure"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Définir l\'heure"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"Fuseau horaire"</string>
@@ -317,7 +317,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Immédiatement après la mise en veille, sauf lorsque l\'appareil est maintenu en activité par <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> après la mise en veille, sauf lorsque l\'appareil est maintenu en activité par <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Coordonnées du propriétaire sur l\'écran verrouillé"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Mess. écran verrouil."</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Message écran verrouillage"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activer les widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Désactivé par l\'administrateur"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Aucun"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Position"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sécurité et localisation"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Cryptage et authentifiants"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Téléphone crypté"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Téléphone crypté"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Préférences de l\'écran de verrouillage"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Confidentialité"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Désactivé par l\'administrateur"</string>
     <string name="security_status_title" msgid="5848766673665944640">"État de la sécurité"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Verrouillage de l\'écran, empreintes digitales"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Verrouillage de l\'écran"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Lecteur d\'empreintes digitales"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gérer les empreintes digitales"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Util. empr. dig. pour"</string>
@@ -648,7 +647,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Diffuser"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
@@ -671,11 +670,11 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Activer la fonction NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"La technologie NFC échange des données entre cet appareil et d\'autres appareils ou cibles à proximité, tels que les terminaux de paiement, les lecteurs d\'accès et les annonces ou les balises interactifs"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Prêt à partager le contenu de l\'application via NFC"</string>
-    <string name="android_beam_off_summary" msgid="4663095428454779138">"Désactivées"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Prêt à partager le contenu de l\'application par NFC"</string>
+    <string name="android_beam_off_summary" msgid="4663095428454779138">"Désactivé"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Indisponible, car la NFC est désactivée"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages Web, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (typiquement, en les plaçant dos à dos), puis de toucher votre écran. L\'application détermine le contenu à transférer."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Lorsque cette fonctionnalité est activée, vous pouvez partager le contenu d\'une application avec un appareil compatible NFC en rapprochant les appareils. Vous pouvez, par exemple, partager des pages Web, des vidéos YouTube, des contacts et plus encore.\n\nIl vous suffit de rapprocher les appareils (en les plaçant dos à dos), puis de toucher votre écran. L\'application détermine le contenu à transférer."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Activer le Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -692,11 +691,12 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"M\'informer quand un réseau public de haute qualité se trouve à proximité"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activer le Wi-Fi automatiquement"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Le Wi‑Fi se réactivera automatiquement à proximité des réseaux de haute qualité qui sont enregistrés, comme celui de votre domicile"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Cette fonction n\'est pas accessible, car la recherche de réseaux Wi-Fi est désactivée"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions instables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"N\'utiliser que réseaux dotés d\'une connexion Internet stable"</string>
-    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Se connecter automatiquement aux réseaux ouverts"</string>
-    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Se connecter automatiquement aux réseaux publics de haute qualité"</string>
+    <string name="use_open_wifi_automatically_title" msgid="6851951242903078588">"Se connecter auto. aux réseaux ouverts"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"Se connecter auto. aux réseaux publics de haute qualité"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Installer les certificats"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Pour améliorer la précision de la localisation, les applications et les services système peuvent toujours rechercher les réseaux Wi-Fi. Vous pouvez modifier ce paramètre dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="wifi_scan_notify_text_scanning_off" msgid="3426075479272242098">"Pour améliorer la précision de la localisation, activez la recherche Wi-Fi dans les <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>paramètres de recherche<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -767,7 +767,7 @@
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonyme"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Mot de passe"</string>
     <string name="wifi_show_password" msgid="6461249871236968884">"Afficher le mot de passe"</string>
-    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Sélectionnez la bande AP"</string>
+    <string name="wifi_ap_band_config" msgid="1611826705989117930">"Sélectionner la bande du point d\'accès"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"Bande de 2,4 GHz"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"Bande de 5 GHz"</string>
     <string name="wifi_ip_settings" msgid="3359331401377059481">"Paramètres IP"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurer le Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Masque de sous-réseau"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresses IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Réseaux enregistrés"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Paramètres IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Les paramètres Wi-Fi avancés ne sont pas accessibles pour cet utilisateur"</string>
@@ -963,7 +961,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"Luminosité"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosité adaptative"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiser le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Désactivée"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"La luminosité préférée est très faible"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"La luminosité préférée est faible"</string>
@@ -1007,7 +1005,7 @@
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Personnalisé"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Change le fond d\'écran"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Personnalisez votre écran"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionnez un fond d\'écran dans"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner un fond d\'écran dans"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Écran de veille"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Pendant la charge ou sur une station d\'accueil"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Les deux"</string>
@@ -1017,29 +1015,28 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Désactivé"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Pour déterminer le comportement du téléphone lorsqu\'il se trouve sur une station d\'accueil ou lorsqu\'il est en veille, activez l\'écran de veille."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quand commencer"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Écran de veille actuel"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Commencer"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Paramètres"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Écran de notification entrante"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lorsque vous recevez des notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de police"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandissez ou réduisez le texte"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage de la carte SIM"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Paramètres de verrouillage SIM"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Verrouillage de la carte SIM"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Désactivé"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Verrouillé"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Verrouillage de la carte SIM"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"Bloquer la carte SIM"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Verrouiller la carte SIM"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Demander le NIP pour utiliser la tablette"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Demander le NIP pour utiliser le téléphone"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Demander le NIP pour utiliser la tablette"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Demander le NIP pour utiliser le téléphone"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Modifier le NIP de la carte SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"NIP de la carte SIM"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Bloquer la carte SIM"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Verrouiller la carte SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Débloquer la carte SIM"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Ancien NIP de la carte SIM"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Nouveau NIP de la carte SIM"</string>
@@ -1178,8 +1175,8 @@
     <string name="storage_external_title" msgid="3433462910096848696">"Mémoire de stockage externe"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> utilisé(s) sur <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
-    <string name="storage_volume_used" msgid="1303803057698959872">"Utilisé(s) sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_volume_used_total" msgid="6113121714019000244">"Utilisé(s) au total sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used" msgid="1303803057698959872">"utilisé(s) sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used_total" msgid="6113121714019000244">"utilisé(s) au total sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> est monté"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"Impossible de monter <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"<xliff:g id="NAME">%1$s</xliff:g> a été éjecté en toute sécurité"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer « <xliff:g id="NAME">^1</xliff:g> »"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Les autres fichiers comprennent les fichiers partagés enregistrés par les applications, les fichiers téléchargés d\'Internet ou par Bluetooth, les fichiers systèmes d\'Android et ainsi de suite.\n\nPour voir le contenu visible de cet appareil « <xliff:g id="NAME">^1</xliff:g> », touchez Explorer."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Le système comprend des fichiers utilisés pour faire fonctionner Android version <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Le répertoire Système comprend des fichiers utilisés pour faire fonctionner Android version <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"L\'utilisateur « <xliff:g id="USER_0">^1</xliff:g> » a peut-être enregistré des photos, de la musique, des applications et d\'autres données qui occupent <xliff:g id="SIZE">^2</xliff:g> d\'espace. \n\nPour afficher des informations détaillées, utilisez le compte d\'utilisateur « <xliff:g id="USER_1">^1</xliff:g> »."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer votre « <xliff:g id="NAME">^1</xliff:g> »"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
@@ -1280,7 +1277,7 @@
     <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 des paramètres réseau"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Réinitialisation paramètres réseau"</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>
@@ -1318,9 +1315,9 @@
     <string name="call_settings_summary" msgid="7291195704801002886">"Configurer la messagerie vocale, le transfert d\'appel, la mise en attente d\'appels, le numéro de l\'appelant"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"Partage de connexion par USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Point d\'accès Wi-Fi mobile"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Via Bluetooth"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Par Bluetooth"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Partage de connexion"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Point d\'accès et partage de connexion"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Partage de connexion"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Point d\'accès activé, partage de connexion"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Point d\'accès activé"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Partage de connexion"</string>
@@ -1333,7 +1330,7 @@
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non connecté"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Connectez-vous pour activer cette fonction"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erreur liée au partage de connexion via USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Via Bluetooth"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Par Bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Connex. Internet de la tablette part. par Bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Connex. Internet du téléph. partagée par Bluetooth"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Conn. Internet tablette. part. avec 1 appareil par Bluetooth"</string>
@@ -1367,7 +1364,7 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Position pour profil profess."</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Mode"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Haute précision"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de la batterie"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Économie de la pile"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Appareil uniquement"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Localisation désactivée"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Autor. à l\'échelle des applis"</string>
@@ -1380,11 +1377,11 @@
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utiliser le GPS, le Wi‑Fi, le Bluetooth ou les réseaux cellulaires pour déterminer la position"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utiliser le Wi‑Fi, le Bluetooth ou les réseaux cellulaires pour déterminer la position"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Utiliser le GPS pour déterminer la position"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analyse en cours…"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Recherche"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Recherche de réseaux Wi-Fi"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Améliorez la précision de la localisation en autorisant les applications et les services système à rechercher les réseaux Wi-Fi à tout moment."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Améliorer la précision de la localisation en autorisant les applications et les services système à rechercher les réseaux Wi-Fi à tout moment."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Recherche d\'appareils Bluetooth"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Améliorez la précision de la localisation en autorisant les applications et les services système à détecter les appareils Bluetooth à tout moment."</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Améliorer la précision de la localisation en autorisant les applications et les services système à détecter les appareils Bluetooth à tout moment."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Localis. via Wi-Fi et réseau mob."</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Autoriser applis à utiliser localisation Google pour estimer position plus rapidement. Infos localisation anonymes envoyées à Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Position déterminée par le Wi-Fi"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Boutique d\'applications"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Détails de l\'application"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Source de l\'application : <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Plus d\'information sur <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Fonctionnement des applications"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"En cours d\'exécution"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Jamais utilisé)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Aide des raccourcis clavier"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Afficher les raccourcis"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Par défaut"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Souris/Pavé tactile"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Vitesse du pointeur"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Manette de jeu"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Utiliser le vibreur"</string>
@@ -1717,7 +1714,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Modifier le mot"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Modifier"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Supprimer"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Votre dictionnaire personnel ne contient aucun mot. Ajoutez un mot en touchant le bouton d\'ajout (« + »)."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Votre dictionnaire personnel ne contient aucun mot. Pour ajouter un mot, touchez le bouton d\'ajout (« + »)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Pour toutes les langues"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Plus de langues…"</string>
     <string name="testing" msgid="6584352735303604146">"Tests"</string>
@@ -1759,7 +1756,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilité"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Paramètres d\'accessibilité"</string>
     <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_title" msgid="4204111425716868288">"Paramètres visuels"</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="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>
@@ -1772,14 +1769,14 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Touchez les éléments à l\'écran pour les entendre à haute voix"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Sous-titres"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Zoom"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Agrandir en touchant 3 fois l\'écran"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Agrandir en touchant 3 fois"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Agrandir avec le bouton"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Agrandir avec le bouton et en touchant trois fois"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Zoom avant sur l\'écran"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Touchez trois fois pour zoomer vers l\'avant"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Touchez un bouton pour zoomer"</string>
-    <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_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_shortcut_service_title" msgid="4779360749706905640">"Service de raccourcis"</string>
@@ -1864,7 +1861,7 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre NIP."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Étant donné que l\'activation du service <xliff:g id="SERVICE">%1$s</xliff:g> touche le chiffrement de données, vous devez confirmer votre mot de passe."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observer vos actions"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Recevoir des notifications lorsque vous interagissez avec une application"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Recevoir des notifications lorsque vous interagissez avec une application."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Arrêter <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Si vous touchez « OK », le service <xliff:g id="SERVICE">%1$s</xliff:g> sera arrêté."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Aucun service installé"</string>
@@ -1884,7 +1881,7 @@
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Ajouter des imprimantes"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Activé"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Désactivé"</string>
-    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ajouter le service"</string>
+    <string name="print_menu_item_add_service" msgid="3811645167869797802">"Ajouter un service"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Ajouter une imprimante"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Rechercher"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"Recherche d\'imprimantes en cours..."</string>
@@ -1901,7 +1898,7 @@
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"Champ de recherche affiché"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"Champ de recherche masqué"</string>
     <string name="printer_info_desc" msgid="5824995108703060003">"Plus d\'information sur cette imprimante"</string>
-    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterie"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Pile"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Répartition·de·l\'utilisation·de·la·batterie"</string>
     <string name="power_usage_not_available" msgid="3109326074656512387">"Info d\'utilisation batterie indispo"</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>
@@ -1912,18 +1909,18 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"L\'application peut fonctionner en arrière-plan lorsqu\'elle n\'est pas utilisée"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"L\'activité en arrière-plan de l\'application est limitée quand elle n\'est pas utilisée"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"L\'application n\'est pas autorisée à fonctionner en arrière-plan"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation écran depuis charge complète"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation de l\'écran depuis la charge complète"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux cellulaires"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applis depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Durée que l\'écran a été actif depuis la dernière charge complète"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Utilisation de la batterie depuis la dernière réinitialisation"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> de la batterie"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"Débranché depuis <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Batterie en charge"</string>
+    <string name="battery_stats_charging_label" msgid="4223311142875178785">"Charge en cours…"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Écran activé"</string>
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"GPS activé"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"Appareil photo actif"</string>
@@ -1936,7 +1933,7 @@
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Utilisation avancée de la pile"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Détails d\'utilisation de la pile"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Détails de l\'historique"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Utilisation de la pile"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Appareil photo"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Veille GSM"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Réseau cellulaire en veille"</string>
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
@@ -2007,16 +2004,16 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"L\'utilisation de la pile est une approximation de la consommation d\'énergie de l\'appareil; cela ne comprend pas toutes les sources qui puisent de l\'énergie. Le champ « Divers » représente la différence entre la consommation approximative calculée et la consommation réelle observée."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilisation surestimée de la pile"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Utilisée pendant %1$s"</string>
-    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisée par <xliff:g id="APP">%2$s</xliff:g>"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'utilisation totale de la pile"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Détails de l\'utilisation depuis la dernière charge complète"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Dernière charge complète"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"L\'autonomie restante de la pile est approximative et peut changer en fonction de l\'utilisation"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Durant l\'utilisation active"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Lorsqu\'elle fonctionne en arrière-plan"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Utilisation de la pile"</string>
-    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'utilisation totale de l\'application (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> de l\'utilisation totale par les applications (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Depuis la charge complète"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"Gérer l\'utilisation de la pile"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Durée restante estimée"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Paramètres de saisie et de sortie vocales"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Recherche vocale"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Clavier Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Reconnaissance vocale"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Paramètres d\'entrée vocale"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Entrée vocale"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Services d\'entrée vocale"</string>
@@ -2115,7 +2111,7 @@
     <string name="gadget_brightness_state_full" msgid="6814570109772137631">"maximale"</string>
     <string name="gadget_brightness_state_half" msgid="3696671957608774204">"moyenne"</string>
     <string name="gadget_brightness_state_off" msgid="946382262872753084">"désactivée"</string>
-    <string name="vpn_settings_title" msgid="5662579425832406705">"VPN"</string>
+    <string name="vpn_settings_title" msgid="5662579425832406705">"RPV"</string>
     <string name="credentials_title" msgid="4446234003860769883">"Stockage des identifiants"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"Installer depuis la mémoire"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"Installer à partir de la carte SD"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Impossible eff. stockage identifiants."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Stockage des identifiants activé."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Avant d\'utiliser le stockage d\'identifiants, vous devez définir un NIP ou un mot de passe pour le verrouillage d\'écran."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Applis avec accès données util."</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Applis avec accès données"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Sonnerie d\'urgence"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Définir le comportement en cas d\'appel d\'urgence"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sauvegarde"</string>
@@ -2414,7 +2410,7 @@
     <string name="vpn_turn_on" msgid="2363136869284273872">"Activer"</string>
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> n\'est pas en mesure de se connecter"</string>
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"Cette application ne prend pas en charge le RPV permanent"</string>
-    <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
+    <string name="vpn_title" msgid="6317731879966640551">"RPV"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Ajouter un profil VPN"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"Modifier le profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Supprimer le profil"</string>
@@ -2450,9 +2446,9 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"L\'identifiant suivant a été supprimé : <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Aucun authentifiant d\'utilisateur installé"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Correcteur orthographique"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Saisissez le mot de passe actuel utilisé pour les sauvegardes complètes."</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Saisissez votre mot de passe actuel pour les sauvegardes complètes."</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Saisissez votre nouveau mot de passe pour les sauvegardes complètes."</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Confirmez ici votre nouveau mot de passe de sauvegarde complète."</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Confirmez votre nouveau mot de passe pour les sauvegardes complètes."</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Définir le mot de passe de sauvegarde"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuler"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Mises à jour supplémentaires du système"</string>
@@ -2510,7 +2506,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Les profils limités ne peuvent pas ajouter de compte."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Paramètres de l\'écran de verrouillage"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter des utilisateurs à l\'écran de verrouillage"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter des utilisateurs à partir de l\'écran de verrouillage"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nouvel utilisateur"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nouveau profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vous supprimer?"</string>
@@ -2659,7 +2655,7 @@
     <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, cellulaire, utilisation des données, point d\'accès sans fil"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
-    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, diffuser, NFC"</string>
+    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Utilisateurs et comptes"</string>
@@ -2725,12 +2721,14 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Sonnerie en mode vibration"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Sonnerie en mode silencieux"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Le volume de la sonnerie est à 80 %"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume des médias"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume du contenu multimédia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume de la sonnerie"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Son de notification par défaut"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Son fourni par l\'application"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Son de notification par défaut"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Son par défaut pour l\'alarme"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibreur aussi pour les appels"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
@@ -2761,7 +2759,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Aucune interruption"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquer les troubles visuels"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquer dérangements visuels"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons du profil professionnel"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utiliser sons du profil perso"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Les sons du profil professionnel sont les mêmes que ceux du profil personnel"</string>
@@ -2779,9 +2777,9 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notifications"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Paramètres avancés"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifications professionnelles"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"Clignoter le voyant"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Faire clignoter le voyant"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"À l\'écran de verrouillage"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"N\'afficher aucune notification"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications s\'affichent?"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications de profil s\'affichent?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifications de profil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notifications"</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_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Faible : aucun son ni interruption visuelle"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Moyen : aucun son"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Élevé : émettre un son"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgent : émettre un son et s\'afficher à 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Assistant des notifications"</string>
@@ -2833,9 +2832,11 @@
     <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_on" msgid="6103704909710176555">"Oui"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Accès au mode « Ne pas déranger »"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android empêche les notifications de cette application de s\'afficher sur cet appareil"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android empêche cette catégorie de notifications de s\'afficher sur cet appareil"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Catégories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Autre"</string>
     <string name="no_channels" msgid="3077375508177744586">"Cette application n\'a publié aucune notification"</string>
@@ -2866,7 +2867,7 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminé"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Importance"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"Clignoter le voyant"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Faire clignoter le voyant"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibreur"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Son"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Supprimer"</string>
@@ -2876,7 +2877,7 @@
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Ce nom de règle est déjà utilisé"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"Ajouter"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Supprimer la règle"</string>
-    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Sélectionnez le type de règle"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Sélectionner le type de règle"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Supprimer la règle « <xliff:g id="RULE">%1$s</xliff:g> »?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"Supprimer"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Type de règle"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Désactivé"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Épinglage à l\'écran"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Lorsque ce paramètre est activé, vous pouvez épingler l’écran pour ancrer la vue.\n\nPour épingler l\'écran :\n\n1. Assurez-vous que l\'épinglage d\'écran est activé.\n\n2. Ouvrez l\'écran à épingler.\n\n3. Touchez Aperçu.\n\n4. Balayez l\'écran vers le haut, puis touchez sur l\'icône épinglage."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Lorsque ce paramètre est activé, vous pouvez épingler l’écran pour ancrer la vue.\n\nPour épingler l\'écran :\n\n1. Assurez-vous que l\'épinglage d\'écran est activé.\n\n2. Ouvrez l\'écran à épingler.\n\n3. Touchez Aperçu.\n\n4. Balayez l\'écran vers le haut, puis touchez sur l\'icône d\'épinglage."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Demander le schéma de déverrouillage avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demander le NIP avant d\'annuler l\'épinglage"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Garder l\'orientation actuelle"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Démarrage sécurisé"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuer"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du NIP avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du schéma avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du mot de passe avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre NIP avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre schéma avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Exiger un NIP pour démarrer l\'appareil"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Exiger un schéma pour démarrer l\'appareil"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Exiger un mot de passe pour démarrer l\'appareil"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Non, merci"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Non, merci"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Non, merci"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du NIP avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil. Exiger le NIP pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du schéma avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil. Exiger le schéma pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Pour améliorer la protection de cet appareil, vous pouvez exiger l\'entrée du mot de passe avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil. Exiger un mot de passe pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre NIP avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le NIP pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre schéma avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger le schéma pour démarrer l\'appareil?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en exigeant votre mot de passe avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification, ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol. Exiger un mot de passe pour démarrer l\'appareil &gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oui"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exiger le NIP?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Exiger le schéma?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Exiger le mot de passe?"</string>
@@ -3072,7 +3069,7 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Choisissez l\'entrée vocale"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Application de navigateur"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Aucun navigateur par défaut"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Application Téléphone"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Application de téléphonie"</string>
     <string name="default_app" msgid="6864503001385843060">"(Par défaut)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Système)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Valeurs par défaut du système)"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Applications dotées de l\'autorisation"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Oui"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Non"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Installer les applications inconnues"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Installer applis inconnues"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"installer des applications provenant de sources inconnues"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modifier paramètres système"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"écrire des modifications aux paramètres du système"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres du système."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Oui"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Non"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Autoriser l\'installation d\'applications"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Autorisée"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Non autorisée"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Autoriser de cette source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Pivot. poignet deux fois pour app. photo"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application de l\'appareil photo en pivotant votre poignet deux fois"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"App. 2x sur interr. pr activ. app. photo"</string>
@@ -3244,12 +3241,12 @@
     <string name="display_summary_example" msgid="9102633726811090523">"Veille après 10 minutes d\'inactivité"</string>
     <string name="memory_summary" msgid="8080825904671961872">"Mémoire utilisée en moyenne : <xliff:g id="USED_MEMORY">%1$s</xliff:g> sur <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Utilisateur actuel : <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="users_summary" msgid="1674864467098487328">"Connecté en tant que <xliff:g id="USER_NAME">%1$s</xliff:g>."</string>
+    <string name="users_summary" msgid="1674864467098487328">"Connecté en tant que <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> est l\'application par défaut"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"ACTIVÉ : <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"DÉSACTIVÉ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Sauvegardes désactivées"</string>
-    <string name="about_summary" msgid="924181828102801010">"Mise à jour vers Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
+    <string name="about_summary" msgid="924181828102801010">"Mis à jour vers Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Action interdite"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Impossible de modifier le volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Les appels sont désactivés"</string>
@@ -3289,7 +3286,7 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Pour appliquer les changements de TelephonyMonitor, redémarrez l\'appareil"</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 des données cellulaires"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Utilisation de données cellulaires"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Utilisation de données Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Utilisation de données Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3309,7 +3306,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Le suivi de consommation de données du fournisseur de services peut différer de celui de l\'appareil."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> utilisés"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Définir avertiss. util. données"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Définir avertisseur util. données"</string>
     <string name="data_warning" msgid="209133958008062117">"Avertissement consomm. données"</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>
@@ -3321,7 +3318,7 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> applications sont autorisées à ignorer les restrictions lorsque la fonction Économiseur de données est activée</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Économiseur de données"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Accès non restreint aux données"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Accès non restreint données"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Les données en arrière-plan sont désactivées"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activée"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Désactivée"</string>
@@ -3373,7 +3370,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"aucun(e)"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"L\'objet de classement est manquant."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'objet de classement ne contient pas cette touche."</string>
-    <string name="special_access" msgid="3458780842491881155">"Accès spécial à l\'application"</string>
+    <string name="special_access" msgid="3458780842491881155">"Accès spéciaux aux applis"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut utiliser les données sans restriction</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> application peuvent utiliser les données sans restriction</item>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Connecté à"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Paramètres rapides, tuiles de concepteur"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Nous sommes là pour vous aider"</string>
@@ -3458,17 +3456,17 @@
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pour ouvrir rapidement l\'appareil photo, il vous suffit d\'appuyer deux fois sur l\'interrupteur. Cela fonctionne à partir de n\'importe quel écran."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Changer d\'appareil photo"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Touchez l\'écran deux fois pour consulter votre téléphone"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Touchez deux fois pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Touchez l\'écran deux fois pour consulter votre tablette"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Touchez l\'écran deux fois pour consulter votre appareil"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Pour consulter rapidement vos notifications, touchez l\'écran deux fois."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisissez le téléphone pour consulter les notifications"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir le téléphone pour le consulter"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisissez la tablette pour consulter les notifications"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisissez l\'appareil pour consulter les notifications"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Pour consulter rapidement vos notifications, saisissez votre téléphone."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Pour consulter rapidement vos notifications, saisissez votre tablette."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Pour consulter rapidement vos notifications, saisissez votre appareil."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Balayer le lecteur d\'empreintes digitales pour ouvrir les notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Balayer lecteur d\'empreintes pour voir notif."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière du téléphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière de la tablette."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le capteur d\'empreintes digitales à l\'arrière de l\'appareil."</string>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Stockage sur la tablette"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Stockage du téléphone"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Utilisé(s) sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"utilisé(s) sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"utilisé"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Effacer les données de l\'application"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Voulez-vous supprimer cette application instantanée?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Service de remplissage automatique"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatique, remplir, remplissage automatique"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Définir <xliff:g id="APP_NAME_0">%1$s</xliff:g> comme application de remplissage automatique? <xliff:g id="APP_NAME_1">%1$s</xliff:g> pourra lire le contenu de votre écran et remplir les champs dans d\'autres applications."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assurez-vous de faire confiance à cette application&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Remplissage automatique&gt;%1$s&lt;/xliff:g&gt;utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de l\'entrée automatique."</string>
     <string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
     <string name="default_theme" msgid="7085644992078579076">"Par défaut"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 5fc746d..de93bac 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -63,7 +63,7 @@
     <item msgid="8166647333858618801">"Petite"</item>
     <item msgid="6986443533756848935">"Par défaut"</item>
     <item msgid="38373998008112077">"Grande"</item>
-    <item msgid="7635254317531872272">"La plus grande"</item>
+    <item msgid="7635254317531872272">"Très grande"</item>
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Aucune"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Aucun"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -482,8 +484,8 @@
     <item msgid="6131821495505931173">"Rouge"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
-    <item msgid="687318592238852312">"Plus de 30 jours"</item>
-    <item msgid="2900554746706302178">"Plus de 60 jours"</item>
-    <item msgid="5692284879054004388">"Plus de 90 jours"</item>
+    <item msgid="687318592238852312">"Depuis plus de 30 jours"</item>
+    <item msgid="2900554746706302178">"Depuis plus de 60 jours"</item>
+    <item msgid="5692284879054004388">"Depuis plus de 90 jours"</item>
   </string-array>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c50e1d1..a4a5344 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -78,7 +78,7 @@
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Formater la carte SD"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"Aperçu"</string>
     <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"Aperçu, page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> sur <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="font_size_summary" msgid="1690992332887488183">"Agrandissez ou réduisez le texte affiché."</string>
+    <string name="font_size_summary" msgid="1690992332887488183">"Agrandissez ou réduisez la taille du texte affiché."</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"Réduire"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"Agrandir"</string>
     <!-- no translation found for font_size_preview_text (4818424565068376732) -->
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Déconnecter ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Cela va mettre fin à votre connexion avec :&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Vous n\'êtes pas autorisé à modifier les paramètres Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible par les appareils à proximité dont le Bluetooth a été activé."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Lorsque le Bluetooth est activé, votre <xliff:g id="DEVICE_NAME">%1$s</xliff:g> est visible par les appareils à proximité."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Déconnecter l\'appareil \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Diffusion"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Désactiver le profil ?"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Comptes"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localisation"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sécurité et localisation"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Chiffrement et identifiants"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Téléphone chiffré"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Téléphone chiffré"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Préférences relatives à l\'écran de verrouillage"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Confidentialité"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Désactivé par l\'administrateur"</string>
     <string name="security_status_title" msgid="5848766673665944640">"État de la sécurité"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Verrouillage de l\'écran, empreinte digitale"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Verrouillage de l\'écran"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Empreinte digitale"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gérer empreintes num."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Utiliser empr. num. pour"</string>
@@ -446,11 +445,11 @@
     <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 une méthode alternative pour verrouiller l\'écran"</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="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>
-    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez une méthode alternative pour verrouiller l\'écran."</string>
+    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"Choisissez une méthode supplémentaire pour verrouiller l\'écran."</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"Verrouillage de l\'écran"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g>/Immédiatement après la mise en veille"</string>
     <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> après la mise en veille"</string>
@@ -648,7 +647,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Comme téléphone à haut-parleur"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pour la musique et le multimédia"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Mémoriser ces paramètres"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Diffuser"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activer l\'affichage sans fil"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Aucun appareil détecté à proximité."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Connexion en cours…"</string>
@@ -688,10 +687,11 @@
     <string name="wifi_error" msgid="3207971103917128179">"Erreur"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Bande 5 GHz non disponible dans ce pays."</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"En mode Avion"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Notification de réseau ouvert"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Notifications de réseau ouvert"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"M\'avertir lorsqu\'un réseau public de haute qualité est disponible"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activer automatiquement le Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Le Wi‑Fi est réactivé à proximité des réseaux enregistrés de haute qualité, tels que votre réseau domestique"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Indisponible, car la recherche Wi‑Fi est désactivée"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Éviter les connexions instables"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne pas utiliser de réseau Wi-Fi, sauf en cas de connexion Internet de bonne qualité"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"N\'utiliser que réseaux dotés d\'une connexion Internet stable"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurer le Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Masque de sous-réseau"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresses IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Réseaux enregistrés"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Paramètres IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Les paramètres Wi-Fi avancés ne sont pas disponibles pour cet utilisateur."</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Désactivé"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Pour contrôler le comportement du téléphone lorsqu\'il se trouve sur une station d\'accueil et/ou lorsqu\'il est en veille, activez l\'économiseur d\'écran."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quand commencer"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Économiseur d\'écran actuel"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Commencer"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Paramètres"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Soulever pour activer"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Écran des notifications reçues"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Affichage en mode Veille"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activer l\'écran lors de la réception de notifications"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Agrandir ou réduire le texte"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Système"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Explorer la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Le libellé \"Autre\" fait référence aux fichiers partagés enregistrés par les applications, aux fichiers téléchargés sur Internet ou via le Bluetooth, aux fichiers Android, etc. \n\nPour afficher l\'intégralité du contenu de la mémoire de stockage \"<xliff:g id="NAME">^1</xliff:g>\", appuyez sur \"Explorer\"."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Le système contient des fichiers servant à l\'exécution d\'Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Le système contient des fichiers servant à l\'exécution d\'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> a peut-être enregistré des photos, de la musique, des applications ou d\'autres données en utilisant <xliff:g id="SIZE">^2</xliff:g> d\'espace de stockage. \n\nPour afficher des informations, basculez vers <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Configurer la mémoire \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Utiliser en tant que mémoire de stockage externe"</string>
@@ -1354,7 +1351,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Changer d\'application pour les SMS ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application SMS ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application SMS ?"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Fournisseur d\'avis sur le réseau"</string>
+    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Fournisseur d\'évaluation état du réseau"</string>
     <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Aucun"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Changer d\'assistant Wi‑Fi ?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> pour gérer vos connexions réseau ?"</string>
@@ -1489,7 +1486,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Identique au verrouillage de l\'écran de l\'appareil"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Gérer les applications"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Gérer et supprimer les applications installées"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Infos sur l\'appli"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Infos sur les applis"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Gérer les applications, configurer des raccourcis de lancement rapide"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Paramètres des applications"</string>
     <string name="install_applications" msgid="4872012136210802181">"Sources inconnues"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Boutique"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Infos sur l\'application"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Application installée depuis la boutique <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Plus d\'informations sur <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Fonctionnement des applications"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"En cours d\'exécution"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Jamais utilisé)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Outil d\'aide pour raccourcis clavier"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Afficher les raccourcis disponibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Par défaut"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Souris/Pavé tactile"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Vitesse du pointeur"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Manette de jeu"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Utiliser le vibreur"</string>
@@ -1759,8 +1756,8 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Accessibilité"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Paramètres d\'accessibilité"</string>
     <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 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é ultérieurement dans les paramètres."</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="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>
@@ -1779,7 +1776,7 @@
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Appuyer trois fois pour zoomer"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Appuyer sur un bouton pour zoomer"</string>
     <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 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 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_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_shortcut_service_title" msgid="4779360749706905640">"Service associé au raccourci"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilisation écran depuis charge complète"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consommation d\'énergie de l\'écran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Recherche de réseaux mobiles"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Il y a <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilisation des applications depuis la charge complète (il y a <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Durée d\'activation de l\'écran depuis la charge complète"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilisation de l\'appareil depuis la charge complète"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilisation de la batterie depuis le débranchement"</string>
@@ -1936,7 +1933,7 @@
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Utilisation avancée de la batterie"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Détails d\'utilisation batterie"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Historique"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Utilisation de la batterie"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Détails d\'utilisation"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Caméra"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Veille GSM"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Réseau mobile en veille"</string>
     <string name="power_phone" msgid="5392641106474567277">"Appels vocaux"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablette inactive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Téléphone inactif"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"L\'utilisation de la batterie est une approximation de la consommation d\'énergie et n\'inclut pas toutes les sources de décharge de la batterie. La catégorie \"Autres utilisations\" représente la différence entre le calcul approximatif de la consommation d\'énergie et le niveau de décharge réel de la batterie."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consommation surestimée"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Utilisée pendant %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Temps d\'utilisation : <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilisé(s) par <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> de la batterie"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Répartition depuis la dernière charge complète"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Paramètres de saisie et de sortie vocales"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Recherche vocale"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Clavier Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Voix"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Paramètres de saisie vocale"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Saisie vocale"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Services de saisie vocale"</string>
@@ -2344,7 +2340,7 @@
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Jour du mois :"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Définir"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Définir avertissement utilisation des données"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Définir un quota d\'utilisation des données"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Définir la limite de consommation des données"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitation conso de données mobiles"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Les données mobiles sont désactivées sur votre tablette lorsque la limite de consommation des données que vous avez définie est atteinte.\n\nLa consommation mesurée par votre tablette pouvant différer de celle mesurée par votre opérateur, nous vous recommandons de définir une limite stricte."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Les données mobiles sont désactivées sur votre téléphone lorsque la limite de consommation des données que vous avez définie est atteinte.\n\nLa consommation mesurée par votre téléphone pouvant différer de celle mesurée par votre opérateur, nous vous recommandons de définir une limite stricte."</string>
@@ -2450,8 +2446,8 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"L\'identifiant suivant a été supprimé : <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>."</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Aucun identifiant de l\'utilisateur n\'est installé"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Correcteur orthographique"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Saisissez le mot de passe actuel utilisé pour les sauvegardes complètes."</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Saisissez votre nouveau mot de passe pour les sauvegardes complètes."</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Saisissez le mot de passe de sauvegarde complète actuel."</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Saisissez votre nouveau mot de passe de sauvegarde complète."</string>
     <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Confirmez ici votre nouveau mot de passe de sauvegarde complète."</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Définir le mot de passe de sauvegarde"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Annuler"</string>
@@ -2510,7 +2506,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Les profils limités ne peuvent pas ajouter de compte."</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Supp. <xliff:g id="USER_NAME">%1$s</xliff:g> de l\'appareil"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Paramètres de l\'écran de verrouillage"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter utilisateurs depuis écran de verrouillage"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ajouter des utilisateurs depuis l\'écran de verrouillage"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nouvel utilisateur"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nouveau profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Supprimer cet utilisateur ?"</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Utiliser l\'application par défaut"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Toujours"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Sauf si une autre application de paiement est ouverte"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Application à utiliser aux terminaux de paiement sans contact :"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Application à utiliser pour le paiement sans contact :"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Paiement à un terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configurez une application de paiement. Il suffit ensuite de poser l\'arrière de votre téléphone sur n\'importe quel terminal disposant du symbole Sans contact."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"OK"</string>
@@ -2570,8 +2566,8 @@
     <string name="support_summary" msgid="8276116616493882830">"Articles d\'aide, service d\'assistance par téléphone et par chat"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
-    <string name="extreme_threats_title" msgid="6549541803542968699">"Menaces extrêmes"</string>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Recevoir alertes pour menaces extrêmes aux biens et personnes"</string>
+    <string name="extreme_threats_title" msgid="6549541803542968699">"Menaces graves"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Recevoir alertes menaces graces pours les biens et personnes"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Menaces sévères"</string>
     <string name="severe_threats_summary" msgid="8848126509420177320">"Recevoir alertes pour menaces sévères aux biens et personnes"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"Alertes Enlèvement"</string>
@@ -2659,7 +2655,7 @@
     <string name="network_dashboard_title" msgid="4771589228992391573">"Réseau et Internet"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, mobile, consommation des données, point d\'accès"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Appareils connectés"</string>
-    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, caster, NFC"</string>
+    <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Applications et notifications"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Autorisations, applications par défaut"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"Utilisateurs et comptes"</string>
@@ -2731,12 +2727,14 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Son de notification par défaut"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Son fourni par l\'application"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Son de notification par défaut"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Son de l\'alarme par défaut"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer aussi pour les appels"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du numéroteur"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons du verrouillage de l\'écran"</string>
-    <string name="charging_sounds_title" msgid="1132272552057504251">"Sons relatifs à la charge"</string>
+    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de verrouillage d\'écran"</string>
+    <string name="charging_sounds_title" msgid="1132272552057504251">"Sons de rechargement"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Sons de la station d\'accueil"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Sons des touches"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Vibrer au toucher"</string>
@@ -2761,7 +2759,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alarmes uniquement"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Aucune interruption"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g> : <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquer dérangements visuels"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Bloquer nuisances visuelles"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Sons du profil professionnel"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Utiliser sons du profil perso"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Les sons des profils professionnel et personnel sont identiques"</string>
@@ -2783,7 +2781,7 @@
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sur l\'écran de verrouillage"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher tout le contenu des notifications"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"N\'afficher aucune notification"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Ne pas afficher les notifications"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications s\'affichent ?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifications"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Afficher tout contenu notificat. professionnelles"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Lorsque votre appareil est verrouillé, comment voulez-vous que les notifications du profil s\'affichent ?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifications du profil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notifications"</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_blocked" msgid="7938180808339386300">"Ne jamais afficher les notifications"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Faible importance : pas de signal sonore ni d\'interruption visuelle"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Importance moyenne : pas de signal sonore"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Haute importance : signal sonore"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgent : signal sonore et affichage à 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="6585849855452076626">"É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="default_notification_assistant" msgid="7631945224761430146">"Assistant de notifications"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloque l\'affichage des notifications de cette application sur cet appareil"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloque l\'affichage de cette catégorie de notifications sur cet appareil"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Catégories"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Autres"</string>
     <string name="no_channels" msgid="3077375508177744586">"Cette application n\'a publié aucune notification"</string>
@@ -2884,7 +2885,7 @@
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurer une règle"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Règle basée sur l\'heure"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Règle automatique pour activer le mode \"Ne pas déranger\" aux heures indiquées"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Règle de l\'événement"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Règle d\'événement"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Règle automatique pour activer le mode \"Ne pas déranger\" pendant les événements indiqués"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Durant les événements pour"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"Durant les événements pour <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
@@ -2910,7 +2911,7 @@
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Tous les messages"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Messages sélectionnés"</string>
-    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De tout le monde"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De n\'importe qui"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Des contacts uniquement"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Des contacts favoris uniquement"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Aucun"</string>
@@ -2954,11 +2955,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Désactivé"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Épinglage d\'écran"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Lorsque ce paramètre est activé, vous pouvez épingler l\'écran afin de l\'ancrer dans la vue jusqu\'à ce que vous annuliez l\'épinglage.\n\nPour épingler l\'écran, procédez comme suit :\n\n1. Assurez-vous que l\'épinglage de l\'écran est activé.\n\n2. Ouvrez l\'écran que vous voulez épingler.\n\n3. Appuyez sur \"Aperçu\".\n\n4. Balayez l\'écran vers le haut, puis appuyez sur l\'icône d\'épinglage."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Lorsque ce paramètre est activé, vous pouvez épingler l\'écran afin que le téléphone n’affiche que ce dernier jusqu\'à ce que vous annuliez l\'épinglage.\n\nPour épingler l\'écran, procédez comme suit :\n\n1. Assurez-vous que l\'épinglage de l\'écran est activé.\n\n2. Ouvrez l\'écran que vous voulez épingler.\n\n3. Appuyez sur \"Aperçu\".\n\n4. Balayez l\'écran vers le haut, puis appuyez sur l\'icône d\'épinglage."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Demander schéma de déverrouillage avant d\'annuler épinglage"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Demander PIN avant annuler épinglage"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Demander le mot de passe avant d\'annuler l\'épinglage"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Verrouiller l\'appareil lors de l\'annulation de l\'épinglage"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Verrouiller l\'appareil après l\'annulation de l\'épinglage"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Ce profil professionnel est géré par"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Géré par <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Expérimental)"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Conserver l\'orientation actuelle"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Démarrage sécurisé"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuer"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Pour améliorer la protection de cet appareil, vous pouvez exiger la saisie du code PIN avant le démarrage. Dans ce cas, l\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Pour améliorer la protection de cet appareil, vous pouvez exiger la saisie du schéma avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Pour améliorer la protection de cet appareil, vous pouvez exiger la saisie du mot de passe avant le démarrage. L\'appareil ne reçoit pas d\'appels, de messages ni de notifications, y compris les alertes, tant qu\'il n\'a pas démarré. \n\nCette fonctionnalité permet de protéger les données en cas de perte ou de vol de l\'appareil."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en demandant la saisie de votre code PIN avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en demandant la saisie de votre schéma avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Vous pouvez ajouter un niveau de protection pour le déverrouillage de cet appareil en demandant la saisie de votre mot de passe avant que l\'appareil ne démarre, en plus de la lecture de votre empreinte digitale. L\'appareil ne peut pas recevoir d\'appel, de message, de notification ni d\'alarme tant qu\'il n\'a pas démarré.\n\nCela permet de protéger les données de vos appareils en cas de perte ou de vol."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Exiger un code PIN pour démarrer l\'appareil"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Exiger un schéma pour démarrer l\'appareil"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Exiger un mot de passe pour démarrer l\'appareil"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Non, merci"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Non, merci"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Non, merci"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Pour renforcer la protection de cet appareil, vous pouvez exiger la saisie de votre code avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications ni d\'alarmes tant qu\'il n\'aura pas démarré. \n\nCela permet de protéger les données en cas de perte ou de vol de l\'appareil. Voulez-vous exiger la saisie de votre code avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Pour améliorer la protection de cet appareil, vous pouvez exiger la saisie de votre schéma avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de message, de notifications ni d\'alarmes tant qu\'il n\'aura pas démarré. \n\nCela permet de protéger les données en cas de perte ou de vol de l\'appareil. Voulez-vous exiger la saisie de votre schéma avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Pour renforcer la protection de cet appareil, vous pouvez exiger la saisie de votre mot de passe avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications ni d\'alertes tant qu\'il n\'aura pas démarré. \n\nCela permet de protéger les données en cas de perte ou de vol de l\'appareil. Voulez-vous exiger la saisie de votre mot de passe avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Outre la reconnaissance de votre empreinte digitale pour déverrouiller votre appareil, vous pouvez renforcer la sécurité en exigeant la saisie de votre code avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications, ni d\'alarmes tant qu\'il n\'aura pas démarré.\n\nCela permet de protéger les données de votre appareil en cas de perte ou de vol. Voulez-vous exiger la saisie de votre code avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Outre la reconnaissance de votre empreinte digitale pour déverrouiller votre appareil, vous pouvez renforcer la sécurité en exigeant la saisie de votre schéma avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications, ni d\'alarmes tant qu\'il n\'aura pas démarré.\n\nCela permet de protéger les données en cas de perte ou de vol de l\'appareil. Voulez-vous exiger la saisie de votre schéma avant le démarrage de votre appareil ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Outre la reconnaissance de votre empreinte digitale pour déverrouiller votre appareil, vous pouvez renforcer la sécurité en exigeant la saisie de votre mot de passe avant que l\'appareil ne démarre. De cette façon, il ne pourra pas recevoir d\'appels, de messages, de notifications, ni d\'alarmes tant qu\'il n\'aura pas démarré.\n\nCela permet de protéger les données de votre appareil en cas de perte ou de vol. Voulez-vous exiger la saisie de votre mot de passe avant le démarrage de votre appareil &gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oui"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exiger le code ?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Exiger le schéma ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Exiger le mot de passe ?"</string>
@@ -3036,7 +3033,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Personnelles"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Professionnelles"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"Applications : toutes"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applications : désactivées"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Applications désactivées"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Catégories : urgent"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Catégories : importance faible"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Catégories : désactivées"</string>
@@ -3072,11 +3069,11 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Sélectionner la saisie vocale"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Application de navigateur"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Aucun navigateur par défaut"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Application Téléphone"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Application  de téléphone"</string>
     <string name="default_app" msgid="6864503001385843060">"(Par défaut)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Système)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Paramètres par défaut)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Stockage pour les applications"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Volume occupé par appli"</string>
     <string name="usage_access" msgid="5479504953931038165">"Accès aux données d\'utilisation"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Autoriser l\'accès aux données d\'utilisation"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Préférences d\'utilisation de l\'application"</string>
@@ -3128,7 +3125,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Utiliser cet appareil en tant que MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Utiliser la connexion USB pour"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Recharge de cet appareil"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Rechargement de l\'appareil"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Alimentation"</string>
     <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>
@@ -3151,7 +3148,7 @@
     <string name="no_memory_use_summary" msgid="2016900536806235588">"Pas de mémoire utilisée au cours des trois dernières heures"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Trier par utilisation moyenne"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Trier par utilisation maximale"</string>
-    <string name="memory_performance" msgid="5661005192284103281">"Performances"</string>
+    <string name="memory_performance" msgid="5661005192284103281">"Performance"</string>
     <string name="total_memory" msgid="2017287600738630165">"Mémoire totale"</string>
     <string name="average_used" msgid="5338339266517245782">"Utilisation moyenne (%)"</string>
     <string name="free_memory" msgid="4003936141603549746">"Disponible"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Cette autorisation permet à une application de modifier les paramètres système."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oui"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Oui"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Non"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Autoriser les installations d\'applications"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Autorisé"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Non autorisé"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Autoriser cette source"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Double rotation pour l\'appareil photo"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Ouvrez l\'application Appareil photo en faisant pivoter votre poignet deux fois."</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Appuyer 2x sur Marche/Arrêt pour caméra"</string>
@@ -3229,7 +3226,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Mardi à 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Mardi à 18:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"Non connecté"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> des données sont utilisées."</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"Volume des données utilisées : <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> application</item>
       <item quantity="other">Désactivé pour <xliff:g id="COUNT">%d</xliff:g> applications</item>
@@ -3312,8 +3309,8 @@
     <string name="set_data_warning" msgid="6115364758236594593">"Définir une alerte de données"</string>
     <string name="data_warning" msgid="209133958008062117">"Avertissement conso données"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Définir une limite de données"</string>
-    <string name="data_limit" msgid="1885406964934590552">"Limite de consommation 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_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="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">
@@ -3373,7 +3370,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"aucune"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objet de classement manquant."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"L\'objet de classement ne contient pas cette touche."</string>
-    <string name="special_access" msgid="3458780842491881155">"Accès spécial des applications"</string>
+    <string name="special_access" msgid="3458780842491881155">"Accès spécifiques dans les applications"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> application peut avoir un accès non restreint aux données</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> applications peuvent avoir un accès non restreint aux données</item>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Connecté à"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Tuiles de configuration rapide pour les développeurs"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Nous sommes là pour vous aider"</string>
@@ -3454,29 +3452,29 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Gestes rapides pour contrôler votre téléphone"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Gestes rapides pour contrôler votre tablette"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Gestes rapides pour contrôler votre appareil"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accès rapide à la caméra"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Accès rapide à l\'appareil photo"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Pour accéder rapidement à l\'appareil photo, appuyez deux fois sur le bouton Marche/Arrêt. Fonctionne à partir de n\'importe quel écran."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Activation du mode selfie"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
-    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Appuyez deux fois sur le téléphone pour le consulter"</string>
+    <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Appuyer deux fois sur tél. pour le consulter"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Appuyez deux fois sur la tablette pour la consulter"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Appuyez deux fois sur l\'appareil pour le consulter"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Pour vérifier rapidement vos notifications, appuyez deux fois sur l\'écran."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisissez votre téléphone pour le consulter"</string>
-    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisissez votre tablette pour la consulter"</string>
-    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisissez votre appareil pour le consulter"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Saisir le téléphone pour le consulter"</string>
+    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Saisir la tablette pour la consulter"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Saisir l\'appareil pour le consulter"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Pour vérifier rapidement vos notifications, saisissez votre téléphone."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Pour vérifier rapidement vos notifications, saisissez votre tablette."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Pour vérifier rapidement vos notifications, saisissez votre appareil."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Balayer le lecteur d\'empreintes digitales pour ouvrir les notifications"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Balayer lecteur d\'empreintes pour voir notif."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière du téléphone."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière de la tablette."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Pour consulter vos notifications, passez votre doigt de haut en bas sur le lecteur d\'empreinte digitale à l\'arrière de l\'appareil."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Geste d\'assistance"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilité"</string>
-    <string name="gesture_setting_on" msgid="3455094265233870280">"Activés"</string>
-    <string name="gesture_setting_off" msgid="5230169535435881894">"Désactivés"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"Activé"</string>
+    <string name="gesture_setting_off" msgid="5230169535435881894">"Désactivé"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Bootloader déjà déverrouillé"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Connectez-vous tout d\'abord à Internet."</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"Connectez-vous à Internet ou contactez votre opérateur."</string>
@@ -3488,7 +3486,7 @@
     <string name="instant_apps_account" msgid="1433620209791992528">"Compte pour les 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 appartenant à <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="account_for_section_header" msgid="5356566418548737121">"Comptes pour <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="configure_section_header" msgid="7391183586410814450">"Configurer"</string>
     <string name="auto_sync_account_title" msgid="898796354710116383">"Synchronisation automatique des données"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Synchronisation automatique des données personnelles"</string>
@@ -3569,7 +3567,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"Autres applications"</string>
     <string name="storage_files" msgid="8581083146777364063">"Fichiers"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Stockage sur la tablette"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Espace stockage téléphone"</string>
+    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Stockage du téléphone"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Utilisés sur <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"utilisés"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(désactivé pour l\'utilisateur <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Service de saisie automatique"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatique, saisie, saisie automatique"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Définir <xliff:g id="APP_NAME_0">%1$s</xliff:g> en tant qu\'application de saisie automatique ? <xliff:g id="APP_NAME_1">%1$s</xliff:g> pourra lire votre écran et remplir les champs dans d\'autres applications"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Assurez-vous de faire confiance à cette application&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; utilise les éléments affichés à l\'écran pour déterminer les champs qui peuvent bénéficier de la saisie automatique."</string>
     <string name="device_theme" msgid="4571803018917608588">"Thème de l\'appareil"</string>
     <string name="default_theme" msgid="7085644992078579076">"Par défaut"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestionnaire d\'espace de stockage : <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 9a31208..9cd177a 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ningún"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ningún"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -240,7 +242,7 @@
   <string-array name="app_ops_categories">
     <item msgid="6358963769537892925">"Localización"</item>
     <item msgid="255608127647030286">"Persoal"</item>
-    <item msgid="4588829735729884491">"Mensaxería"</item>
+    <item msgid="4588829735729884491">"Mensaxaría"</item>
     <item msgid="886742181977884584">"Multimedia"</item>
     <item msgid="7924928667052300589">"Dispositivo"</item>
   </string-array>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 2d5a9f0..3c2bde7 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -215,7 +215,7 @@
     <string name="oem_radio_info_label" msgid="6163141792477958941">"Información/configuración específica de OEM"</string>
     <string name="band_mode_title" msgid="4071411679019296568">"Definir modo de banda de radio"</string>
     <string name="band_mode_loading" msgid="3555063585133586152">"Cargando lista de bandas…"</string>
-    <string name="band_mode_set" msgid="5730560180249458484">"Configurar"</string>
+    <string name="band_mode_set" msgid="5730560180249458484">"Establecer"</string>
     <string name="band_mode_failed" msgid="1495968863884716379">"Incorrecto"</string>
     <string name="band_mode_succeeded" msgid="2701016190055887575">"Correcto"</string>
     <string name="sdcard_changes_instructions" msgid="4482324130377280131">"Os cambios terán efecto cando volvas conectar o cable USB."</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localización"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Seguranza e localización"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptación e credenciais"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Teléfono encriptado"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferencias da pantalla de bloqueo"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Teléfono encriptado"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Axustes da pantalla de bloqueo"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Define A miña localización, o desbloqueo da pantalla, o bloqueo da tarxeta SIM e o bloqueo do almacenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Define A miña localización, o desbloqueo da pantalla e o bloqueo do almacenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacidade"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Desactivado polo administrador"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Estado da seguranza"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueo da pantalla, impresión dixital"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueo da pantalla"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impresión dixital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Xest. identificación"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar identificac. para"</string>
@@ -361,7 +360,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Omitir"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"+ Impresión dixital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Engadir impr. dixital"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen esta tableta en caso de perda, roubo ou borrado dos datos."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este dispositivo en caso de perda, roubo ou borrado dos datos."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Non se activarán as funcións de protección do dispositivo. Non poderás impedir que outras persoas utilicen este teléfono en caso de perda, roubo ou borrado dos datos."</string>
@@ -570,7 +569,7 @@
     <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>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplicacións de administración de dispositivos"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Apps de xestión do dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Non hai aplicacións activas"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplicacións activas</item>
@@ -624,7 +623,7 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Desincronizar"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Desconectar e desincronizar"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Opcións..."</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Avanzada"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Config. avanzada"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Bluetooth avanzado"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Co Bluetooth activado, o dispositivo pode comunicarse con outros dispositivos Bluetooth próximos."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Para mellorar a precisión da localización, as aplicacións do sistema e os servizos aínda poden detectar dispositivos Bluetooth. Podes cambiar esta opción na <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>configuración de busca<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notifica cando unha rede pública de alta calidade estea dispoñible"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activar a wifi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"A wifi volverase activar preto de redes de alta calidade gardadas, como a túa rede doméstica"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Non está dispoñible porque a busca de redes wifi está desactivada"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexións deficientes"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Non utilizar unha rede wifi se non ten unha boa conexión a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Usa só redes que teñan unha boa conexión a Internet"</string>
@@ -721,7 +721,7 @@
     <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"Introdución do PIN WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Explorar"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Avanzada"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"Config. avanzada"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"Configurar"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar coa rede"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"Lembrar rede"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar wifi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de subrede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Enderezos IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Redes gardadas"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configuración IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"A configuración avanzada da wifi non está dispoñible para este usuario"</string>
@@ -847,16 +845,16 @@
     <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 interactiva wifi portátil"</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_checkbox_text_summary" msgid="5347703013899354452">"Usa a conexión móbil para a rede wifi"</string>
     <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Non se comparte a conexión a Internet da tableta por zona wifi"</string>
     <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Non se comparte a conexión a Internet do teléfono por zona wifi"</string>
-    <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona interactiva..."</string>
-    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona interactiva..."</string>
+    <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona wifi..."</string>
+    <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona wifi..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> está activa"</string>
-    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Erro na zona interactiva wifi portátil"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar zona interactiva wifi"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Erro na zona wifi portátil"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Configurar zona wifi"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Configuración da zona wifi"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"Zona wifi AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"Zona wifi <xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
@@ -962,7 +960,7 @@
     <string name="brightness" msgid="8480105032417444275">"Nivel de brillo"</string>
     <string name="brightness_title" msgid="5746272622112982836">"Brillo"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Axusta o brillo da pantalla"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo adaptable"</string>
+    <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiza o nivel de brillo en función da luz dispoñible"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Desactivado"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"O brillo preferido é moi baixo"</string>
@@ -1017,17 +1015,16 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desactivado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar o que sucederá cando o teléfono estea ancorado ou en modo de suspensión, activa o protector de pantalla."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Cando comezar"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Protector de pantalla actual"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar agora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configuración"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para acender"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Pantalla notificación entrante"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Pantalla ambiente"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activa a pantalla cando recibes notificacións"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamaño do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Reduce ou amplía o texto"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo da tarxeta SIM"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo da SIM"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Bloqueo da tarxeta SIM"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Desactivado"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Bloqueada"</string>
@@ -1280,7 +1277,7 @@
     <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">"Restablecemento da configuración da rede"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Restablecer configuración de rede"</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>
@@ -1316,24 +1313,24 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Agarda..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Configuración de chamada"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Configura o correo de voz, o desvío de chamadas, a chamada en espera e o identificador de chamada"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Ancoraxe de USB"</string>
-    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona interactiva portátil"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Ancoraxe de Bluetooth"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Ancoraxe á rede"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Zona wifi e conexión compartida"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Conexión compart. por USB"</string>
+    <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Zona wifi portátil"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Conexión por Bluetooth"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Conexión compartida"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Zona wifi e conex. compartida"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Zona wifi e conexión compartida activadas"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Zona wifi activada"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Conexión compartida activada"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Non se pode compartir a conexión nin utilizar zonas wifi portátiles mentres o economizador de datos estea activado"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"Ancoraxe de USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, sen ancoraxe á rede"</string>
-    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Ancorado á rede"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Non se pode facer a ancoraxe á rede se o almacenamento USB está en uso"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Compartir conexión por USB"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB conectado, sen conexión compartida"</string>
+    <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Conexión compartida"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Non se pode compartir a conexión se o almacenamento USB está en uso"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB non conectado"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Conectar para activar"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erro de ancoraxe de USB"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Ancoraxe de Bluetooth"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Erro de conexión compartida por USB"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Conexión por Bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Compartindo a conexión da tableta por Bluetooth"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Compartindo a conexión do teléfono por Bluetooth"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Compartindo conex. da tableta cun dispositivo por Bluetooth"</string>
@@ -1343,9 +1340,9 @@
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Compartindo conexión a Internet de <xliff:g id="DEVICE_NAME">%1$d</xliff:g> por Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Non se comparte a conexión da tableta por Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Non se comparte a conexión do teléfono por Bluetooth"</string>
-    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Non ancorado"</string>
-    <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Non se poden ancorar á rede máis de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
-    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Desactivarase a ancoraxe a rede de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
+    <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Conexión non compartida"</string>
+    <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Non se pode compartir a conexión con máis de <xliff:g id="MAXCONNECTION">%1$d</xliff:g> dispositivos"</string>
+    <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Desactivarase a conexión compartida de <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="tethering_footer_info" msgid="7287131664937054043">"Utiliza a zona wifi e a conexión compartida para proporcionar Internet a outros dispositivos mediante a túa conexión de datos móbiles."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Axuda"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Rede de telefonía móbil"</string>
@@ -1380,10 +1377,10 @@
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Utiliza o GPS, a wifi, o Bluetooth ou as redes de telefonía móbil para determinar a localización"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Utiliza a wifi, o Bluetooth ou as redes de telefonía móbil para determinar a localización"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Usa o GPS para determinar a localización"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Analizando"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Busca por wifi"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Busca de conexións"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Busca de redes wifi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Mellora a localización permitindo que as aplicacións do sistema e os servizos detecten redes wifi en calquera momento."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Busca por Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Busca de dispositivos Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Mellora a localización permitindo que as aplicacións do sistema e os servizos detecten dispositivos Bluetooth en calquera momento."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Situación rede móbil e wifi"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Permite usar o servizo de localización para calcular a localización rápido. Recompilaranse datos anónimos e enviaranse a Google."</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"Non se poden instalar actualizacións do sistema en soportes externos."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Non se pode instalar a aplicación do administrador do dispositivo en soportes externos"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Queres forzar a parada?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Se forzas a parada dunha aplicación, é posible que se comporte incorrectamente."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Se forzas a parada dunha aplicación, é posible que non funcione correctamente."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Non se puido mover a aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Localización de instalación preferida"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Tenda"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalles da aplicación"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"A aplicación instalouse desde <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Máis información en <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacións das aplicacións"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Activa"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca utilizada)"</string>
@@ -1676,7 +1674,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Configuración do teclado físico"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Preme a tecla Espazo dúas veces para inserir \".\""</string>
     <string name="show_password" msgid="4837897357002495384">"Mostrar contrasinais"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Mostra caracteres brevemente mentres escribes"</string>
+    <string name="show_password_summary" msgid="3365397574784829969">"Mostra os caracteres brevemente mentres escribes"</string>
     <string name="spellchecker_security_warning" msgid="9060897418527708922">"É posible que este corrector ortográfico recolla todo o texto que escribes, incluídos datos persoais como contrasinais e números de tarxetas de crédito. Provén da aplicación <xliff:g id="SPELLCHECKER_APPLICATION_NAME">%1$s</xliff:g>. Queres usar este corrector ortográfico?"</string>
     <string name="spellchecker_quick_settings" msgid="246728645150092058">"Configuración"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Idioma"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Asistente de atallos de teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostra os atallos dispoñibles"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predeterminado"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Rato/rato táctil"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do punteiro"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Mando do xogo"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibrador"</string>
@@ -1775,14 +1772,14 @@
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Ampliar ao tocar tres veces"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Ampliar co botón"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Amplía co botón e co triplo toque"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Achega a pantalla"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Aumenta o zoom na pantalla"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Toca 3 veces para achegar o zoom"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Toca un botón para achegar o zoom"</string>
     <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_shortcut_service_title" msgid="4779360749706905640">"Servizo de atallos"</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_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Texto de alto contraste"</string>
@@ -1792,11 +1789,11 @@
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Punteiro do rato grande"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio en mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combina canles ao reproducir audio"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Atraso de pulsación prolongada"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Retardo de pulsación prolongada"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inversión da cor"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Pode afectar ao rendemento"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Facer clic despois de que o punteiro deixe e moverse"</string>
-    <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"Tempo antes de facer clic"</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>
@@ -1823,8 +1820,8 @@
       <item quantity="one">Atraso moi longo (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Configuración"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activada"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivada"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Activado"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Desactivado"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"Vista previa"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Opcións estándar"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"Idioma"</string>
@@ -1864,7 +1861,7 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"É necesario que confirmes o teu PIN xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"É necesario que confirmes o teu contrasinal xa que a activación de <xliff:g id="SERVICE">%1$s</xliff:g> afecta ao cifrado de datos."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Observar as túas accións"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Recibir notificacións cando interactúas cunha aplicación."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Recibe notificacións cando interactúas cunha aplicación."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Queres deter <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Ao tocar Aceptar deterase <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ningún servizo instalado"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da pantalla desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da pantalla"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Busca da rede de telefonía móbil"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Hai <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso da aplicación desde a carga completa (hai <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Hai <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso de apps desde a carga completa (hai <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o que a pantalla estivo activada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da batería desde que se desconectou"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Cámara"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wifi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Modo de espera de cela"</string>
+    <string name="power_cell" msgid="3392999761958982492">"A rede de telefonía móbil está en modo de espera"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableta inactiva"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Teléfono inactivo"</string>
@@ -1979,7 +1976,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Uso de enerxía computado"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Uso de enerxía observado"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"Forzar a parada"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"Información da aplicación"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"Información de aplicacións"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Configuración da aplicación"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Configuración da pantalla"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Configuración da wifi"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"O uso da batería é unha aproximación do uso de enerxía e non inclúe todas as fontes de consumo de batería. Variado indica a diferenza entre o uso de enerxía aproximado computado e o consumo real que se observa na batería."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Reconto excesivo do uso de enerxía"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Tempo de uso da batería: %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Tempo de utilización: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da batería total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Análise detallada desde a última carga completa"</string>
@@ -2077,9 +2074,8 @@
     <string name="menu_proc_stats_type_cached" msgid="5084272779786820693">"Almacenado na caché"</string>
     <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada e saída de voz"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración da entrada e saída de voz"</string>
-    <string name="voice_search_settings_title" msgid="2775469246913196536">"Busca de voz"</string>
+    <string name="voice_search_settings_title" msgid="2775469246913196536">"Busca por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Voz"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Configuración da entrada de voz"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Entrada de voz"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Servizos de entrada de voz"</string>
@@ -2088,7 +2084,7 @@
     <string name="voice_interaction_security_warning" msgid="6378608263983737325">"Este servizo de entrada de voz poderá supervisar que a voz sempre estea activada e controlar as aplicacións compatibles coa voz no teu nome. Procede da aplicación <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g>. Queres activar o uso deste servizo?"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"Motor preferido"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"Configuración do motor"</string>
-    <string name="tts_sliders_title" msgid="992059150784095263">"Velocidade da voz e ton"</string>
+    <string name="tts_sliders_title" msgid="992059150784095263">"Velocidade da fala e ton"</string>
     <string name="tts_engine_section_title" msgid="6289240207677024034">"Motor"</string>
     <string name="tts_install_voice_title" msgid="6275828614052514320">"Voces"</string>
     <string name="tts_spoken_language" msgid="5542499183472504027">"Idioma falado"</string>
@@ -2127,7 +2123,7 @@
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
     <string name="user_credentials" msgid="3719013347787187083">"Credenciais do usuario"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"Ver e modificar credenciais almacenadas"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avanzada"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"Configuración avanzada"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de almacenamento"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Almacenado en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Só software"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Imposible borrar almacen. credenciais"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Almacen. credenciais activado"</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Tes que definir un PIN ou un contrasinal de pantalla de bloqueo para poder utilizar o almacenamento de credenciais."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Aplicacións con acceso de uso"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apps con acceso de uso"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton de emerxencia"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Define o comportamento cando se realiza unha chamada de emerxencia"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Copia de seguranza"</string>
@@ -2154,7 +2150,7 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos persoais"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Realizar copia de seguranza dos meus datos"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Crea unha copia de seguranza dos datos da aplicación, dos contrasinais da wifi e doutras configuracións en servidores de Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Conta secundaria"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Conta de copia seguranza"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Incluír datos de aplicacións"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Cando volvas instalar unha aplicación, restaura a configuración e os datos dos que fixeches unha copia de seguranza"</string>
@@ -2165,17 +2161,17 @@
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Queres deixar de crear copias de seguranza dos datos do dispositivo (como os contrasinais wifi e o historial de chamadas) e dos datos das aplicacións (como a configuración e os ficheiros almacenados polas aplicacións), e borrar todas as copias presentes nos servidores remotos?"</string>
     <string name="fullbackup_data_summary" msgid="960850365007767734">"Crea automaticamente copias de seguranza dos datos do dispositivo de forma remota, como os contrasinais wifi e o historial de chamadas, e dos datos das aplicacións, como a configuración e os ficheiros almacenados polas aplicacións.\n\nAo activar a copia de seguranza automática, os datos do dispositivo e das aplicacións gárdanse periodicamente de forma remota. Os datos das aplicacións poden ser os datos que gardou unha aplicación segundo a configuración do programador, incluídos os datos potencialmente sensibles, como os contactos, as mensaxes e as fotos."</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"Configuración do administrador de dispositivos"</string>
-    <string name="active_device_admin_msg" msgid="578748451637360192">"Aplicación de administración de dispositivos"</string>
-    <string name="remove_device_admin" msgid="9207368982033308173">"Desactivar esta aplicación de administración de dispositivos"</string>
+    <string name="active_device_admin_msg" msgid="578748451637360192">"Aplicación de xestión do dispositivo"</string>
+    <string name="remove_device_admin" msgid="9207368982033308173">"Desactivar esta aplicación de xestión do dispositivo"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Desinstalar aplicación"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Desactivar e desinstalar"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplicacións de administración de dispositivos"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Apps de xestión do dispositivo"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Non hai ningunha aplicación de administración de dispositivos dispoñible"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Persoal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Traballo"</string>
     <string name="no_trust_agents" msgid="7450273545568977523">"Non hai ningún axente de confianza dispoñible"</string>
     <string name="add_device_admin_msg" msgid="1501847129819382149">"Activar aplicación de administración de dispositivos?"</string>
-    <string name="add_device_admin" msgid="4192055385312215731">"Activar esta aplicación de administración de dispositivos"</string>
+    <string name="add_device_admin" msgid="4192055385312215731">"Activar esta aplicación de xestión do dispositivo"</string>
     <string name="device_admin_add_title" msgid="3140663753671809044">"Administrador de dispositivos"</string>
     <string name="device_admin_warning" msgid="7482834776510188134">"A activación desta aplicación de administrador permitirá á aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> levar a cabo as seguintes operacións:"</string>
     <string name="device_admin_status" msgid="7234814785374977990">"Esta aplicación de administrador está activa e permite á aplicación <xliff:g id="APP_NAME">%1$s</xliff:g> levar a cabo as seguintes operacións:"</string>
@@ -2335,19 +2331,19 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Restrinxir os datos en segundo plano?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"É posible que esta función provoque que unha aplicación que dependa dos datos en segundo plano deixe de funcionar cando só estean dispoñibles redes móbiles.\n\nPodes atopar controis de uso de datos máis adecuados na configuración dispoñible na aplicación."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"A restrición de datos en segundo plano só é posible se estableciches un límite de datos móbiles."</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar auto-sincronización?"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Activar autosincronización?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente na túa tableta.\n\nÉ posible que algunhas contas tamén copien automaticamente na web os cambios que efectúas na tableta. As contas de Google funcionan desta forma."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Todos os cambios que efectúes nas túas contas na web copiaranse automaticamente no teu teléfono.\n\nÉ posible que algunhas contas tamén copien automaticamente na web os cambios que efectúas no teléfono. As contas de Google funcionan desta forma."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desactivar auto-sincronización?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto aforrará datos e uso da batería, pero precisas sincronizar cada conta manualmente para recompilar información recente. Non recibirás notificacións cando se efectúen actualizacións."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Desactivar autosincronización?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Isto aforrará datos e uso da batería, pero terás que sincronizar cada conta manualmente para recompilar a información recente e non recibirás notificacións cando se efectúen actualizacións."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Data de restablecemento do ciclo de uso"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Data de cada mes:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Configurar"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Establecer"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Definir advertencia de uso de datos"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Definir límite de uso de datos"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Limitación do uso de datos"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Desactivaranse os datos móbiles na tableta en canto se acade o límite que estableciches.\n\nPosto que a tableta mide o uso de datos, e que o teu operador pode dar conta dun uso diferente, pensa na posibilidade de definir un límite conservador."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Desactivaranse os datos móbiles no teléfono en canto se acade o límite que estableciches.\n\nPosto que o teléfono mide o uso de datos, e que o teu operador pode dar conta dun uso diferente, pensa na posibilidade de definir un límite conservador."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Desactivaranse os datos móbiles na tableta unha vez que se acade o límite que estableciches.\n\nPosto que a tableta mide o uso de datos e que posiblemente o teu operador contabilice o uso de forma diferente, considera a posibilidade de configurar un límite conservador."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Desactivaranse os datos móbiles no teléfono unha vez que se acade o límite que estableciches.\n\nPosto que o teléfono mide o uso de datos e que posiblemente o teu operador contabilice o uso de forma diferente, considera a posibilidade de configurar un límite conservador."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Restrinxir datos en segundo plano?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Se restrinxes os datos móbiles en segundo plano, algunhas aplicacións e servizos non funcionarán se non estás conectado a unha wifi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Se restrinxes os datos móbiles en segundo plano, algunhas aplicacións e servizos non funcionarán se non estás conectado a unha wifi.\n\nTodos os usuarios desta tableta se verán afectados por esta opción de configuración."</string>
@@ -2450,10 +2446,10 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Credencial eliminada: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Non se instalaron as credenciais do usuario"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Corrector ortográfico"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Escribe o teu contrasinal secundario completo actual aquí"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Escribe aquí o contrasinal actual da copia de seguranza completa"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Escribe un contrasinal novo para copias de seguranza completas"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Volve escribir o teu contrasinal secundario completo aquí"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir contrasinal secundario"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Volve escribir aquí o novo contrasinal da copia de seguranza completa"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Definir contrasinal"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Cancelar"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizacións do sistema"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Desactivado"</string>
@@ -2584,7 +2580,7 @@
     <skip />
     <string name="cell_broadcast_settings" msgid="2451014351355183338">"Emisións de emerxencia"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Operadores de rede"</string>
-    <string name="access_point_names" msgid="1381602020438634481">"Nomes do punto de acceso"</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>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Usar datos de LTE para mellorar a voz e as comunicacións (recomendado)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"Tipo de rede preferido"</string>
@@ -2669,7 +2665,7 @@
     <string name="search_menu" msgid="6283419262313758339">"Configuración de busca"</string>
     <string name="query_hint_text" msgid="3350700807437473939">"Configuración de busca"</string>
     <string name="keywords_wifi" msgid="1395786161993828719">"wifi, wi-fi, rede, conexión"</string>
-    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensaxe de texto, mensaxes de texto, mensaxes, mensaxería"</string>
+    <string name="keywords_more_default_sms_app" msgid="2265154063220360784">"mensaxe de texto, mensaxes de texto, mensaxes, mensaxaría"</string>
     <string name="keywords_more_mobile_networks" msgid="8995946622054642367">"móbil, operador móbil, sen fíos, datos, 4g, 3g, 2g, lte"</string>
     <string name="keywords_wifi_calling" msgid="1784064367330122679">"wifi, wi-fi, chamada, chamando"</string>
     <string name="keywords_home" msgid="3626170808219458848">"iniciador"</string>
@@ -2725,18 +2721,20 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Timbre en modo vibración"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Timbre en modo silencio"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volume do timbre ao 80 %"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume de ficheiros multimedia"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume dos ficheiros multimedia"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume da alarma"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do timbre"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificacións"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ton de chamada do teléfono"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Son de notificación predeterminado"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Son fornecido pola aplicación"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Son de notificación predeterminado"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Son de alarma predeterminado"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar tamén nas chamadas"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons do teclado de marcación"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de bloqueo da pantalla"</string>
-    <string name="charging_sounds_title" msgid="1132272552057504251">"Carga de sons"</string>
+    <string name="charging_sounds_title" msgid="1132272552057504251">"Sons de carga"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Sons de ancoraxe"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Sons táctiles"</string>
     <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Vibrar ao tocar"</string>
@@ -2753,7 +2751,7 @@
       <item quantity="one">1 norma automática activada</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Preferencias de Non molestar"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Só permite prioridade"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioridade: só se permite"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Normas automáticas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Definir normas de Non molestar"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limita sons e vibracións en certos momentos"</string>
@@ -2777,7 +2775,7 @@
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"Tons de chamada"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Outros sons e vibracións"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"Notificacións"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"Avanzada"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"Configuración avanzada"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notificacións do traballo"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luz intermitente"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na pantalla de bloqueo"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Cando o teu dispositivo estea bloqueado, como queres que se mostren as notificacións do perfil?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificacións do perfil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificació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_blocked" msgid="7938180808339386300">"Non mostra nunca as notificacións"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Baixa: nin son nin interrupción visual"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Media: ningún son"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Alta: emitir son"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urxente: emitir son e aparecer 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Asistente de notificacións"</string>
@@ -2815,7 +2814,7 @@
     <string name="no_notification_listeners" msgid="3487091564454192821">"Ningunha aplicación instalada solicitou o acceso ás notificacións."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Queres permitir que <xliff:g id="SERVICE">%1$s</xliff:g> teña acceso ás notificacións?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificacións, incluída a información persoal, coma os nomes dos contactos e o texto das mensaxes que recibas. Tamén poderá ignorar notificacións ou activar os botóns de acción que conteñan. \n\nAdemais, poderá activar ou desactivar o modo Non molestar e cambiar a configuración asociada."</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Se desactivas o acceso de <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ás notificacións, é posible que tamén se desactive o acceso do modo Non molestar."</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Se desactivas o acceso de <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ás notificacións, é posible que tamén se desactive o acceso en modo Non molestar."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Desactivar"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Cancelar"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"Servizos do asistente de RV"</string>
@@ -2833,9 +2832,11 @@
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Permite que esta aplicación cree unha ventá de imaxe 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_on" msgid="6103704909710176555">"Si"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Non"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Acceso de Non molestar"</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"Ningunha aplicación instalada solicitou acceso de Non molestar"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bloquea a visualización de notificacións desta aplicación neste dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bloquea a visualización de notificacións desta categoría neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorías"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outro"</string>
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicación non emitiu notificacións"</string>
@@ -2913,7 +2914,7 @@
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"De calquera persoa"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Só dos contactos"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Só dos contactos marcados con estrela"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ningún"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ningunha"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Alarmas"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Recordatorios"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Eventos"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Permanecer na orientación actual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicio seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Podes protexer aínda máis este dispositivo requirindo o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non poderá recibir chamadas, mensaxes nin notificacións, incluídas as alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Podes protexer aínda máis este dispositivo requirindo o teu padrón antes de inicialo. Ata que o dispositivo se inicie, non poderá recibir chamadas, mensaxes nin notificacións, incluídas as alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Podes protexer aínda máis este dispositivo requirindo o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non poderá recibir chamadas, mensaxes nin notificacións, incluídas as alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, nin notificacións, incluídas as alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu padrón antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, nin notificacións, incluídas as alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, nin notificacións, incluídas as alarmas.\n\nDeste xeito, axúdache a protexer os datos en caso de perda ou roubo dos dispositivos."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Requirir PIN para iniciar o dispositivo"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Requirir padrón para iniciar o dispositivo"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Requirir contrasinal para iniciar o dispositivo"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Non, grazas"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Non, grazas"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Non, grazas"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Podes protexer aínda máis este dispositivo solicitando o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tampouco alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un padrón para iniciar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Podes protexer aínda máis este dispositivo solicitando o teu padrón antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tampouco alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un padrón para iniciar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Podes protexer aínda máis este dispositivo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tampouco alarmas. \n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un contrasinal para iniciar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu PIN antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tampouco alarmas.\n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un padrón para iniciar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu padrón antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tampouco alarmas.\n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un padrón para iniciar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ademais de usar a túa impresión dixital para desbloquear o dispositivo, tamén podes protexelo solicitando o teu contrasinal antes de inicialo. Ata que o dispositivo se inicie, non pode recibir chamadas, mensaxes, notificacións, nin tampouco alarmas.\n\nEsta acción axudará a protexer os datos en dispositivos perdidos ou roubados. Queres solicitar un contrasinal para iniciar o dispositivo?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Si"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Non"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Requirir PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Requirir padrón?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Requirir contrasinal?"</string>
@@ -2992,7 +2989,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Información relativa de IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Rañura<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Abrir de forma predeterminada"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Abrindo ligazóns"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Apertura de ligazóns"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Abrir ligazóns compatibles"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Abrir sen preguntar"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Ligazóns compatibles"</string>
@@ -3041,15 +3038,15 @@
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Categorías: relevancia baixa"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Categorías: desactivadas"</string>
     <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"Categorías: anula Non molestar"</string>
-    <string name="advanced_apps" msgid="4812975097124803873">"Avanzada"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"Configuración avanzada"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Configurar aplicacións"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Aplicación descoñecida"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Permisos de aplicacións"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Aplicacións que usan <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Tocar para activar"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Toca dúas veces en calquera parte da pantalla para activar o dispositivo"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Abrindo ligazóns"</string>
-    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Non abrir aplicacións compatibles"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Apertura de ligazóns"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Non abre ligazóns compatibles"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Abrir <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Abre <xliff:g id="DOMAIN">%s</xliff:g> e outros URL"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Non hai ningunha aplicación que poida abrir ligazóns compatibles"</string>
@@ -3057,9 +3054,9 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacións que poden abrir ligazóns compatibles</item>
       <item quantity="one">Unha aplicación que pode abrir ligazóns compatibles</item>
     </plurals>
-    <string name="app_link_open_always" msgid="2474058700623948148">"Abrir nesta aplicación"</string>
+    <string name="app_link_open_always" msgid="2474058700623948148">"Abre nesta aplicación"</string>
     <string name="app_link_open_ask" msgid="7800878430190575991">"Preguntar sempre"</string>
-    <string name="app_link_open_never" msgid="3407647600352398543">"Non abrir nesta aplicación"</string>
+    <string name="app_link_open_never" msgid="3407647600352398543">"Non abre nesta aplicación"</string>
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Non se recoñece"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Predeterminado"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Predeterminado para o traballo"</string>
@@ -3076,8 +3073,8 @@
     <string name="default_app" msgid="6864503001385843060">"(Predeterminada)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Opción predeterminada do sistema)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Almacenamento de aplicacións"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Acceso ao uso"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Almacenamento de apps"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Acceso a datos de uso"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Permitir acceso ao uso"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferencias de uso da aplicación"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"O acceso ao uso permite que unha aplicación realice un seguimento das demais aplicacións que usas e de con que frecuencia as utilizas, así como do teu operador, da configuración do idioma e doutros detalles."</string>
@@ -3141,7 +3138,7 @@
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Permitir que a aplicación do asistente acceda á imaxe da pantalla"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Facer pestanexar a pantalla"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Facer pestanexar os bordos da pantalla cando a aplicación do asistente accede ao texto desde a pantalla ou a captura de pantalla"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"As aplicacións do asistente pódente axudar segundo a información que aparece en pantalla. Algunhas aplicacións son compatibles tanto cos servizos de entrada de voz como co launcher para proporcionarche unha asistencia integrada."</string>
+    <string name="assist_footer" msgid="1982791172085896864">"As aplicacións do asistente pódente axudar en función da información que apareza na pantalla en cada momento. Algunhas aplicacións son compatibles tanto cos servizos de entrada de voz como co launcher para proporcionarche unha asistencia integrada."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Uso medio da memoria"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Uso máximo da memoria"</string>
     <string name="memory_usage" msgid="1781358557214390033">"Uso da memoria"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicacións con permiso"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Si"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Non"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Instalar aplicacións descoñecidas"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Instalar apps descoñecidas"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalar aplicacións fontes descoñecidas"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modificar configuración"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"editar ou modificar axustes do sistema"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Con este permiso unha aplicación pode modificar a configuración do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Si"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Non"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Si"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Non"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Permitir instalacións de aplicacións"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Permitida"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Non permitida"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Permitir desde esta fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dobre xiro para abrir a cámara"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Xira o pulso dúas veces para abrir a aplicación da cámara"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Botón de acendido dúas veces para cámara"</string>
@@ -3245,11 +3242,11 @@
     <string name="memory_summary" msgid="8080825904671961872">"Uso medio da memoria: <xliff:g id="USED_MEMORY">%1$s</xliff:g> de <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Usuario actual: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="users_summary" msgid="1674864467098487328">"Iniciaches sesión como <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="payment_summary" msgid="3472482669588561110">"Axuste predeterminado: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+    <string name="payment_summary" msgid="3472482669588561110">"Aplicación predeterminada: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"ACTIVADA/<xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"DESACTIVADA"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Desactivouse a función de copia de seguranza"</string>
-    <string name="about_summary" msgid="924181828102801010">"Actualizouse á versión <xliff:g id="VERSION">%1$s</xliff:g> de Android"</string>
+    <string name="about_summary" msgid="924181828102801010">"Actualizouse a Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Acción non permitida"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Non se pode cambiar o volume"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"As chamadas saíntes non están permitidas"</string>
@@ -3321,7 +3318,7 @@
       <item quantity="one">1 aplicación pode usar datos sen restricións cando o Economizador de datos está activado</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Economizador de datos"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Acceso a datos sen restricións"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Datos sen restricións"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Desactiváronse os datos en segundo plano"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Activado"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Desactivado"</string>
@@ -3378,8 +3375,8 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> aplicacións poden usar datos sen restricións</item>
       <item quantity="one">1 aplicación pode usar datos sen restricións</item>
     </plurals>
-    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Queres borrar realmente os datos de usuario e convertelos na encriptación baseada en ficheiros?"</string>
-    <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Borrar e converter"</string>
+    <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Seguro que queres limpar os datos de usuario e cambiar á encriptación baseada en ficheiros?"</string>
+    <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>
@@ -3392,7 +3389,8 @@
     <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 mensaxes premium"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Non é visible para outros dispositivos"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Conectado a"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos para programadores de configuración rápida"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Se precisas axuda, conta connosco"</string>
@@ -3462,13 +3460,13 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tocar dúas veces para consultar a tableta"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tocar dúas veces para consultar o dispositivo"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Toca dúas veces a pantalla para consultar rapidamente as notificacións."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Levantar o teléfono para consultalo"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Alzar teléfono para consultalo"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Levantar a tableta para consultala"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Levantar o dispositivo para consultalo"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Colle o teléfono para consultar rapidamente as notificacións."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Para consultar rapidamente as notificacións, levanta o teléfono."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Colle a tableta para consultar rapidamente as notificacións."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Colle o dispositivo para consultar rapidamente as notificacións."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Pasar a impresión dixital para consultar notificacións"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Pasar o dedo para ver notificacións"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do teléfono."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira da tableta."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Para consultar as notificacións, pasa o dedo cara abaixo sobre o sensor de impresión dixital situado na parte traseira do dispositivo."</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desactivado polo usuario <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servizo de autocompletar"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, completar, autocompletar"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Queres que a aplicación <xliff:g id="APP_NAME_0">%1$s</xliff:g> sexa a encargada do proceso de autocompletar? A aplicación <xliff:g id="APP_NAME_1">%1$s</xliff:g> poderá ler a túa pantalla e completar os campos noutras aplicacións."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Asegúrate de que confías nesta aplicación&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autocompletar de Google&gt;%1$s&lt;/xliff:g&gt; utiliza o contido da pantalla para determinar o que se pode completar."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predeterminado"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Xestor de almacenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index cf328c5..bad1b55 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"કોઈ નહીં"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"કોઈ નહીં"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 5dae10d..06411e8 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"એકાઉન્ટ્સ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"સ્થાન"</string>
     <string name="account_settings_title" msgid="626177544686329806">"એકાઉન્ટ્સ"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"સુરક્ષા અને સ્થાન"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"એન્ક્રિપ્શન અને ઓળખપત્રો"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ફોન એન્ક્રિપ્ટ કર્યો"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ફોન એન્ક્રિપ્ટ કર્યો"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"લૉક સ્ક્રીન પસંદગીઓ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"મારું સ્થાન, સ્ક્રીન અનલૉક, SIM કાર્ડ લૉક, ઓળખપત્ર સંગ્રહ લૉક સેટ કરો"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"મારું સ્થાન, સ્ક્રીન અનલૉક, ઓળખપત્ર સંગ્રહ લૉક સેટ કરો"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ગોપનીયતા"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"વ્યવસ્થાપકે અક્ષમ કરેલ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"સુરક્ષાની સ્થિતિ"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"ફિંગરપ્રિન્ટનું સંચાલન"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"આ માટે ફિંગરપ્રિન્ટ ઉપયોગ"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"અનુપલબ્ધ છે કારણ કે Wi-Fi સ્કેનિંગ બંધ છે"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"સબનેટ માસ્ક"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 સરનામા"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"સાચવેલા નેટવર્ક્સ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP સેટિંગ્સ"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"આ વપરાશકર્તા માટે Wi‑Fi વિગતવાર સેટિંગ્સ ઉપલબ્ધ નથી"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"બંધ"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ફોન ડૉક થાય અને/અથવા નિષ્ક્રિય થઈ જાય ત્યારે શું થાય તેને નિયંત્રિત કરવા માટે, સ્ક્રીન સેવર ચાલુ કરો."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ક્યારે શરૂ કરવું"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"વર્તમાન સ્ક્રીન સેવર"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"હવે પ્રારંભ કરો"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"સેટિંગ્સ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"સ્વચલિત તેજ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"જાગૃત કરવા માટે લિફ્ટ કરો"</string>
-    <string name="doze_title" msgid="5389406335828323273">"ઇનકમિંગ સૂચના સ્ક્રીન"</string>
+    <string name="doze_title" msgid="2259176504273878294">"વ્યાપક ડિસ્પ્લે"</string>
     <string name="doze_summary" msgid="3846219936142814032">"જ્યારે તમને સૂચનાઓ પ્રાપ્ત થાય ત્યારે સ્ક્રીન સક્રિય કરો"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ફોન્ટનું કદ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ટેક્સ્ટને નાની અથવા મોટી કરો"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ક્યારેય ઉપયોગમાં ન લેવાયેલ)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"કીબોર્ડ શૉર્ટકટ્સ સહાયક"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ઉપલબ્ધ શૉર્ટકટ્સ પ્રદર્શિત કરો"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ડિફોલ્ટ"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"માઉસ/ટ્રેકપેડ"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"પૉઇન્ટરની ગતિ"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"રમત નિયંત્રક"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"વાઇબ્રેટરનો ઉપયોગ કરો"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"સંપૂર્ણ ચાર્જ કર્યાં પછી સ્ક્રીન વપરાશ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"સ્ક્રીન દ્વારા વપરાશ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"મોબાઇલ નેટવર્ક સ્કૅન કરવામાં"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> પહેલાં"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"સંપૂર્ણ ચાર્જ પછી ઍપ્લિકેશન વપરાશ (<xliff:g id="TIME">%1$s</xliff:g> પહેલાં)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> પહેલાં"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"સંપૂર્ણ ચાર્જ પછી ઍપ્લિકેશન વપરાશ (<xliff:g id="TIME">^1</xliff:g> પહેલાં)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"સંપૂર્ણ ચાર્જ પછી સ્ક્રીન ચાલુ રહેવાનો સમયગાળો"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"સંપૂર્ણ ચાર્જ પછી ઉપકરણ વપરાશ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"અનપ્લગ થયું ત્યારથી બૅટરી ઉપયોગ"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"કૅમેરો"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"સેલ સ્ટેન્ડબાય"</string>
+    <string name="power_cell" msgid="3392999761958982492">"મોબાઇલ નેટવર્ક સ્ટૅન્ડબાય"</string>
     <string name="power_phone" msgid="5392641106474567277">"વૉઇસ કૉલ્સ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ટેબ્લેટ નિષ્ક્રિય"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ફોન નિષ્ક્રિય"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"બૅટરી ઉપયોગ એ પાવર ઉપયોગનો એક અંદાજ છે અને બૅટરી ડ્રેઇનના દરેક સ્ત્રોતનો સમાવેશ કરતું નથી. પરચૂરણ એ ગણતરી કરેલ અંદાજિત પાવર ઉપયોગ અને બૅટરી પર અવલોકન કરેલા વાસ્તવિક ડ્રેઇન વચ્ચેનો તફાવત છે."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"વધુ-ગણાયેલ પાવર ઉપયોગ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s સુધી વપરાઈ"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> સુધી ઉપયોગ કરાયો"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> દ્વારા <xliff:g id="PERCENT">%1$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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"વોઇસ ઇનપુટ અને આઉટપુટ સેટિંગ્સ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"વૉઇસ શોધ"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android કીબોર્ડ"</string>
-    <string name="voice_category" msgid="1430370497125803904">"વાણી"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"વોઇસ ઇનપુટ સેટિંગ્સ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"વોઇસ ઇનપુટ"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"વૉઇસ ઇનપુટ સેવાઓ"</string>
@@ -2146,7 +2142,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">"તમે ઓળખપત્ર સંગ્રહનો ઉપયોગ કરી શકો છો તે પહેલાં તમારે લૉક સ્ક્રીન PIN કે પાસવર્ડ સેટ કરવો પડશે."</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>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"સૂચના વૉલ્યૂમ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ફોન રિંગટોન"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ડિફૉલ્ટ સૂચના માટે ધ્વનિ"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ઍપ્લિકેશને અવાજ પૂરો પાડ્યો"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"ડિફૉલ્ટ સૂચનાનો ધ્વનિ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ડિફૉલ્ટ એલાર્મ ધ્વનિ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"કૉલ્સ માટે પણ વાઇબ્રેટ કરો"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"અન્ય ધ્વનિઓ"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"સૂચનાઓ ક્યારેય બતાવશો નહીં"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"નિમ્ન: કોઈ ધ્વનિ અથવા વિઝ્યુલ અવરોધ નથી"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"મધ્યમ: કોઈ ધ્વનિ નથી"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ઉચ્ચ: ધ્વનિ કરો"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"તાત્કાલિક: ધ્વનિ કરો અને સ્ક્રીન પર હાઇલાઇટ કરો"</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="6585849855452076626">"ધ્વનિની મંજૂરી આપો"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"વર્તમાન સ્ક્રીન પર દૃશ્યમાં આ સૂચનાઓને અવાજ કરવા, વાઇબ્રેટ કરવા કે ઝબકારારૂપે દેખાવા દેશો નહીં."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"સૂચના સહાયક"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ખલેલ પાડશો નહીં ઍક્સેસ કરો"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"કોઇ ઇન્સ્ટોલ કરેલ એપ્લિકેશન્સએ ખલેલ પાડશો નહીં ઍક્સેસ કરવાની વિનંતી કરી નથી"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ઍપ્લિકેશનો લોડ કરી રહ્યું છે..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"આ ઍપ્લિકેશનની સૂચના આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"આ કૅટેગરીની સૂચના આ ઉપકરણ પર પ્રદર્શિત થતા Android અવરોધિત કરી રહ્યું છે"</string>
     <string name="notification_channels" msgid="5346841743182627500">"કૅટેગરીઓ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"અન્ય"</string>
     <string name="no_channels" msgid="3077375508177744586">"આ ઍપ્લિએક્શને કોઈ સૂચનાઓ પોસ્ટ કરી નથી"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"વર્તમાન ઓરિએન્ટેશનમાં રહો"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"સુરક્ષિત પ્રારંભ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ચાલુ રાખો"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"તમે આ ઉપકરણને તેને તે પ્રારંભ થાય તે પહેલાં તમારા PIN ની જરૂરિયાત દ્વારા આગળ સુરક્ષિત કરી શકો છો. ઉપકરણ પ્રારંભ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ્સ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણોનાં ખોવાઈ જવા અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"તમે આ ઉપકરણને તેને તે પ્રારંભ થાય તે પહેલાં તમારી પેટર્નની જરૂરિયાત દ્વારા આગળ સુરક્ષિત કરી શકો છો. ઉપકરણ પ્રારંભ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ્સ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણોનાં ખોવાઈ જવા અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"તમે આ ઉપકરણને તેને તે પ્રારંભ થાય તે પહેલાં તમારા પાસવર્ડની જરૂરિયાત દ્વારા આગળ સુરક્ષિત કરી શકો છો. ઉપકરણ પ્રારંભ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ્સ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શક્તું નથી. \n\nઆ ઉપકરણોનાં ખોવાઈ જવાં અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણને પ્રારંભ થાય તે પહેલાં તમારા PIN ની જરૂરિયાત દ્વારા વધારે સુરક્ષિત કરી શકો છો. ઉપકરણ પ્રારંભ ન થાય ત્યાં સુધી, તે એલાર્મ્સ સહિત કૉલ્સ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણોના ખોવાઈ જવા કે ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણને તેને તે પ્રારંભ થાય તે પહેલાં તમારા પેટર્નની જરૂરિયાત દ્વારા આગળ સુરક્ષિત કરી શકો છો. ઉપકરણ પ્રારંભ ન થાય ત્યાં સુધી, તે એલાર્મ્સ સહિત કૉલ્સ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણોના ખોવાઈ જવા કે ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણને તેને તે પ્રારંભ થાય તે પહેલાં તમારા પાસવર્ડની જરૂરિયાત દ્વારા આગળ સુરક્ષિત કરી શકો છો. ઉપકરણ પ્રારંભ ન થાય ત્યાં સુધી, તે એલાર્મ્સ સહિત કૉલ્સ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણોના ખોવાઈ જવા કે ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"ઉપકરણ શરૂ કરવા માટે PIN ની જરૂર છે"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"ઉપકરણ પ્રારંભ કરવા માટે પેટર્નની જરૂર છે"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"ઉપકરણ શરૂ કરવા માટે પાસવર્ડની જરૂર છે"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"નહીં આભાર"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"નહીં આભાર"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"નહીં આભાર"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારો પિન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણો ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. તમારું ઉપકરણ શરૂ કરવા માટે પિન આવશ્યક છે?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારી પેટર્ન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી.\n\nઆ ઉપકરણો ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પેટર્ન આવશ્યક છે?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારો પાસવર્ડ આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણો ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પાસવર્ડ આવશ્યક છે?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણને તે પ્રારંભ થાય તે પહેલાં તમારા પિન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી. \n\nઆ ઉપકરણોના ખોવાઈ જવા કે ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પિન આવશ્યક છે?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારી પેટર્ન આવશ્યક બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી.\n\nઆ ઉપકરણો ખોવાઈ અથવા ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પેટર્ન આવશ્યક છે?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"તમારા ઉપકરણને અનલૉક કરવા માટે તમારી ફિંગરપ્રિન્ટનો ઉપયોગ કરવા ઉપરાંત, તમે આ ઉપકરણ શરૂ થાય તે પહેલા તમારા પાસવર્ડને જરૂરી બનાવીને તેને વધુ સુરક્ષિત કરી શકો છો. ઉપકરણ શરૂ ન થાય ત્યાં સુધી, તે એલાર્મ સહિત કૉલ, સંદેશા અથવા સૂચનાઓ પ્રાપ્ત કરી શકતું નથી.\n\nઆ ઉપકરણો ખોવાઈ જવા કે ચોરાઈ જવા પર ડેટા સુરક્ષિત કરવામાં સહાય કરે છે. શું તમારું ઉપકરણ શરૂ કરવા માટે પાસવર્ડ આવશ્યક છે&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"હા"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"નહીં"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ની જરૂર છે?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"પેટર્ન જરૂરી છે?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"પાસવર્ડ આવશ્યક છે?"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"હા"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"નહીં"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"ઍપ્લિકેશન ઇન્સ્ટૉલ કરવાની મંજૂરી આપો"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"મંજૂરી છે"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"મંજૂરી નથી"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"કૅમેરા માટે બે વખત પાવર બટન દબાવો"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"થી કનેક્ટ કરેલ છે"</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>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(વપરાશકર્તા <xliff:g id="USER">%s</xliff:g> માટે અક્ષમ કરેલ)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"સ્વતઃભરણ સેવા"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"સ્વતઃ, ભરો, સ્વતઃભરણ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"તમારી <xliff:g id="APP_NAME_0">%1$s</xliff:g> ઍપ્લિકેશનને સ્વતઃભરણ બનાવીએ? <xliff:g id="APP_NAME_1">%1$s</xliff:g> તમારી સ્ક્રીનને વાંચીને બીજી ઍપ્લિકેશનોની ફીલ્ડ આપમેળે ભરશે."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ખાતરી કરો કે તમે આ ઍપ્લિકેશનનો વિશ્વાસ કરો છો&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google આપમેળે&gt;%1$s&lt;/xliff:g&gt; તમારી સ્ક્રીન પર શું છે તેનો ઉપયોગ એ નક્કી કરવા કરે છે કે આપમેળે શું દાખલ થશે."</string>
     <string name="device_theme" msgid="4571803018917608588">"ઉપકરણની થીમ"</string>
     <string name="default_theme" msgid="7085644992078579076">"ડિફૉલ્ટ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"સ્ટોરેજ સંચાલક: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 0066f77..cfd28a1 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"कोई नहीं"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"कोई नहीं"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 73b84d8..751cfda 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -294,10 +294,10 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"दिनांक और समय"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"दिनांक और समय सेट करें"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"दिनांक, समय, समय क्षेत्र और प्रारूप सेट करें"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"स्‍वचालित दिनांक और समय"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"ऑटोमैटिक दिनांक और समय"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"नेटवर्क-प्रदत्त समय का उपयोग करें"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"नेटवर्क-प्रदत्त समय का उपयोग करें"</string>
-    <string name="zone_auto" msgid="334783869352026648">"स्‍वचालित समय क्षेत्र"</string>
+    <string name="zone_auto" msgid="334783869352026648">"ऑटोमैटिक समय क्षेत्र"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"नेटवर्क द्वारा प्रदान किए गये समय क्षेत्र का उपयोग करें"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"नेटवर्क द्वारा प्रदान किए गये समय क्षेत्र का उपयोग करें"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24‑घंटा प्रारूप"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाते"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाते"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"सुरक्षा और स्‍थान"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"एन्क्रिप्शन और क्रेडेंशियल"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"फ़ोन एन्क्रिप्ट किया गया है"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फ़ोन एन्क्रिप्ट किया गया है"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"लॉक स्क्रीन प्राथमिकताएं"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"मेरा स्‍थान, स्‍क्रीन अनलॉक, सिम कार्ड लॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्‍थान, स्‍क्रीन अनलॉक, प्रमाणिकता मेमोरी लॉक सेट करें"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"निजता"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"व्यवस्थापक ने अक्षम किया है"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षा स्थिति"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"फ़िंगरप्रिंट प्रबंधित करें"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"इनके हेतु फ़िंगरप्रिंट उपयोग करें"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"बढ़िया इंटरनेट देने वाला सार्वजनिक नेटवर्क मिलने पर बताएं"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"वाई-फ़ाई अपने आप चालू करें"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"वाई-फ़ाई बढ़िया इंटरनेट देने वाले सहेजे गए नेटवर्क के पास होने पर अपने आप चालू  हो जाएगा, जैसे कि आपके घर का नेटवर्क"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"अनुपलब्ध है क्योंकि वाई-फ़ाई स्कैनिंग बंद कर दी गई है"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्‍शन से बचें"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"जब तक वाई-फ़ाई  नेटवर्क में अच्छा इंटरनेट कनेक्‍शन न हो, तब तक उसका उपयोग न करें"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"उन्हीं नेटवर्क का उपयोग करें जिनमें अच्छा इंटरनेट कनेक्शन है"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"वाई-फ़ाई कॉन्‍फ़िगर करें"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पता"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP पता"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 पते"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"सहेजे गए नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP सेटिंग"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"वाई-फ़ाई की उन्नत सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
@@ -908,7 +906,7 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"साधारण नोटिफिकेशन ध्वनी"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
-    <string name="notification_volume_title" msgid="2012640760341080408">"नोटिफिकेशन"</string>
+    <string name="notification_volume_title" msgid="2012640760341080408">"नोटिफ़िकेशन"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"नोटिफिकेशन के लिए इनकमिंग कॉल वॉल्‍यूम का उपयोग करें"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"कार्य प्रोफ़ाइल का समर्थन नहीं करता है"</string>
     <string name="notification_sound_dialog_title" msgid="3805140135741385667">"साधारण नोटिफिकेशन ध्वनी"</string>
@@ -923,7 +921,7 @@
     <string name="audio_record_proc_title" msgid="4271091199976457534">"शोर रद्दीकरण"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"संगीत, वीडियो,गेमऔर अन्‍य मीडिया"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"रिंगटोन और नोटिफिकेशन"</string>
-    <string name="volume_notification_description" msgid="5810902320215328321">"नोटिफिकेशन"</string>
+    <string name="volume_notification_description" msgid="5810902320215328321">"नोटिफ़िकेशन"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"अलार्म"</string>
     <string name="volume_ring_mute" msgid="3018992671608737202">"रिंगटोन और नोटिफिकेशन म्‍यूट करें"</string>
     <string name="volume_media_mute" msgid="3399059928695998166">"संगीत और अन्‍य मीडिया म्‍यूट करें"</string>
@@ -999,7 +997,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"कभी भी अपने आप बंद नहीं होगा."</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> बजे अपने आप बंद हो जाएगा."</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"सूर्योदय होने पर अपने आप बंद हो जाएगा."</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"प्रयोग में नहीं"</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="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बंद"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"फ़ोन के डॉक रहते समय और/या उपयोग में नहीं होने पर जो भी होता है, उसे नियंत्रित करने के लिए स्क्रीन सेवर चालू करें."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"कब शुरू करना है"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"अभी वाला स्क्रीन सेवर"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"अब शुरू करें"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"अपनेआप स्क्रीन की रोशनी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करने के लिए उठाएं"</string>
-    <string name="doze_title" msgid="5389406335828323273">"इनकमिंग नोटिफ़िकेशन स्क्रीन"</string>
+    <string name="doze_title" msgid="2259176504273878294">"परिवेशी प्रदर्शन"</string>
     <string name="doze_summary" msgid="3846219936142814032">"आपको नोटिफ़िकेशन मिलने पर स्‍क्रीन सक्रिय करें"</string>
     <string name="title_font_size" msgid="4405544325522105222">"अक्षरों का आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"लेख को छोटा या बड़ा करें"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"सिस्‍टम के बारे में नई जानकारी बाहरी मीडिया से नहीं हटाया जा सकता."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"डिवाइस व्यवस्थापक ऐप्लिकेशन को बाहरी मीडिया पर इंस्टॉल नहीं किया जा सकता"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"बलपूर्वक रोकें?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"यदि आप किसी ऐप्स को बलपूर्वक रोकते हैं, तो यह गलत व्यवहार कर सकता है."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"अगर आप किसी ऐप को बलपूर्वक रोकते हैं, तो यह गलत व्यवहार कर सकता है."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ऐप्स  नहीं ले जाया जा सका. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"पसंदीदा इंस्‍टॉल स्‍थान"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(कभी उपयोग नहीं किया)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"कीबोर्ड शॉर्टकट सहायक"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"उपलब्ध शॉर्टकट दिखाएं"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"डिफ़ॉल्ट"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"माउस/ट्रैकपैड"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"सूचक गति"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"गेमनियंत्रक"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"कंपनकर्ता का उपयोग करें"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"पूरी चार्ज होने के बाद से अब तक स्क्रीन उपयोग"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन के लिए खपत"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कैनिंग"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> पहले"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"पूरी तरह से चार्ज होने के बाद से अब तक का ऐप्लिकेशन उपयोग (<xliff:g id="TIME">%1$s</xliff:g> पहले)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पहले"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"पूरी तरह से चार्ज होने के बाद से अब तक का ऐप्लिकेशन उपयोग (<xliff:g id="TIME">^1</xliff:g> पहले)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"पिछली बार पूरी तरह चार्ज होने के बाद से अब तक स्क्रीन के चालू रहने का समय"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"पिछली बार पूरी चार्ज होने के बाद से अब तक का डिवाइस उपयोग"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्‍लग होने के बाद से बैटरी का उपयोग"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"कैमरा"</string>
     <string name="power_wifi" msgid="1135085252964054957">"वाई-फ़ाई"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटूथ"</string>
-    <string name="power_cell" msgid="6596471490976003056">"सेल स्‍टैंडबाय"</string>
+    <string name="power_cell" msgid="3392999761958982492">"मोबाइल नेटवर्क स्टैंडबाय"</string>
     <string name="power_phone" msgid="5392641106474567277">"ध्‍वनि कॉल"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"टेबलेट निष्‍क्रिय"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"फ़ोन निष्‍क्रिय"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"बैटरी का उपयोग पावर का अनुमानित उपयोग है और इसमें बैटरी की खपत करने वाला प्रत्येक स्रोत शामिल नहीं है. विविध, पावर के परिकलित अनुमानित उपयोग और बैटरी पर देखी गई वास्तविक खपत के बीच का अंतर है."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"पावर का अत्यधिक उपयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s के लिए उपयोग किया गया"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> के लिए उपयोग किया गया"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$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_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_detail_foreground" msgid="3350401514602032183">"जब सक्रिय उपयोग में हो"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ध्‍वनि इनपुट और आउटपुट सेटिंग"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"बोलकर खोजें"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android कीबोर्ड"</string>
-    <string name="voice_category" msgid="1430370497125803904">"बोली"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"ध्वनि इनपुट सेटिंग"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ध्‍वनि इनपुट"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"ध्वनि इनपुट सेवाएं"</string>
@@ -2335,11 +2331,11 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"पृष्ठभूमि डेटा प्रतिबंधित करें?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"यह सुविधा केवल मोबाइल नेटवर्क उपलब्ध होने पर उस एप्ल‍िकेशन को कार्य करने से रोक सकती है जो पृष्ठभूमि डेटा पर निर्भर है.\n\nआपको एप्ल‍िकेशन में उपलब्ध सेटिंग में अधिक उपयुक्त डेटा उपयोग नियंत्रण मिल सकते हैं."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"बैकग्राउंड डेटा प्रतिबंधित करना तभी संभव है जब आपने कोई नेटवर्क डेटा सीमा सेट की हुई हो."</string>
-    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"अपने आप डेटा समन्वयन चालू करें?"</string>
+    <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"अपने आप डेटा सिंक चालू करें?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"आपके द्वारा वेब पर अपने खातों में किए जाने वाले किसी भी बदलाव की प्रतिलिपि आपके टेबलेट में अपने आप बन जाएगी.\n\nकुछ खाते आपके द्वारा टेबलेट पर किए जाने वाले किसी भी बदलाव की प्रतिलिपि वेब पर भी बना सकते हैं. Google खाता इसी तरह काम करता है."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"आपके द्वारा वेब पर अपने खातों में किए जाने वाले किसी भी बदलाव की प्रतिलिपि आपके फ़ोन में अपने आप बन जाएगी.\n\nकुछ खाते आपके द्वारा फ़ोन पर किए जाने वाले किसी भी बदलाव की प्रतिलिपि वेब पर भी बना सकते हैं. Google खाता इसी तरह काम करता है."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"अपने आप डेटा समन्वयन बंद करें?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"यह डेटा और बैटरी उपयोग को संरक्षित करेगा, किन्‍तु हाल की जानकारी एकत्रित करने के लिए आपको प्रत्‍येक खाते का समन्‍वयन मैन्‍युअल रूप से करना होगा. और जब नई जानकारी मिलेगा तो आपको नोटिफिकेशन प्राप्‍त नहीं होगी."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"अपने आप डेटा सिंक बंद करें?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"यह डेटा और बैटरी उपयोग को संरक्षित करेगा, लेकिन हाल की जानकारी इकट्ठा करने के लिए आपको हर खाते का सिंक मैन्‍युअल रूप से करना होगा. और जब नई जानकारी मिलेगी तो आपको नोटिफ़िकेशन नहीं आएगा."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"उपयोग चक्र रीसेट दिनांक"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"प्रत्येक माह का दिनांक:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"सेट करें"</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"डिफ़ॉल्ट का उपयोग करें"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"हमेशा"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"सिवाय तब जब दूसरा भुगतान ऐप खुला हो"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"किसी टैप करें और भुगतान करें टर्मिनल पर, इससे भुगतान करें:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"टैप करें और भुगतान करें टर्मिनल पर, इससे भुगतान करें:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"टर्मिनल पर भुगतान करना"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"भुगतान ऐप सेट करें. फिर बस अपने फ़ोन के पिछले भाग को संपर्क-रहित प्रतीक वाले किसी टर्मिनल की ओर रखकर पकड़ें."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"समझ लिया"</string>
@@ -2588,7 +2584,7 @@
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"उन्नत 4G LTE मोड"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ध्वनि और संचारों को उन्नत बनाने के लिए LTE डेटा का उपयोग करें (सुझाए गए)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"पसंदीदा नेटवर्क प्रकार"</string>
-    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (सुझाए गए)"</string>
+    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (सुझाया गया)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"कार्यस्थल सिम"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"ऐप्स और सामग्री की एक्सेस"</string>
     <string name="user_rename" msgid="8523499513614655279">"नाम बदलें"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"नोटिफिकेशन वॉल्‍यूम"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"डिफ़ॉल्ट नोटिफ़िकेशन ध्वनि"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ऐप की ओर से दी जाने वाली ध्वनि"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"डिफ़ॉल्ट नोटिफ़िकेशन ध्वनि"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"डिफ़ॉल्ट अलार्म ध्वनि"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल के लिए भी कंपन"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनियां"</string>
@@ -2783,7 +2781,7 @@
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"लॉक स्क्रीन पर"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी नोटिफिकेशन सामग्री दिखाएं"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील नोटिफिकेशन सामग्री छिपाएं"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"नोटिफिकेशन बिल्कुल ना दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"नोटिफ़िकेशन बिल्कुल ना दिखाएं"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"जब आपका डिवाइस लॉक हो, तो आप नोटिफिकेशन को किस प्रकार दिखाया जाना चाहेंगे?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"नोटिफिकेशन"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"सभी कार्य नोटिफ़िकेशन सामग्री दिखाएं"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"नोटिफ़िकेशन कभी ना दिखाएं"</string>
@@ -2799,14 +2798,14 @@
     <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_min_summary" msgid="8233873580287975662">"कम: कोई ध्वनि या विज़ुअल रुकावट नहीं"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"मध्यम: कोई ध्वनि नहीं"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"उच्च: ध्वनि करें"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"तुरंत: ध्वनि करें और स्क्रीन पर पॉप करें"</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="6585849855452076626">"ध्वनि की अनुमति दें"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"वर्तमान स्क्रीन पर इन नोटिफिकेशन के लिए ना तो ध्वनि करें, ना कंपन करें और ना ही झलक दिखाएं."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"नोटिफिकेशन सहायक"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"एक्सेस नोटिफिकेशन"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"एक्सेस नोटिफ़िकेशन"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप्स  नोटिफिकेशन नहीं पढ़ सकते"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d ऐप्‍स नोटिफिकेशन पढ़ सकते हैं</item>
@@ -2833,9 +2832,11 @@
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"इस ऐप्लिकेशन के खुले होने पर या आप उसे छोड़ दें, उसके बाद (उदाहरण के लिए, कोई वीडियो देखते रहने के लिए), उसे एक तस्वीर-में-तस्वीर विंडो बनाने दें. यह विंडो उन दूसरे ऐप्लिकेशन के ऊपर दिखाई देती है जिनका आप उपयोग कर रहे हैं."</string>
     <string name="picture_in_picture_on" msgid="6103704909710176555">"हां"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"नहीं"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"परेशान ना करें ऐक्सेस"</string>
+    <string name="manage_zen_access_title" msgid="2611116122628520522">"परेशान ना करें एक्सेस"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"इंस्टॉल किए गए किसी भी ऐप द्वारा परेशान ना करें ऐक्सेस का अनुरोध नहीं किया है"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android इस ऐप्लिकेशन के नोटिफ़िकेशन को इस डिवाइस पर दिखाई देने से अवरुद्ध कर रहा है"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android नोटिफ़िकेशन की इस श्रेणी को इस डिवाइस पर दिखाई देने से अवरुद्ध कर रहा है"</string>
     <string name="notification_channels" msgid="5346841743182627500">"श्रेणियां"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
     <string name="no_channels" msgid="3077375508177744586">"इस ऐप्लिकेशन ने कोई भी नोटिफ़िकेशन पोस्ट नहीं किया है"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"बंद"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"स्क्रीन पिन करना"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"सेटिंग चालू होने पर, आप अनपिन करने तक वर्तमान स्क्रीन दृश्य में बनाए रखने हेतु स्क्रीन पिन करना उपयोग कर सकते हैं.\n\nस्क्रीन पिन करना उपयोग करने हेतु:\n\n1. सुनिश्चित करें कि स्क्रीन पिन करना चालू है.\n\n2. वह स्क्रीन खोलें जिसे आप पिन करना चाहते हैं.\n\n3. अवलोकन टैप करें.\n\n4. ऊपर स्वाइप करें फिर पिन आइकन टैप करें."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"यह सेटिंग चालू होने पर, आप अनपिन करने तक वर्तमान स्क्रीन को दृश्य में बनाए रखने के लिए स्क्रीन पिन करना उपयोग कर सकते हैं.\n\nस्क्रीन पिन करना उपयोग करने हेतु:\n\n1. सुनिश्चित करें कि स्क्रीन पिन करना चालू है.\n\n2. वह स्क्रीन खोलें जिसे आप पिन करना चाहते हैं.\n\n3. अवलोकन टैप करें.\n\n4. ऊपर स्वाइप करें फिर पिन आइकन टैप करें."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"अनपिन करने से पहले अनलॉक पैटर्न के लिए पूछें"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करने से पहले पिन के लिए पूछें"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करने से पहले पासवर्ड के लिए पूछें"</string>
@@ -2962,25 +2963,21 @@
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"यह कार्य प्रोफ़ाइल इनके द्वारा प्रबंधित की जाती है:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> द्वारा प्रबंधित"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(प्रायोगिक)"</string>
-    <string name="display_auto_rotate_title" msgid="7119684966039069439">"डिवाइस का घुमाव"</string>
+    <string name="display_auto_rotate_title" msgid="7119684966039069439">"डिवाइस को घुमाना"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"स्क्रीन की सामग्री को घुमाएं"</string>
     <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"पोर्ट्रेट दृश्य में बने रहें"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"भू-दृश्य में बने रहें"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिविन्यास में बने रहें"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"सुरक्षित स्‍टार्ट-अप"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"जारी रखें"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"आप अपने डिवाइस के प्रारंभ होने से पहले अपना पिन डालना आवश्‍यक बनाकर उसे अधिक सुरक्षित बना सकते हैं. जब तक डिवाइस प्रारंभ नहीं हो जाता, वह अलार्म सहित कॉल, संदेश या नोटिफिकेशन प्राप्‍त नहीं कर सकता. \n\nइससे गुम हुए या चोरी गए डिवाइस पर डेटा की सुरक्षा करने में सहायता मिलती है."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"आप अपने डिवाइस के प्रारंभ होने से पहले अपना पैटर्न डालना आवश्‍यक बनाकर उसे अधिक सुरक्षित बना सकते हैं. जब तक डिवाइस प्रारंभ नहीं हो जाता, वह अलार्म सहित कॉल, संदेश या नोटिफिकेशन प्राप्‍त नहीं कर सकता. \n\nइससे गुम हुए या चोरी गए डिवाइस पर डेटा की सुरक्षा करने में सहायता मिलती है."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"आप अपने डिवाइस के प्रारंभ होने से पहले अपना पासवर्ड डालना आवश्‍यक बनाकर उसे अधिक सुरक्षित बना सकते हैं. जब तक डिवाइस प्रारंभ नहीं हो जाता, वह अलार्म सहित कॉल, संदेश या नोटिफिकेशन प्राप्‍त नहीं कर सकता. \n\nइससे गुम हुए या चोरी गए डिवाइस पर डेटा की सुरक्षा करने में सहायता मिलती है."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अतिरिक्त, आप इस डिवाइस के प्रारंभ होने से पहले अपने पिन की आवश्‍यकता के द्वारा इसे और अधिक सुरक्षित बना सकते हैं. डिवाइस के प्रारंभ होने तक, वह कॉल, संदेश या नोटिफिकेशन प्राप्‍त नहीं कर सकता है जिनमें अलार्म भी शामिल होंगे.\n\nइससे खोए हुए या चोरी चले गए डिवाइस पर डेटा सुरक्षित करने में सहायता मिलती है."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अतिरिक्त, आप इस डिवाइस के प्रारंभ होने से पहले अपने पैटर्न की आवश्‍यकता के द्वारा इसे और अधिक सुरक्षित बना सकते हैं. डिवाइस के प्रारंभ होने तक, वह कॉल, संदेश या नोटिफिकेशन प्राप्‍त नहीं कर सकता है जिनमें अलार्म भी शामिल होंगे.\n\nइससे खोए हुए या चोरी चले गए डिवाइस पर डेटा सुरक्षित करने में सहायता मिलती है."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अतिरिक्त, आप इस डिवाइस के प्रारंभ होने से पहले अपने पासवर्ड की आवश्‍यकता के द्वारा इसे और अधिक सुरक्षित बना सकते हैं. डिवाइस के प्रारंभ होने तक, वह कॉल, संदेश या नोटिफिकेशन प्राप्‍त नहीं कर सकता है जिनमें अलार्म भी शामिल होंगे.\n\nइससे खोए हुए या चोरी चले गए डिवाइस पर डेटा सुरक्षित करने में सहायता मिलती है."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"डिवाइस प्रारंभ करने के लिए पिन आवश्यक है"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"डिवाइस प्रारंभ करने के लिए पैटर्न आवश्यक है"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"डिवाइस प्रारंभ करने के लिए पासवर्ड आवश्यक है"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"नहीं, रहने दें"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"नहीं, रहने दें"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"नहीं, रहने दें"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"आप इसके चालू होने से पहले अपना पिन डालना ज़रूरी बनाकर इसे और सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं. \n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"आप इसके चालू होने से पहले अपना पैटर्न डालना ज़रूरी बनाकर इसे और सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं. \n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"आप इस डिवाइस के चालू होने से पहले अपने पासवर्ड को डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं. \n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस के चालू होने से पहले पासवर्ड डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अलावा, आप इसके चालू होने से पहले अपने पिन को डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं.\n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पिन डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अलावा, आप इसके चालू होने से पहले अपने पैटर्न को डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस शुरू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं.\n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पैटर्न डालना ज़रूरी बनाना चाहते हैं?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"अपने डिवाइस को अनलॉक करने के लिए अपने फ़िंगरप्रिंट का उपयोग करने के अलावा, आप इसके चालू होने से पहले अपने पासवर्ड को डालना ज़रूरी बनाकर इसे और भी सुरक्षित बना सकते हैं. जब तक डिवाइस चालू नहीं होता, तब तक उसे अलार्म के साथ ही, कॉल, संदेश या नोटिफ़िकेशन नहीं मिल सकते हैं.\n\nइससे खोए या चोरी चले गए डिवाइसों पर मौजूद डेटा को सुरक्षित करने में सहायता मिलती है. क्या आप अपना डिवाइस चालू होने से पहले पासवर्ड डालना ज़रूरी बनाना चाहते हैं&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"हां"</string>
+    <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>
@@ -3077,7 +3074,7 @@
     <string name="system_app" msgid="9068313769550747372">"(सिस्टम)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(सिस्टम डिफ़ॉल्ट)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"ऐप मेमोरी"</string>
-    <string name="usage_access" msgid="5479504953931038165">"उपयोग की ऐक्‍सेस"</string>
+    <string name="usage_access" msgid="5479504953931038165">"उपयोग एक्‍सेस"</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>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"हां"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"नहीं"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"ऐप्लिकेशन इंस्टॉल की अनुमति दें"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"अनुमति है"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"अनुमति नहीं है"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कैमरे के लिए पावर बटन दो बार दबाएं"</string>
@@ -3300,7 +3297,7 @@
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> डेटा चेतावनी / <xliff:g id="ID_2">%2$s</xliff:g> डेटा सीमा"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"बिलिंग चक्र"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"मासिक चक्र प्रत्येक माह के <xliff:g id="ID_1">%1$s</xliff:g> को शुरू होगा"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"मासिक चक्र प्रत्येक माह की दिनांक <xliff:g id="ID_1">%1$s</xliff:g> को शुरू होगा"</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"<xliff:g id="ID_1">%1$s</xliff:g> से मासिक रूप से शुरू"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"नेटवर्क प्रतिबंध"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
@@ -3388,11 +3385,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"सहायता"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"न्यूनतम चौड़ाई"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"इंस्टॉल किए गए किसी भी ऐप्लिकेशन द्वारा प्रीमियम SMS एक्सेस का अनुरोध नहीं किया गया"</string>
+    <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_connected_summary" msgid="8733997010923307915">"इससे कनेक्ट है"</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>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(उपयोगकर्ता <xliff:g id="USER">%s</xliff:g> के लिए अक्षम है)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ऑटोमैटिक भरने की सेवा"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ऑटो, भरना, ऑटोमैटिक भरना"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> को आपका ऑटोमैटिक भरने वाला ऐप्लिकेशन बनाएं? <xliff:g id="APP_NAME_1">%1$s</xliff:g> आपकी स्क्रीन को पढ़ सकेगा और दूसरे ऐप्लिकेशन के फ़ील्ड भर सकेगा."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;सुनिश्चित करें कि आप इस ऐप्लिकेशन पर भरोसा करते हैं&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ऑटोमैटिक भरना&gt;%1$s&lt;/xliff:g&gt; ऑटोमैटिक भरी जा सकने वाली चीज़ें निर्धारित करने के लिए आपकी स्क्रीन पर मौजूद चीज़ों का उपयोग करता है."</string>
     <string name="device_theme" msgid="4571803018917608588">"डिवाइस की थीम"</string>
     <string name="default_theme" msgid="7085644992078579076">"डिफ़ॉल्ट"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"जगह प्रबंधक: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 280056e..bf780f1 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ništa"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ništa"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 66f43d9..89d4e25 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -331,20 +331,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sigurnost i lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripcija i vjerodajnice"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon je kriptiran"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je kriptiran"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Postavke zaključanog zaslona"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privatnost"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Onemogućio administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sigurnosni status"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Zaključavanje zaslona, otisak prsta"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaključavanje zaslona"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Otisak prsta"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Otisci prstiju"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Upotreba otiska prsta"</string>
@@ -682,11 +681,11 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Uključite NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC razmjenjuje podatke između ovog uređaja i ostalih uređaja u blizini ili ciljeva, na primjer terminala za plaćanje, čitača za pristup i interaktivnih oglasa ili oznaka."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Spreman za prijenos sadržaja aplikacije NFC-om"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Spreman za prijenos sadržaja aplikacija NFC-om"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Isključeno"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nije dostupno jer je NFC isključen"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Kada je ta značajka uključena, možete emitirati sadržaj aplikacije na drugi uređaj na kojem je omogućen NFC tako da držite uređaje jedan uz drugi. Na primjer, možete emitirati web-stranice, videozapise s YouTubea, kontakte i još mnogo toga.\n\nJednostavno međusobno približite uređaje (najčešće se poleđinama prislanjaju jedan uz drugi), pa dodirnite zaslon. Aplikacija određuje što će se emitirati."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Kada je ta značajka uključena, možete prenijeti sadržaj aplikacije na drugi uređaj na kojem je omogućen NFC tako da uređaje postavite jedan uz drugi. Na primjer, možete prenositi web-stranice, videozapise s YouTubea, kontakte i još mnogo toga.\n\nJednostavno uređaje postavite jedan uz drugi (prislonite im poleđine), pa dodirnite zaslon. Aplikacija određuje što će se prenijeti."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Uključite Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -703,6 +702,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Obavijesti kada je dostupna javna mreža visoke kvalitete"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automatski uključi Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi će se automatski ponovo uključiti u blizini spremljenih mreža visoke kvalitete, poput vaše kućne mreže"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nije dostupno jer je pretraživanje Wi-Fi signala isključeno"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izbjegavati slabe veze"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ne upotrebljavaj Wi-Fi mrežu ako internetska veza nije zadovoljavajuća"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Koristi samo mreže s dobrom internetskom vezom"</string>
@@ -825,11 +825,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguriranje Wi‑Fi-ja"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podmreže"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adrese"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Spremljene mreže"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP postavke"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Napredne postavke Wi‑Fi-ja nisu dostupne za ovog korisnika"</string>
@@ -1029,13 +1027,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Isključeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Da biste kontrolirali događaje dok je telefon na priključnoj stanici i/ili dok miruje, uključite čuvar zaslona."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kada pokrenuti"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni čuvar zaslona"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Započni sad"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Postavke"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktivacija podizanjem"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Zaslon za dolazne obavijesti"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambijentalni zaslon"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktiviraj zaslon kada stigne obavijest"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Smanjite ili povećajte tekst"</string>
@@ -1189,10 +1186,10 @@
     <string name="storage_other_users" msgid="808708845102611856">"Drugi korisnici"</string>
     <string name="storage_internal_title" msgid="690771193137801021">"Pohrana na uređaju"</string>
     <string name="storage_external_title" msgid="3433462910096848696">"Prijenosna pohrana"</string>
-    <string name="storage_volume_summary" msgid="7023441974367853372">"Upotrijebljeno <xliff:g id="USED">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
+    <string name="storage_volume_summary" msgid="7023441974367853372">"Iskorišteno <xliff:g id="USED">%1$s</xliff:g> od <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
-    <string name="storage_volume_used" msgid="1303803057698959872">"Upotrijebljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_volume_used_total" msgid="6113121714019000244">"Ukupno upotrijebljeno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used" msgid="1303803057698959872">"Iskorišteno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used_total" msgid="6113121714019000244">"Ukupno iskorišteno od <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"Učitano: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"Učitavanje nije uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_unmount_success" msgid="5737203344673441677">"Sigurno izbacivanje uspjelo: <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -1630,6 +1627,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Pojedinosti o aplikaciji"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija instalirana iz trgovine: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Više informacija o aplikaciji <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Radnje aplikacija"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"U tijeku"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikada nije upotrebljavano)"</string>
@@ -1706,7 +1704,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomoć za tipkovne prečace"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaz dostupnih prečaca"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Zadano"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Miš/dodirna površina"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Brzina pokazivača"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Upravljač igrama"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Upotrijebi vibrator"</string>
@@ -1786,15 +1783,15 @@
     <string name="talkback_summary" msgid="8331244650729024963">"Čitač zaslona namijenjen prvenstveno slijepim i slabovidnim osobama"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Dodirnite stavke na zaslonu da bi ih usluga izgovorila naglas"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titlovi"</string>
-    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Povećanje"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Povećanje trostrukim dodirom"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Povećanje pomoću gumba"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Povećanje pomoću gumba i trostrukog dodira"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Povećanje zaslona"</string>
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Povećavanje"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Povećavanje trostrukim dodirom"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Povećavanje gumbom"</string>
+    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Povećavanje gumbom i trostrukim dodirom"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Povećavanje zaslona"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Dodirnite triput za zumiranje"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Dodirnite gumb za zumiranje"</string>
     <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ćanje uključeno, upotrijebite gumb Pristupačnost na dnu zaslona za brzo povećanje.\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_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_shortcut_service_title" msgid="4779360749706905640">"Usluga prečaca"</string>
@@ -1884,7 +1881,7 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Budući da uključivanje usluge <xliff:g id="SERVICE">%1$s</xliff:g> utječe na enkripciju podataka, morate potvrditi zaporku."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Pratiti vaše radnje"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Primajte obavijesti tijekom interakcije s aplikacijom."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Dobit će obavijest kad stupite u interakciju s nekom aplikacijom."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Želite li zaustaviti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Ako dodirnete \"U redu\", zaustavit će se <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Nema instaliranih usluga"</string>
@@ -1936,8 +1933,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Upotreba zaslona od potpunog punjenja"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Potrošnja za zaslon"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pretraživanje mobilnih mreža"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"prije <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Upotreba aplikacija od potpunog punjenja (prije <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"prije <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Upotreba aplikacija od pune baterije (prije <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Količina vremena dok je zaslon bio uključen od posljednjeg punjenja"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Upotreba uređaja od potpunog punjenja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Upotreba baterije nakon isključivanja"</string>
@@ -1968,7 +1965,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Način čekanja"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilna mreža u stanju mirovanja"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni pozivi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tabletni uređaj u mirovanju"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon u mirovanju"</string>
@@ -2028,7 +2025,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Upotreba baterije procjena je potrošnje energije i ne uključuje sve izvore potrošnje baterije. Vrijednost \"razno\" odnosi se na razliku između obračunate procijenjene potrošnje energije i stvarne potrošnje izmjerene na bateriji."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Previše obrač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="4383512863007718804">"Korišteno %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Upotrebljava se <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> upotrebljava <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 potrošnje baterije"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razrada od posljednjeg potpunog punjenja"</string>
@@ -2100,7 +2097,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Postavke za glasovni unos i izlazne vrijednosti"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno pretraživanje"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android tipkovnica"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Govor"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Postavke glasovnog unosa"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Glasovni unos"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Usluge glasovnog unosa"</string>
@@ -2166,10 +2162,10 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Pohrana vjerodajnica izbrisana je."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Pohrana vjer. nije izbrisana."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Pohranjivanje vjerodajnica je omogućeno."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Trebate postaviti PIN ili zaporku za zaključavanje zaslona prije nego što ćete moći upotrebljavati pohranu vjerodajnica."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Da biste mogli koristiti pohranu vjerodajnica, trebate najprije postaviti PIN ili zaporku za zaključavanje zaslona."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Apl. s pristupom pod. o upot."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Ton hitnog poziva"</string>
-    <string name="emergency_tone_summary" msgid="722259232924572153">"Postavite način ponašanja za hitan poziv"</string>
+    <string name="emergency_tone_summary" msgid="722259232924572153">"Postavite način ponašanja za hitni poziv"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sigurnosna kopija"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Sigurnosna kopija i vraćanje"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobni podaci"</string>
@@ -2362,7 +2358,7 @@
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Isključiti auto. sinkronizaciju?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Time će se uštedjeti na podatkovnom prometu i smanjiti potrošnja baterije, ali svaki ćete račun morati ručno sinkronizirati kako biste dobili najnovije informacije. Nećete primati obavijesti o ažuriranjima."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Datum poništavanja ciklusa upotrebe"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum svakog mjeseca."</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum u mjesecu:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Postavi"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Postavite upozorenje o upotrebi podataka"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Postavite ograničenje upotrebe podataka"</string>
@@ -2387,7 +2383,7 @@
     <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_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">"Hitan poziv"</string>
+    <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Hitni poziv"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Vrati se na poziv"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naziv"</string>
     <string name="vpn_type" msgid="5435733139514388070">"Vrsta"</string>
@@ -2757,6 +2753,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Glasnoća obavijesti"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Zadani zvuk obavijesti"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvuk koji pruža aplikacija"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Zadani zvuk obavijesti"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Zadani zvuk alarma"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibracija i za pozive"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Ostali zvukovi"</string>
@@ -2819,6 +2817,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kako želite da se prikazuju obavijesti profila kada je uređaj zaključan?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obavijesti profila"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Obavijesti"</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_blocked" msgid="7938180808339386300">"Nikad ne prikazuj obavijesti"</string>
@@ -2826,10 +2825,10 @@
     <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_min_summary" msgid="8233873580287975662">"Mala: bez zvučnog ili vizualnog ometanja"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Srednja: bez zvuka"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Velika: reproduciraj zvuk"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Hitno: reproduciraj zvuk i prikaži na zaslonu"</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="6585849855452076626">"Dopusti zvuk"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Nemoj emitirati zvuk, vibrirati niti prikazivati obavijesti na trenutačnom zaslonu."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pomoćnik za obavijesti"</string>
@@ -2864,6 +2863,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokira prikazivanje obavijesti te aplikacije na ovom uređaju"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokira prikazivanje te kategorije obavijesti na ovom uređaju"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ova aplikacija nije objavila nijednu obavijest"</string>
@@ -3001,18 +3002,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ostani u trenutačnom usmjerenju"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Sigurno pokretanje"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Nastavi"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se uređaj ne pokrene, ne može primati pozive, poruke ni obavijesti, uključujući alarme. \n\nTime se štite podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem uzroka kako bi se pokrenuo. Dok se uređaj ne pokrene, ne može primati pozive, poruke ni obavijesti, uključujući alarme. \n\nTime se štite podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem zaporke kako bi se pokrenuo. Dok se uređaj ne pokrene, ne može primati pozive, poruke ni obavijesti, uključujući alarme. \n\nTime se štite podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Osim otključavanja uređaja otiskom prsta, možete još bolje zaštititi uređaj zahtijevanjem unosa PIN-a da bi se uređaj pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Osim otključavanja uređaja otiskom prsta, možete još bolje zaštititi uređaj zahtijevanjem unosa uzorka da bi se uređaj pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Osim otključavanja uređaja otiskom prsta, možete još bolje zaštititi uređaj zahtijevanjem unosa zaporke da bi se uređaj pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Zahtijevaj PIN za pokretanje uređaja"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Zahtijevaj uzorak za pokretanje uređaja"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Zahtijevaj zaporku za pokretanje uređaja"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ne, hvala"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati PIN za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem uzorka kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme. \n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati uzorak za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Ovaj uređaj možete dodatno zaštititi zahtijevanjem zaporke kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ni obavijesti, uključujući alarme. \n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati zaporku za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Osim otključavanja uređaja otiskom prsta, uređaj možete dodatno zaštititi zahtijevanjem PIN-a kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati PIN za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Osim otključavanja uređaja otiskom prsta, uređaj možete dodatno zaštititi zahtijevanjem uzorka kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati uzorak za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Osim otključavanja uređaja otiskom prsta, uređaj možete dodatno zaštititi zahtijevanjem zaporke kako bi se pokrenuo. Dok se ne pokrene, uređaj ne može primati pozive, poruke ili obavijesti, uključujući alarme.\n\nNa taj se način štite podaci na izgubljenim ili ukradenim uređajima. Želite li zahtijevati zaporku za pokretanje uređaja?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Zahtijevanje PIN-a?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Zahtijevanje uzorka?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Zahtijevanje zaporke?"</string>
@@ -3100,15 +3097,15 @@
     <string name="default_apps_title" msgid="1660450272764331490">"Zadano"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Zadano za posao"</string>
     <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Pomoćnik i glasovni unos"</string>
-    <string name="default_assist_title" msgid="8868488975409247921">"Aplikacija-pomoćnik"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"Aplikacija pomoćnika"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Želite li da <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> bude vaš pomoćnik?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Pomoćnik će moći čitati podatke o aplikacijama koje se upotrebljavaju u vašem sustavu, uključujući podatke vidljive na zaslonu ili podatke kojima se može pristupiti u aplikacijama."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Slažem se"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Ne slažem se"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Odabir glasovnog unosa"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Aplikacija preglednika"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Preglednik"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Nema zadanog preglednika"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Aplikacija Telefon"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Aplikacija za pozive"</string>
     <string name="default_app" msgid="6864503001385843060">"(Zadano)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sustav)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Zadano sustavom)"</string>
@@ -3187,7 +3184,7 @@
     <string name="no_memory_use_summary" msgid="2016900536806235588">"U posljednja 3 sata nije bilo upotrebe memorije"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Razvrstaj po prosječnoj upotrebi"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Razvrstaj po maksimalnoj upotrebi"</string>
-    <string name="memory_performance" msgid="5661005192284103281">"Izvođenje"</string>
+    <string name="memory_performance" msgid="5661005192284103281">"Izvedba"</string>
     <string name="total_memory" msgid="2017287600738630165">"Ukupna memorija"</string>
     <string name="average_used" msgid="5338339266517245782">"Prosječna upotreba (%)"</string>
     <string name="free_memory" msgid="4003936141603549746">"Dostupno"</string>
@@ -3212,7 +3209,7 @@
     <string name="ignore_optimizations_title" msgid="2829637961185027768">"Želite li dopustiti aplikaciji <xliff:g id="APP">%s</xliff:g> da zanemari optimizacije baterije?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Ništa"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Isključivanje pristupa upotrebi za tu aplikaciju ne sprječava administratora da prati upotrebu podataka za aplikacije na vašem radnom profilu."</string>
-    <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Upotrijebljeno znakova: <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
+    <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Iskorišteno <xliff:g id="COUNT_0">%1$d</xliff:g> od <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"Prikaz iznad drugih aplikacija"</string>
     <string name="system_alert_window_settings" msgid="8466613169103527868">"Prikaz iznad drugih aplikacija"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplikacije"</string>
@@ -3241,9 +3238,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To dopuštenje omogućuje aplikaciji izmjenu postavki sustava."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Da"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ne"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Dopusti instaliranje aplikacija"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Dopušteno"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nije dopušteno"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Dopusti iz ovog izvora"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dvostruko obrtanje za fotoaparat"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvaranje aplikacije fotoaparata obrtanjem ručnog zgloba dvaput"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Pritisnite uključ. dvaput za fotoaparat"</string>
@@ -3413,7 +3410,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ništa"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Objekt rangiranja nedostaje."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Objekt rangiranja ne sadrži tu tipku."</string>
-    <string name="special_access" msgid="3458780842491881155">"Poseban pristup aplikacijama"</string>
+    <string name="special_access" msgid="3458780842491881155">"Poseban pristup za aplikacije"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> aplikacija može upotrebljavati neograničene podatke</item>
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aplikacije mogu upotrebljavati neograničene podatke</item>
@@ -3433,7 +3430,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Povezano s uređajem"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pločice brzih postavki za razvojne programere"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Rado ćemo vam pomoći"</string>
@@ -3505,17 +3503,17 @@
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dvaput dodirnite da biste provjerili telefon"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dvaput dodirnite da biste provjerili tablet"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dvaput dodirnite da biste provjerili uređaj"</string>
-    <string name="ambient_display_summary" msgid="2521630136233865893">"Da biste brzo provjerili obavijesti, dvaput dodirnite zaslon."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite da biste provjerili telefon"</string>
+    <string name="ambient_display_summary" msgid="2521630136233865893">"Da biste brzo pogledali obavijesti, dvaput dodirnite zaslon."</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Podignite za provjeru telefona"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Podignite da biste provjerili tablet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Podignite da biste provjerili uređaj"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Da biste brzo provjerili obavijesti, podignite telefon."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Da biste brzo provjerili obavijesti, podignite tablet."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Da biste brzo provjerili obavijesti, podignite uređaj."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Prijelaz otiskom prsta za obavijesti"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste provjerili obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste provjerili obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani tableta."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste provjerili obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani uređaja."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Da biste brzo pogledali obavijesti, podignite telefon."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Da biste brzo pogledali obavijesti, podignite tablet."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Da biste brzo pogledali obavijesti, podignite uređaj."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Povlačenje prstom za obavijesti"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani telefona."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani tableta."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Da biste pogledali obavijesti, prijeđite prstom prema dolje po senzoru otiska prsta na stražnjoj strani uređaja."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Pomoćni pokret"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Osjetljivost"</string>
@@ -3632,7 +3630,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogućeno za korisnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Usluga automatskog popunjavanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatski, popunjavanje, automatsko popunjavanje"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Želite li da se <xliff:g id="APP_NAME_0">%1$s</xliff:g> upotrebljava kao vaša aplikacija za automatsko popunjavanje? Aplikacija <xliff:g id="APP_NAME_1">%1$s</xliff:g> moći će čitati sadržaj na zaslonu i popunjavati polja u drugim aplikacijama."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Provjerite je li ova aplikacija pouzdana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automatsko popunjavanje&gt;%1$s&lt;/xliff:g&gt; upotrebljava sadržaj na zaslonu za procjenu onoga što se može automatski popuniti."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema uređaja"</string>
     <string name="default_theme" msgid="7085644992078579076">"Zadano"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj pohrane: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index cfe91b6..46f9234 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Nincs"</item>
+    <item msgid="7480272092408291086">"MSCHAPv2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Semelyik"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5616629..f84eb6e 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Fiókok"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Tartózkodási hely"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Fiókok"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Biztonság és hely"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Titkosítás és hitelesítési adatok"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon titkosítva"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon titkosítva"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"A lezárási képernyő beállításai"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Adatvédelem"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"A rendszergazda kikapcsolta"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Biztonsági állapot"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Képernyőzár, ujjlenyomat"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Képernyőzár"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Ujjlenyomat"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Ujjlenyomatok kezelése"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Ujjlenyomat ehhez:"</string>
@@ -671,7 +670,7 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC bekapcsolása"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"Az NFC adatokat küld ezen eszköz és a közelben található egyéb eszközök és célpontok – például fizetési terminálok, beléptetési terminálok, interaktív hirdetések vagy címkék – között."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Készen áll az alkalmazási tartalmak továbbítására kis hatósugarú vezeték nélküli kommunikáció segítségével"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Készen áll alkalmazástartalmak továbbítására NFC segítségével"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Ki"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nem érhető el, mert az NFC ki van kapcsolva"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Értesítsen, ha rendelkezésre áll jó minőségű nyilvános hálózat"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi automatikus bekapcsolása"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"A Wi‑Fi újra bekapcsol jó minőségű mentett hálózatok (például az otthoni hálózat) közelében"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nem használható, mert a Wi-Fi-keresés ki van kapcsolva"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Rossz minőségű kapcsolatok kerülése"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Csak akkor használjon Wi-Fi hálózatot, ha jó internetkapcsolatot tud biztosítani."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Csak jó internetkapcsolattal rendelkező hálózatok használata"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi beállítása"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alhálózati maszk"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-címek"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Mentett hálózatok"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-beállítások"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"A speciális Wi-Fi-beállítások nem állnak rendelkezésre ennél a felhasználónál"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Ki"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"A képernyővédő bekapcsolásával beállíthatja, hogy mit csináljon a telefon dokkolt, illetve alvó állapotban."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kezdés ideje"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Jelenlegi képernyővédő"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Indítás most"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Beállítások"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Felébresztéshez emelje meg"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Bejövő értesítés képernyő"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Környezeti kijelző"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Képernyő felébresztése értesítés érkezésekor"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Szöveg nagyítása és kicsinyítése"</string>
@@ -1326,7 +1323,7 @@
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Internetmegosztás"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Ha az Adatforgalom-csökkentő be van kapcsolva, nem lehet használni az internetmegosztás és a hordozható hotspot funkciókat"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB megosztás"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-megosztás"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB csatlakoztatva, jelölje be a megosztáshoz"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Megosztva"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Nem lehet összekötni, ha az USB-tároló használatban van"</string>
@@ -1431,7 +1428,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"PIN-kód megerősítése"</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">"Kijelöltek feloldása"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Feloldás kiválasztása"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"A jelszó beállítva"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"A PIN-kód beállítva"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"A minta beállítva"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Áruház"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Az alkalmazás adatai"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Alkalmazás telepítve az <xliff:g id="APP_STORE">%1$s</xliff:g> oldaláról"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"További információ itt: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Alkalmazásműveletek"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Fut"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(nem használt)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Billentyűkódsegéd"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Rendelkezésre álló gyorsparancsok megjelenítése"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Alapértelmezett"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Egér/érintőpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Mutató sebessége"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Játékvezérlő"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Rezgés használata"</string>
@@ -1768,7 +1765,7 @@
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Letöltött szolgáltatások"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"Kísérleti"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"Elsődlegesen vakok és gyengén látók számára készült képernyőolvasó"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"Elsődlegesen vakok és gyengénlátók számára készült képernyőolvasó"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Koppintson a képernyőn látható elemekre, ha szeretné őket felolvasva hallani"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Képaláírások"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Nagyítás"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Képernyőhasználat teljes feltöltés óta"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"A képernyő energiafogyasztása"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilhálózat keresése"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Ennyi idővel ezelőtt: <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Alkalmazáshasználat teljes töltés óta (ennyi ideje: <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Ennyi ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Használat teljes töltés óta (ennyi ideje: <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Képernyőidő teljes töltés óta"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Eszközhasználat teljes feltöltés óta"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akkumulátorhasználat a legutolsó töltés óta"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Cella készenlét"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilhálózat készenléti módban"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hanghívások"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Táblagép - tétlen"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon - tétlen"</string>
@@ -2007,14 +2004,14 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Az energiahasználat csak becsült érték, és nem tartalmazza az akkumulátorhasználat minden forrását. Az „Egyéb energiafelhasználás” a kalkulált hozzávetőleges energiahasználat és a ténylegesen észlelt akkumulátorhasználat közötti különbség."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Túlbecsült energiafogyasztás"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Használat időtartama: %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Használat ideje: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"A(z) <xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$s</xliff:g>-ot használt"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Az akkumulátor teljes töltöttségi szintjének <xliff:g id="PERCENT">%1$s</xliff:g>-a"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Statisztikák az utolsó teljes feltöltés óta"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Utolsó teljes feltöltés"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"A fennmaradó akkumulátor-üzemidő becsült érték, a használattól függően módosulhat"</string>
-    <string name="battery_detail_foreground" msgid="3350401514602032183">"Miközben aktív használatban van"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"Miközben a háttérben van"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktív használatban"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"Háttérben"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Akkumulátorhasználat"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"A teljes alkalmazáshasználat <xliff:g id="PERCENT">%1$s</xliff:g>-a (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Teljes feltöltés óta"</string>
@@ -2081,7 +2078,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Hang be- és kimenet beállításai"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hangalapú keresés"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-billentyűzet"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Beszéd"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Hangbeviteli beállítások"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Hangbevitel"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Hangbeviteli szolgáltatások"</string>
@@ -2342,8 +2338,8 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"A rendszer azonnal átmásolja telefonjára a fiókot érintő valamennyi módosítást, amelyet az interneten hajt végre.\n\nEgyes fiókok a telefonon végrehajtott módosításokat is automatikusan átmásolhatják az internetre. Ez a Google-fiókok működésének lényege."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Kikapcsolja a szinkronizálást?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Ez mérsékelni fogja az adat- és akkumulátorhasználatot, de minden egyes fiókot manuálisan kell majd szinkronizálnia a legfrissebb információk begyűjtéséhez. Továbbá nem fog értesítéseket kapni a frissítésekről."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Használati ciklus visszaállításának ideje"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Hónap napja:"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Adatforgalom-számlálás visszaállításának napja"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Hónap X. napja:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Beállítás"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Adathasználati figyelmeztetés beállítása"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Adathasználati korlát beállítása"</string>
@@ -2483,7 +2479,7 @@
     <string name="user_settings_title" msgid="6151874007858148344">"Felhasználók"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Felhasználók és profilok"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Felhasználó vagy profil hozzáadása"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáad."</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"Felhasználó hozzáadása"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Korlátozott jogokkal rendelkező profil"</string>
     <string name="user_need_lock_message" msgid="5879715064416886811">"Mielőtt létrehozhatna egy korlátozott profilt, be kell állítania egy képernyőzárat, hogy megvédje alkalmazásait és személyes adatait."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"Képernyőzár beállítása"</string>
@@ -2550,13 +2546,13 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Érintéssel való fizetés"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Hogyan működik?"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Fizessen telefonjával a boltokban"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Fizetéshez alapértelmezett"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Fizetéskor alapértelmezett"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Nincs megadva"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> – <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Alapértelmezett használata"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Mindig"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Kivéve, ha meg van nyitva egy másik alkalmazás a fizetéshez"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Érintéses fizetésre alkalmas terminál fizetés a következővel:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Érintéses fizetésre alkalmas terminál esetén fizetés a következővel:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Fizetés a terminálnál"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Állítson be egy alkalmazást a fizetéshez. Ezután elég csak telefonja hátulját odatartani az érintés nélküli fizetést jelző szimbólummal ellátott terminálhoz."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Értem"</string>
@@ -2584,7 +2580,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">"Sürgősségi adások"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Vészhelyzeti adá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>
@@ -2733,6 +2729,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Értesítés hangereje"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Alapértelmezett értesítőhang"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Alkalmazásból származó hang"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Alapértelmezett értesítőhang"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Alapértelmezett ébresztőhang"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"A hívásoknál rezegjen is"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Egyéb hangok"</string>
@@ -2794,6 +2792,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Ha az eszköz zárolva van, hogyan szeretné megjeleníteni a profilértesítéseket?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilértesítések"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"É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_blocked" msgid="7938180808339386300">"Soha ne jelenjen meg értesítés"</string>
@@ -2801,10 +2800,10 @@
     <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_min_summary" msgid="8233873580287975662">"Nem fontos: Vizuális és hangjelzés nélkül"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Közepes: Hang nélkül"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Fontos: Hangjelzés"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Sürgős: Hangjelzés és 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Értesítési segéd"</string>
@@ -2820,7 +2819,7 @@
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Ha kikapcsolja a(z) <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> hozzáférését az értesítésekhez, azzal lehet, hogy kikapcsolja a „Ne zavarjanak” módhoz való hozzáférést is."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Kikapcsolás"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Mégse"</string>
-    <string name="vr_listeners_title" msgid="1318901577754715777">"virtuálisvalóság-segédszolgáltatás"</string>
+    <string name="vr_listeners_title" msgid="1318901577754715777">"Virtuálisvalóság-segédszolgáltatás"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"Egy telepített alkalmazás sem kérte, hogy virtuálisvalóság-segédszolgáltatásként legyen futtatva."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> számára a hozzáférést a virtuálisvalóság-szolgáltatáshoz?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"A(z) <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> futtatható lesz, ha Ön virtuális valóság módban használ alkalmazásokat."</string>
@@ -2838,6 +2837,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Az Android letiltotta a jelen alkalmazás értesítéseinek megjelenését ezen az eszközön"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Az Android letiltotta a jelen értesítési kategória megjelenését ezen az eszközön"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategóriák"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Egyéb"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ez az alkalmazás nem küldött semmilyen értesítést"</string>
@@ -2941,9 +2942,9 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Váltás „Csak ébresztésekre” eddig: <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Módosítás a bármikor történő megszakításra"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Letiltás, ha a képernyő be van kapcsolva"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Letiltás bekapcsolt képernyőnél"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"A Ne zavarjanak funkcióval elnémított értesítek ne jelenjenek meg részben vagy teljesen a képernyőn."</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Letiltás, ha a képernyő ki van kapcsolva"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Letiltás kikapcsolt képernyőnél"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"A Ne zavarjanak funkcióval elnémított értesítések ne kapcsolják be a képernyőt, és ne villogjon az értesítő fényjelzés."</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"A „Ne zavarjanak” funkcióval elnémított értesítések ne aktiválják a képernyőt."</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Ki"</string>
@@ -2971,18 +2972,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Jelenlegi tájolás megtartása"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Biztonságos indítás"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tovább"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"További védelmet adhat az eszköznek, ha annak elindítása előtt PIN-kódot kér. Amíg az eszköz el nem indul, nem fogadhat hívásokat, üzeneteket vagy értesítéseket, az ébresztőket is beleértve. \n\nEz segít megóvni adatait, ha ellopják eszközét."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"További védelmet adhat az eszköznek, ha annak elindítása előtt mintát kér. Amíg az eszköz el nem indul, nem fogadhat hívásokat, üzeneteket vagy értesítéseket, az ébresztőket is beleértve. \n\nEz segít megóvni adatait, ha ellopják eszközét."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"További védelmet nyújthat az eszköz számára, ha annak elindítása előtt jelszót kér. Amíg az eszköz el nem indul, nem fogadhat hívásokat, üzeneteket vagy értesítéseket, az ébresztőket is beleértve. \n\nEz segít megóvni adatait, ha ellopják eszközét."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet nyújthat a számára, ha PIN-kódot kér a rendszerindítás előtt. Amíg a rendszer el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet nyújthat a számára, ha mintát kér a rendszerindítás előtt. Amíg a rendszer el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet nyújthat a számára, ha jelszót kér a rendszerindítás előtt. Amíg a rendszer el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Az eszköz indításakor kérjen PIN-kódot"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Az eszköz indításakor kérje minta megadását"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Az eszköz indításakor kérjen jelszót"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nem, köszönöm"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nem, köszönöm"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nem, köszönöm"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"További védelmet adhat az eszköznek, ha elindítása előtt PIN-kódot kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja PIN-kód kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"További védelmet adhat az eszköznek, ha elindítása előtt mintát kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja minta kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"További védelmet nyújthat az eszköz számára, ha elindítása előtt jelszót kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is). \n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt PIN-kódot kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja PIN-kód kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt mintát kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja minta kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Amellett, hogy ujjlenyomattal oldja fel eszköze zárolását, további védelmet jelenthet, ha az eszköz rendszerindítás előtt jelszót kér. Amíg az eszköz el nem indul, nem tud hívásokat, üzeneteket és értesítéseket fogadni (beleértve a riasztásokat is).\n\nEz segít az elvesztett vagy ellopott eszközökön lévő adatok védelmében. Beállítja jelszó kérését az eszköz indítása előtt?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Igen"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nem"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Kérjen PIN-kódot?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Kérjen mintát?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Kérjen jelszót?"</string>
@@ -3137,7 +3134,7 @@
     <string name="usb_summary_MIDI" msgid="5687906612187885908">"Eszköz használata MIDI-eszközként"</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">"A képernyőn megjelenő szöveg használata"</string>
+    <string name="assist_access_context_title" msgid="2269032346698890257">"Képernyő szövegének használata"</string>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"A segédalkalmazás hozzáférhet a képernyőn megjelenő tartalmakhoz szövegként"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Képernyőkép használata"</string>
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"A segédalkalmazás hozzáférhet a képernyőn megjelenő képekhez"</string>
@@ -3206,9 +3203,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Ez az engedély lehetővé teszi az alkalmazás számára a rendszerbeállítások módosítását."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Igen"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nem"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Igen"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nem"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Alkalmazástelepítések engedélyezése"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Engedélyezett"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nem engedélyezett"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Engedélyezés ebből a forrásból"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"A kamera eléréshez forgassa kétszer a csuklóját"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Nyissa meg a Fényképezőgép alkalmazást kétszeri csuklófordítással"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"A kamerához nyomja meg a bekapcsológombot kétszer"</string>
@@ -3292,7 +3289,7 @@
     <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>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Adathasználat Wi-Fi-kapcsolaton"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Adathasználat – Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Adathasználat Ethernet-kapcsolaton"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
@@ -3311,7 +3308,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"A szolgáltató adatszámlálási módja eltérhet az eszközétől"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> felhasználva"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Adatforgalmi figyelmeztetés beállítása"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Forgalmi figyelmeztetés beáll."</string>
     <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>
@@ -3394,7 +3391,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Csatlakoztatva ehhez:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Fejlesztői gyorsbeállítások csempék"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Szívesen segítünk"</string>
@@ -3412,8 +3410,8 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"Előfordulhat, hogy nemzetközi hívás díját kell fizetni"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Csevegés"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Tippek és trükkök felfedezése"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Keresés a súgóban, valamint visszajelzés küldése"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Tippek és trükkök"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Keresés a súgóban, visszajelzés küldése"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kapcsolatfelvétel az ügyfélszolgálattal"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Bejelentkezés"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"Nem tud bejelentkezni?"</string>
@@ -3464,13 +3462,13 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Koppintson duplán a táblagép képernyőjének megtekintéséhez"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Koppintson duplán az eszköz képernyőjének megtekintéséhez"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Az értesítések gyors megtekintéséhez koppintson duplán a képernyőre."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"A képernyő megtekintéséhez emelje fel a telefont"</string>
-    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"A képernyő megtekintéséhez emelje fel a táblagépet"</string>
-    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"A képernyő megtekintéséhez emelje fel az eszközt"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Ellenőrzés a telefon felemelésével"</string>
+    <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Ellenőrzés a táblagép felemelésével"</string>
+    <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ellenőrzés az eszköz felemelésével"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Az értesítések gyors megtekintéséhez vegye a kezébe telefonját."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Az értesítések gyors megtekintéséhez vegye a kezébe táblagépét."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Az értesítések gyors megtekintéséhez vegye a kezébe eszközét."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Ujjlenyomat érzékelése gyors csúsztatáskor az értesítések megtekintéséhez"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Értesítések ujjlenyomattal"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Megtekintheti értesítéseit, ha ujját lefelé húzza a telefonja hátulján található ujjlenyomat-érzékelőn."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Megtekintheti értesítéseit, ha ujját lefelé húzza a táblagépe hátulján található ujjlenyomat-érzékelőn."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Megtekintheti értesítéseit, ha ujját lefelé húzza az eszköze hátulján található ujjlenyomat-érzékelőn."</string>
@@ -3581,9 +3579,9 @@
     <string name="audio_files_title" msgid="4777048870657911307">"Hangfájlok"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(eltávolítva <xliff:g id="USER">%s</xliff:g> esetében)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(letiltva <xliff:g id="USER">%s</xliff:g> számára)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Automatikus kitöltést végző szolgáltatás"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Automatikus kitöltés"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatikus kitöltés, automatikus, kitöltés"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"A(z) <xliff:g id="APP_NAME_0">%1$s</xliff:g> alkalmazás végezze az automatikus kitöltést? A(z) <xliff:g id="APP_NAME_1">%1$s</xliff:g> alkalmazás ezzel engedélyt kap a képernyő tartalmának olvasására és a mezők kitöltésére más alkalmazásokban."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Győződjön meg arról, hogy az alkalmazás megbízható.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; A(z) &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; az Ön képernyőjén szereplő információk alapján határozza meg, hogy mit lehet automatikusan kitölteni."</string>
     <string name="device_theme" msgid="4571803018917608588">"Eszköztéma"</string>
     <string name="default_theme" msgid="7085644992078579076">"Alapértelmezett"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Tárhelykezelő: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index ccee4e0..e774cf8 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ոչ մի"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM քարտ"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ոչ մեկը"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -338,7 +340,7 @@
     <item msgid="4218544235221631789">"Փոփոխել կարգավորումները"</item>
     <item msgid="736541391767350377">"Պատկերել վերևի մասում"</item>
     <item msgid="5530815681721654194">"Մուտք գործել ծանուցումներ"</item>
-    <item msgid="781213371706962767">"Ֆոտոխցիկ"</item>
+    <item msgid="781213371706962767">"Տեսախցիկ"</item>
     <item msgid="1720492593061838172">"Ձայնագրել ձայնանյութ"</item>
     <item msgid="3493046322001257041">"Նվագարկել ձայնանյութը"</item>
     <item msgid="136815868796597058">"Կարդալ սեղմատախտակը"</item>
@@ -379,7 +381,7 @@
     <item msgid="9039213578110332702">"Մատչելիության ծավալ"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"Կարճաժամկետ"</item>
+    <item msgid="3511504869290423954">"Կարճ"</item>
     <item msgid="2560532955514699713">"Միջին"</item>
     <item msgid="2372711992605524591">"Երկար"</item>
   </string-array>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index f86a7db..acebf4d 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -94,7 +94,7 @@
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Տեսանելի դառնալ մոտակայքում գտնվող բոլոր Bluetooth սարքերին (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
     <string name="bluetooth_is_discoverable_always" msgid="2849387702249327748">"Տեսանելի է մոտ գտնվող բոլոր Bluetooth սարքերին"</string>
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Տեսանելի չէ այլ Bluetooth սարքերին"</string>
-    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Միայն զուգավորված սարքերի համար տեսանելի"</string>
+    <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Միայն զուգակցված սարքերի համար տեսանելի"</string>
     <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Տեսանելիության ժամանակի սպառում"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Կողպել ձայնային համարհավաքումը"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Կանխել Bluetooth համարհավաքչի օգտագործումը, երբ էկրանը կողպված է"</string>
@@ -295,7 +295,7 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Սահմանել ամսաթիվն ու ժամը"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Սահմանել ամսաթիվը, ժամը, ժամային գոտին, &amp; ձևաչափերը"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Ցանցի ամսաթիվ և ժամ"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Ընտրել ցանցի կողմից տրամադրվող ժամանակը"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Օգտագործել ցանցի ժամանակը"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Օգտագործել ցանցի ժամանակը"</string>
     <string name="zone_auto" msgid="334783869352026648">"Ցանցի ժամային գոտի"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Օգտագործել ցանցի ժամային գոտին"</string>
@@ -305,7 +305,7 @@
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Ժամը"</string>
     <string name="date_time_set_time" msgid="5716856602742530696">"Կարգավորել ժամը"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"Ժամային գոտին"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"Ընտրել ժամային գոտին"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"Ժամային գոտի"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"Ամսաթիվը"</string>
     <string name="date_time_set_date" msgid="7021491668550232105">"Կարգավորել ամսաթիվը"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"Տեսակավորել ըստ այբուբենի"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Հաշիվներ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Տեղադրություն"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Հաշիվներ"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Անվտանգություն և Տեղադրություն"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Գաղտնագրում և հավատարմագրեր"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Հեռախոսը գաղտնագրված է"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Հեռախոսը գաղտնագրված է"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Էկրանի կողպման կարգավորումներ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Գաղտնիություն"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Անջատվել է ադմինիստրատորի կողմից"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Անվտանգության կարգավիճակը"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Մատնահետքերի կառավար"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Օգտագործման նպատակը"</string>
@@ -353,7 +352,7 @@
       <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> մատնահետք կարգավորված է</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Մատնահետքով ապակողպում"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_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>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Գնումները թույլատրելու կամ հավելվածներ մուտք գործելու համար պարզապես հպեք մատնահետքերի սկաներին: Այդ գործողությունները հնարավոր է անել ավելացված ցանկացած մատնահետքի միջոցով, այնպես որ մտածված ավելացրեք նոր մարդկանց մատնահետքերը:\n\nՆշում. այս սարքն ապակողպելու համար չեք կարող օգտագործել ձեր մատնահետքը: Լրացուցիչ տեղեկություններ ստանալու համար դիմեք ձեր կազմակերպության ադմինիստրատորին:"</string>
@@ -362,12 +361,12 @@
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Շարունակել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Բաց թողնել"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Ավելացնել մատնահետք"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս պլանշետի օգտագործումը՝ այն կորցնելու, գողանալու կամ բոլոր տվյալները ջնջվելու դեպքում:"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս սարքի օգտագործումը՝ այն կորցնելու, գողանալու կամ բոլոր տվյալները ջնջվելու դեպքում:"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս հեռախոսի օգտագործումը՝ այն կորցնելու, գողանալու կամ բոլոր տվյալները ջնջվելու դեպքում:"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս պլանշետի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս սարքի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Սարքի պաշտպանության գործառույթները չեն ակտիվացվելու: Դուք չեք կարողանա կանխել այլ անձանց կողմից այս հեռախոսի օգտագործումը՝ այն կորցնելու կամ գողանալու դեպքում:"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"	Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան կամ բոլոր տվյալները ջնջվեն, այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան կամ բոլոր տվյալները ջնջվեն, այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան կամ բոլոր տվյալները ջնջվեն, այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան, ապա այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան, այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Սարքի պաշտպանությունը չի ակտիվացվի: Եթե հեռախոսը կորցնեք կամ այն գողանան, ապա այն կկարողանան օգտագործել կողմնակի անձինք։"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Բաց թողնել"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Վերադառնալ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Գտեք սենսորը"</string>
@@ -436,7 +435,7 @@
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Չհաջողվեց վերծանել"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Մուտքագրած գաղտնաբառը ճիշտ է, բայց ձեր տվյալները վնասված են: \n\nՈրպեսզի նորից կարողանաք օգտագործել պլանշետը, պետք է կատարեք գործարանային վերակայում: Երբ կարգավորեք պլանշետը վերակայումից հետո, կկարողանաք վերականգնել Google հաշվում պահուստավորված տվյալները:"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Մուտքագրած գաղտնաբառը ճիշտ է, բայց ձեր տվյալները վնասված են: \n\nՈրպեսզի նորից կարողանաք օգտագործել հեռախոսը, պետք է կատարեք գործարանային վերակայում: Երբ կարգավորեք հեռախոսը վերակայումից հետո, կկարողանաք վերականգնել Google հաշվում պահուստավորված տվյալները:"</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Փոխարկել մուտքագրման եղանակը"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Փոխել ներածման եղանակը"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Էկրանի կողպման կարգավորում"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Պաշտպանեք ձեր սարքը"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Օգտագործել մատնահետք"</string>
@@ -446,7 +445,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="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"Ավելի ապահով լինելու համար սահմանեք էկրանի կողպման լրացուցիչ տարբերակ:"</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>
@@ -474,7 +473,7 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Մատնահետք + PIN կոդ"</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="fingerprint_unlock_title" msgid="2826226740306003991">"Կարող եք ապակողպել հեռախոսը մատնահետքի օգնությամբ: Անվտանգության նկատառումներից ելնելով այս ընտրանքը պահանջում է կարգավորել էկրանի կողպման լրացուցիչ տարբերակ:"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Անջատված է ադմինիստրատորի, գաղտնագրման քաղաքականության կամ հավատարմագրային պահոցի կողմից"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Ոչ մեկը"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Սահահարվածել"</string>
@@ -485,22 +484,22 @@
     <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" msgid="8869767290771023461">"Առանց ապակողպման նախշի սարքի պաշտպանության գործառույթները չեն աշխատի։"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց ապակողպման նախշի:<xliff:g id="EMPTY_LINE">
 
-</xliff:g>Ձեր պահված մատնահետքերը նույնպես կհեռացվեն այս սարքից: Ուստի չեք կարողանա ապակողպել հեռախոսը, կատարել գնումներ կամ մուտք գործել հավելվածներ:"</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց ձեր PIN կոդի:"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"Սարքի պաշտպանության գործառույթները չեն աշխատի առանց ձեր PIN կոդի:<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">
 
-</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">
+</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">
 
-</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">
+</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">
 
-</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">
 
@@ -606,7 +605,7 @@
     <string name="bluetooth_search_for_devices" msgid="2754007356491461674">"Թարմացնել"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Որոնում..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Սարքի կարգավորումները"</string>
-    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"Զուգավորված սարք"</string>
+    <string name="bluetooth_preference_paired_dialog_title" msgid="8875124878198774180">"Զուգակցված սարք"</string>
     <string name="bluetooth_preference_paired_dialog_name_label" msgid="8111146086595617285">"Անուն"</string>
     <string name="bluetooth_preference_paired_dialog_internet_option" msgid="7112953286863428412">"Ինտերնետ կապ"</string>
     <string name="bluetooth_preference_paired_dialog_keyboard_option" msgid="2271954176947879628">"Ստեղնաշար"</string>
@@ -615,7 +614,7 @@
     <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>
+    <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"Զուգակցված սարքեր"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"Հասանելի սարքեր"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"Հասանելի սարքեր չկան"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"Միանալ"</string>
@@ -671,11 +670,11 @@
     <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 Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Պատրաստ է փոխանցել ծրագրի բովանդակությունը NFC-ով"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Տվյալների փոխանակում NFC-ով"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Անջատած է"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Անհասանելի է, քանի որ NFC-ն անջատված է"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Երբ այս գործառույթը միացված է, կարող եք բովանդակություն ճառագայթել մեկ այլ NFC հնարավորությամբ սարքի` սարքերը միմյանց մոտ պահելով: Օրինակ` կարող եք ճառագայթել կայքէջեր, YouTube-ի տեսանյութեր, կոնտակտներ և ավելին:\n\nՊարզապես մոտեցրեք սարքերը միմյանց (հիմնականում հետևի մասերով իրար) և հպեք ձեր էկրանին: Հավելվածը կորոշի, թե ինչն է անհրաժեշտ ճառագայթել:"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Այս գործառույթը թույլ է տալիս մեկ սարքից մյուսին փոխանցել տարբեր տեսակի բովանդակություն (այդ թվում կոնտակտներ, վեբ էջեր և տեսանյութեր)՝ սարքերը միմյանց մոտ պահելով:\n\nՊարզապես մոտեցրեք սարքերը միմյանց (հիմնականում հետևի մասերով իրար) և հպեք ձեր էկրանին: Հավելվածը կորոշի, թե ինչ տվյալներ փոխանցել։"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Միացնել Wi-Fi-ը"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Անհասանելի է, քանի որ Wi‑Fi-ի որոնումն անջատված է"</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>
@@ -732,7 +732,7 @@
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi ցանցերը փնտրվում են…"</string>
     <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_setup_wps" msgid="8128702488486283957">"Ավտոմատ կարգավորում (WPS)"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Կազմաձևել 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Ենթացանցի դիմակ"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 հասցեներ"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Պահված ցանցեր"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP կարգավորումներ"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi-Fi-ի լրացուցիչ կարգավորումներն անհասանելի են այս օգտատիրոջը"</string>
@@ -919,7 +917,7 @@
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Թվաշարի հպման ձայներանգներ"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"Հպելու ձայներ"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Էկրանի կողպումն ազդարարող ձայն"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Հպելու դեպքում թրթռալ"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Հպման թրթռոց"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Աղմուկի նվազեցում"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Երաժշտություն, տեսանյութեր, խաղեր, &amp; այլ մեդիա"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Զանգերանգ &amp; ծանուցումներ"</string>
@@ -954,16 +952,16 @@
     <string name="search_settings_summary" msgid="9205656546570654169">"Կառավարել որոնման կարգավորումները և պատմությունը"</string>
     <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="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ինքնուրույն փոխել դիրքավորումը պլանշետը պտտելիս"</string>
-    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ինքնուրույն փոխել դիրքավորումը հեռախոսը պտտելիս"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Ավտոմատ պտտել էկրանը"</string>
+    <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Ավտոմատ փոխել դիրքավորումը պլանշետը պտտելիս"</string>
+    <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ավտոմատ փոխել դիրքավորումը հեռախոսը պտտելիս"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Գրասալիկը պտտեցնելիս ինքնաշխատ փոխել դիրքավորումը"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Փոխել դիրքավորումը ինքնաշխատ` հեռախոսը պտտեցնելիս"</string>
     <string name="brightness" msgid="8480105032417444275">"Պայծառության մակարդակ"</string>
     <string name="brightness_title" msgid="5746272622112982836">"Պայծառություն"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Կարգաբերել էկրանի պայծառությունը"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Հարմարողական պայծառություն"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Լույսի պայծառության մակարդակի լավարկում"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Փոխել պայծառությունն ըստ լուսավորվածության մակարդակի"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Անջատված է"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Նախընտրելի է շատ ցածր պայծառությունը"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Նախընտրելի է ցածր պայծառությունը"</string>
@@ -999,16 +997,16 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Ավտոմատ կերպով չի անջատվի:"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Ավտոմատ կերպով կանջատվի <xliff:g id="ID_1">%1$s</xliff:g>-ին:"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Ավտոմատ կերպով կանջատվի արևածագին:"</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Քնել"</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>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Փոխեք պաստառը"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Անհատականացրեք էկրանը"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Պաստառն ընտրել"</string>
-    <string name="screensaver_settings_title" msgid="1770575686476851778">"Էկրանի խնայարար"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Պաստառների տեղադրում"</string>
+    <string name="screensaver_settings_title" msgid="1770575686476851778">"Էկրանապահ"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Լիցքավորման կամ միակցած լինելու ընթացքում"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"Երկու դեպքում էլ"</string>
     <string name="screensaver_settings_summary_sleep" msgid="9086186698140423493">"Լիցքավորման ընթացքում"</string>
@@ -1017,16 +1015,15 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Անջատված է"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Միացրեք էկրանի խնայարարը և վերահսկեք հեռախոսի գործողությունները, երբ այն միակցված է կամ գտնվում է քնի ռեժիմում:"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Երբ սկսել"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Ընթացիկ էկրանի խնայում"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Մեկնարկել հիմա"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Կարգավորումներ"</string>
-    <string name="automatic_brightness" msgid="5014143533884135461">"Ինքնուրույն պայծառություն"</string>
+    <string name="automatic_brightness" msgid="5014143533884135461">"Ավտոմատ պայծառություն"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Բարձրացնել՝ միանալու համար"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Մուտքային ծանուցումների էկրան"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Քնելու ռեժիմի արգելք"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ակտիվացնում է էկրանը ծանուցումներ ստանալու դեպքում"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Տառաչափ"</string>
-    <string name="short_summary_font_size" msgid="6819778801232989076">"Խոշորացնել կամ մանրացնել տեքստը"</string>
+    <string name="short_summary_font_size" msgid="6819778801232989076">"Տառաչափի մեծացում կամ փոքրացում"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"SIM քարտի կողպման կարգավորումներ"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM քարտի կողպում"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Անջատված է"</string>
@@ -1083,7 +1080,7 @@
     <string name="device_status" msgid="607405385799807324">"Կարգավիճակ"</string>
     <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Մարտկոցի, ցանցի կարգավիճակը և այլ տվյալներ"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Հեռախոսահամարը, ազդանշանը և այլն"</string>
-    <string name="storage_settings" msgid="4211799979832404953">"Պահոց"</string>
+    <string name="storage_settings" msgid="4211799979832404953">"Հիշողություն"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Հիշողություն"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Պահեստային կարգավորումներ"</string>
     <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"Անջատել USB կրիչը, դիտել հասանելի պահոցը"</string>
@@ -1151,7 +1148,7 @@
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD քարտը կանջատվի"</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>
@@ -1229,7 +1226,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Լուսանկարներ, ֆայլեր և հավելվածների տվյալներ այս սարք տեղափոխելու համար գնացեք Կարգավորումներ և Պահոց:"</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>
@@ -1350,8 +1347,8 @@
     <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="sms_application_title" msgid="4903928270533250448">"SMS հավելված"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Փոխե՞լ SMS ծրագիրը:"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS-ի հավելված"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Փոխե՞լ SMS հավելվածը"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Որպես SMS ծրագիր` <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ի փոխարեն օգտագործե՞լ <xliff:g id="NEW_APP">%1$s</xliff:g>-ը:"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Որպես SMS ծրագիր` օգտագործե՞լ <xliff:g id="NEW_APP">%s</xliff:g>-ը:"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Ցանցի վարկանիշի ծառայության մատակարար"</string>
@@ -1371,20 +1368,20 @@
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Միայն սարքը"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Տեղադրությունն անջատված"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Հավելվածների թույլտվություններ"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Տեղադրության վերջին հարցումները"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Տեղորոշման վերջին հարցումները"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Որևէ ծրագիր տեղադրության հարցում չի կատարել վերջերս"</string>
-    <string name="location_category_location_services" msgid="7437150886946685979">"Տեղադրության ծառայություններ"</string>
+    <string name="location_category_location_services" msgid="7437150886946685979">"Տեղորոշման ծառայություններ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Մարտկոցի շատ օգտագործում"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Մարտկոցի քիչ օգտագործում"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"Տեղադրության ռեժիմ"</string>
-    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Տեղադրությունը որոշելու համար օգտագործել GPS, Wi‑Fi, Bluetooth կամ բջջային ցանցեր"</string>
-    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Տեղադրությունը որոշելու համար օգտագործել Wi‑Fi, Bluetooth կամ բջջային ցանցեր"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Տեղադրությունը որոշելու համար օգտագործել GPS-ը"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Վերլուծում"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Մարտկոցի ցածր սպառում"</string>
+    <string name="location_mode_screen_title" msgid="4528716772270246542">"Տեղորոշում"</string>
+    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Տեղորոշելու համար օգտագործել GPS, Wi‑Fi, Bluetooth կամ բջջային ցանցեր"</string>
+    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Տեղորոշելու համար օգտագործել Wi‑Fi, Bluetooth կամ բջջային ցանցեր"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Տեղորոշելու համար օգտագործել GPS-ը"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Սկանավորում"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ցանցերի որոնում"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Բարելավեք տեղադրության որոնումը՝ թույլատրելով համակարգի հավելվածներին և ծառայություններին ցանկացած պահի հայտնաբերել Wi‑Fi ցանցերը:"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Բարելավեք տեղորոշումը՝ թույլատրելով համակարգի հավելվածներին և ծառայություններին ցանկացած պահի հայտնաբերել Wi‑Fi ցանցերը:"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth սարքերի որոնում"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Բարելավեք տեղադրության որոնումը՝ թույլատրելով համակարգի հավելվածներին և ծառայություններին ցանկացած պահի հայտնաբերել Bluetooth սարքեր:"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Բարելավեք տեղորոշումը՝ թույլատրելով համակարգի հավելվածներին և ծառայություններին ցանկացած պահի հայտնաբերել Bluetooth սարքեր:"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; շարժական ցանցի տեղադրություն"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Թույլատրել ծրագրերին օգտագործել Google-ի տեղակայման ծառայությունները` ձեր տեղադրությունը ավելի արագ որոշելու համար: Անանուն տեղակայման տվյալները կհավաքագրվեն և կուղարկվեն Google-ին:"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Տեղադրությունը որոշված է Wi‑Fi-ի օգնությամբ"</string>
@@ -1416,7 +1413,7 @@
     <string name="wallpaper_attributions_values" msgid="2996183537914690469">"Արբանյակային պատկերների մատակարարներ՝\n©2014 CNES / Astrium, DigitalGlobe, Bluesky"</string>
     <string name="settings_manual_activity_title" msgid="8133150693616006051">"Ձեռքով"</string>
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"Ձեռնարկը բեռնելու խնդիր կա:"</string>
-    <string name="settings_license_activity_title" msgid="8525014571806471216">"Երրորդ կողմի լիցենզիաներ"</string>
+    <string name="settings_license_activity_title" msgid="8525014571806471216">"Երրորդ կողմի արտոնագրեր"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"Խնդիր կա լիցենզիաները բեռնելիս:"</string>
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"Բեռնում...."</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Անվտանգության տեղեկատվություն"</string>
@@ -1431,7 +1428,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Հաստատեք ձեր PIN-ը"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Գաղտնաբառերը չեն համընկնում"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-երը չեն համընկնում"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ապակողպել ընտրությունը"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ապակողպման եղանակը"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Գաղտնաբառը սահմանված է"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-ը սահմանված է"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Նախշը կարգավորված է"</string>
@@ -1469,8 +1466,8 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Օգտագործել նախշ՝ հեռախոսը պաշտպանելու համար"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Նախշը տեսանելի դարձնել"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Պրոֆիլի նախշը տեսանելի դարձնել"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Հպելու դեպքում թրթռալ"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Հոսանքի կոճակը անկնթարթորեն կողպվում է"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Հպման թրթռոց"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Սնուցման կոճակը անկնթարթորեն կողպվում է"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"Բացառությամբ, երբ ապակողպված է պահվում <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>-ի կողմից"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Ստեղծել նախշ"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Փոխել ապակողպող նախշը"</string>
@@ -1489,7 +1486,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Նույնը, ինչ սարքի էկրանի փականը"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Կարգավորել հավելվածները"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Կառավարել և հեռացնել տեղադրված ծրագրերը"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Հավելվածի մասին տեղեկություններ"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Տեղեկություններ հավելվածների մասին"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Կառավարել հավելվածները, կարգավորել արագ գործարկման դյուրանցումները"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ծրագրային կարգավորումներ"</string>
     <string name="install_applications" msgid="4872012136210802181">"Անհայտ աղբյուրներ"</string>
@@ -1499,7 +1496,7 @@
     <string name="advanced_settings" msgid="1777249286757067969">"Ընդլայնված կարգավորումներ"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Միացնել այլ կարգավորման ընտրանքներ"</string>
     <string name="application_info_label" msgid="5736524913065714880">"Ծրագրի տեղեկությունները"</string>
-    <string name="storage_label" msgid="8700867073480107253">"Պահոց"</string>
+    <string name="storage_label" msgid="8700867073480107253">"Հիշողություն"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Բացել ըստ կանխադրվածի"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"Լռելյայններ"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Էկրանի համատեղելիություն"</string>
@@ -1523,7 +1520,7 @@
     <string name="uninstall_text" msgid="3644892466144802466">"Ապատեղադրել"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Ապատեղադրել բոլոր օգտատերերի համար"</string>
     <string name="install_text" msgid="884360662922471113">"Տեղադրել"</string>
-    <string name="disable_text" msgid="6544054052049395202">"Կասեցնել"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Անջատել"</string>
     <string name="enable_text" msgid="9217362512327828987">"Միացնել"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ջնջել տվյալները"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Ապատեղադրել թարմացումները"</string>
@@ -1548,7 +1545,7 @@
     <string name="filter" msgid="2018011724373033887">"Զտիչ"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Ընտրել զտիչի ընտրանքները"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"Բոլոր հավելվածները"</string>
-    <string name="filter_apps_disabled" msgid="5862632369555319938">"Անջատված հավելվածները"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Անջատած հավելվածներ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Ներբեռնված"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Աշխատեցվում է"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB կրիչ"</string>
@@ -1562,13 +1559,13 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB կրիչ"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD քարտի պահոց"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Չափի վերահաշվարկում…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Մաքրե՞լ ծրագրային տվյալները:"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"Մաքրե՞լ հավելվածների տվյալները:"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"Այս ծրագրի բոլոր տվյալները մշտապես կջնջվեն: Այն կներառի բոլոր ֆայլերը, կարգավորումները, հաշիվները, տվյալների շտեմարանները և այլն:"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Լավ"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"Չեղարկել"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"Հավելվածը չի գտնվել տեղադրված հավելվածների ցանկում:"</string>
-    <string name="clear_data_failed" msgid="7214074331627422248">"Չհաջողվեց մաքրել ծրագրային տվյալները:"</string>
+    <string name="clear_data_failed" msgid="7214074331627422248">"Չհաջողվեց մաքրել հավելվածների տվյալները:"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"Մաքրել տվյալները"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"Տվյալների ջնջումը ծրագրից չհաջողվեց:"</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Այս հավելվածը պլանշետի վրա կարող է մատչել հետևյալը`"</string>
@@ -1599,8 +1596,8 @@
     <string name="invalid_location" msgid="4354595459063675191">"Տեղադրման տեղադրությունը վավեր չէ:"</string>
     <string name="system_package" msgid="1352722848400644991">"Համակարգի թարմացումները հնարավոր չէ տեղադրել արտաքին մեդիայի վրա:"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Սարքի ադմինիստրատորի հավելվածը չի կարող տեղադրվել արտաքին կրիչի վրա"</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"Ստիպողաբար դադարեցնե՞լ:"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Եթե ստիպողաբար դադարեցնեք հավելվածը, հնարավոր է այն լավ չգործի:"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"Ստիպողաբար դադարեցնե՞լ"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Հավելվածի ստիպողական դադարեցումը կարող է ազդել դրա աշխատանքի վրա։"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Հնարավոր չեղավ տեղափոխել հավելվածը: <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Տեղադրման նախընտրած վայրը"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Օգտագործված չէ)"</string>
@@ -1668,16 +1666,16 @@
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Ստեղնաշար և մուտքագրման եղանակներ"</string>
     <string name="phone_language" msgid="7116581601133118044">"Լեզուներ"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
-    <string name="auto_replace" msgid="6199184757891937822">"Ինքնուրույն փոխարինում"</string>
+    <string name="auto_replace" msgid="6199184757891937822">"Ավտոմատ փոխարինում"</string>
     <string name="auto_replace_summary" msgid="370288728200084466">"Ուղղել սխալ գրված բառերը"</string>
     <string name="auto_caps" msgid="6379232078052591265">"Ինքնագլխատառացում"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"Նախադասությունները սկսել մեծատառով"</string>
-    <string name="auto_punctuate" msgid="4595367243950425833">"Ինքնուրույն կետադրում"</string>
+    <string name="auto_punctuate" msgid="4595367243950425833">"Ավտոմատ կետադրում"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Ֆիզիկական ստեղնաշարի կարգավորումներ"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Սեղմեք Բացակի ստեղնը երկու անգամ «.»-ի ներմուծման համար"</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>
@@ -1687,12 +1685,11 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Ստեղնաշարի օգնական"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Ֆիզիկական ստեղնաշար"</string>
     <string name="show_ime" msgid="2658582193437188227">"Ցույց տալ վիրտուալ ստեղնաշարը"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"Պահել էկրանին մինչդեռ ֆիզիկական ստեղնաշարն ակտիվ է"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Պահել էկրանին, երբ ֆիզիկական ստեղնաշարն ակտիվ է"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ստեղնային դյուրանցումների օգնական"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Ցուցադրել առկա դյուրանցումները"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Կանխադրված"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Մկնիկ/սենսորային ծածկույթ"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"Ցուցչի արագությունը"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Նշորդի արագությունը"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Խաղերի կարգավորիչ"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Օգտագործել թրթռոցը"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Վերաուղղորդել թրթռիչը խաղի վերահսկողին միացված ժամանակ:"</string>
@@ -1760,48 +1757,48 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Մատչելիության կարգավորումներ"</string>
     <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_description" msgid="5679491180156408260">"Օգտվեք հատուկ հնարավորություններից՝ հարմար աշխատանքի համար։ Այս գործառույթները կարող եք փոփոխել սարքի կարգավորումներում։"</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>
-    <string name="interaction_control_category_title" msgid="7836591031872839151">"Փոխազդման կառավարներ"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"Կառավարման տարրեր"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Ներբեռնված ծառայություններ"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"Փորձնական"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"Էկրանի ընթերցիչը նախատեսված է առաջին հերթին կույր կամ վատ տեսողություն ունեցող մարդկանց համար"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Հպեք էկրանին ցուցադրվող տարրերին՝ դրանց նկարագրությունը բարձրաձայն լսելու համար"</string>
-    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Խորագրեր"</string>
+    <string name="accessibility_captioning_title" msgid="7589266662024836291">"Ենթագրեր"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Խոշորացում"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Խոշորացնել եռակի հպման միջոցով"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Խոշորացում եռակի հպման միջոցով"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Խոշորացում կոճակի օգնությամբ"</string>
-    <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Խոշորացնել կոճակի կամ եռակի հպելու օգնությամբ"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Մեծացնել էկրանի վրա"</string>
-    <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_state_navbar_gesture" msgid="2760906043221923793">"Խոշորացում կոճակի կամ եռակի հպման միջոցով"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Խոշորացույց էկրանի վրա"</string>
+    <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_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_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_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_title" msgid="7218498768415430963">"Ավտոմատ թարմացնել էկրանի խոշորությունը"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_summary" msgid="4392059334816220155">"Թարմացնել էկրանի խոշորությունը ծրագրի տարանցումների վրա"</string>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Հոսանքի կոճակը ավարտում է զանգը"</string>
-    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Մկնիկի խոշոր նշիչ"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Սնուցման կոճակը ավարտում է զանգը"</string>
+    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Մկնիկի խոշոր նշորդ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Մոնո ձայն"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Ձայնանյութ նվագարկելիս միավորել ալիքները"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Հպելու և սեղմած պահելու հապաղումը"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Սեղմելու և պահելու հապաղումը"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Գունաշրջում"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Կարող է ազդել աշխատանքի վրա"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Սեղմել նշորդը կանգ առնելուց հետո"</string>
+    <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>
-    <string name="daltonizer_type" msgid="1124178250809091080">"Շտկման տեսակ"</string>
+    <string name="daltonizer_type" msgid="1124178250809091080">"Շտկման ռեժիմը"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
       <item quantity="one">Չափազանց կարճ հապաղում (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> մվ)</item>
       <item quantity="other">Չափազանց կարճ հապաղում (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> մվ)</item>
@@ -1823,7 +1820,7 @@
       <item quantity="other">Շատ երկար հապաղում (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> մվ)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Կարգավորումներ"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Միացված"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Միացված է"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Անջատված է"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"Նախադիտում"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"Սովորական ընտրանքներ"</string>
@@ -1855,16 +1852,16 @@
     <string name="color_cyan" msgid="7033027180641173211">"Երկնագույն"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Դեղին"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Մանուշակագույն"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ը պահանջում է`"</string>
+    <string name="enable_service_title" msgid="3061307612673835592">"Օգտագործե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>-ին անհրաժեշտ է`"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Քանի որ ներածումն արգելափակված է ինչ-որ հավելվածի կողմից, Կարգավորումները չեն կարող հաստատել ձեր պատասխանը:"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Եթե ​​միացնեք <xliff:g id="SERVICE">%1$s</xliff:g>-ը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների կոդավորումը լավացնելու համար:"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Քանի որ միացրել եք մատչելիության ծառայությունը, ձեր սարքը չի օգտագործի էկրանի կողպումը՝ տվյալների կոդավորումը լավացնելու համար:"</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների կոդավորմանը, դուք պետք է հաստատեք ձեր ապակողպման նախշը:"</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների կոդավորմանը, դուք պետք է հաստատեք ձեր PIN-ը:"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Քանի որ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայության միացումն ազդում է տվյալների կոդավորմանը, դուք պետք է հաստատեք ձեր գաղտնաբառը:"</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Տեսնել ձեր գործողությունները"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Ստանալ ծանուցումներ ծրագրի հետ փոխազդման ընթացքում:"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Մշակել ձեր գործողությունները"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Ստանալ ծանուցումներ հավելվածում կատարվող գործողությունների մասին"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Դադարեցնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Լավ կոճակին հպումը կդադարեցնի <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը:"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Տեղադրված ծառայաթյուններ չկան"</string>
@@ -1875,9 +1872,9 @@
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Անջատված է"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> տպելու ծառայություն միացված է</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> տպման ծառայություն միացված է</item>
     </plurals>
-    <string name="print_settings_title" msgid="3685449667822217816">"Տպելու ծառայություններ"</string>
+    <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_menu_item_settings" msgid="6591330373682227082">"Կարգավորումներ"</string>
@@ -1907,16 +1904,16 @@
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"մնում է <xliff:g id="REMAIN">%1$s</xliff:g>"</string>
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> մինչև լիցաքավորվելը"</string>
-    <string name="background_activity_title" msgid="8618384801540759730">"Ֆոնային գործունեություն"</string>
+    <string name="background_activity_title" msgid="8618384801540759730">"Աշխատանքը ֆոնային ռեժիմում"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"Թույլ տալ հավելվածին աշխատել ֆոնային ռեժիմում"</string>
-    <string name="background_activity_summary_on" msgid="649282072540085599">"Չօգտագործելու դեպքում հավելվածը կարող է աշխատել ֆոնում"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"Չօգտագործելու դեպքում հավելվածը կարող է աշխատել ֆոնային ռեժիմում"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Չօգտագործելու դեպքում հավելվածի ֆոնային գործողությունները սահմանափակ են"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Հավելվածին չի թույլատրվում աշխատել ֆոնում"</string>
     <string name="device_screen_usage" msgid="3386088035570409683">"Էկրանի օգտագործումը վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Էկրան"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Բջջային ցանցի որոնում"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> առաջ"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Հավելվածի օգտագործումը լրիվ լիցքավորումից հետո (<xliff:g id="TIME">%1$s</xliff:g> առաջ)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> առաջ"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Հավելվածների օգտագործումը լրիվ լիցքավորումից հետո (<xliff:g id="TIME">^1</xliff:g> առաջ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Ժամանակը, որի ընթացքում էկրանը միացած է եղել լրիվ լիցքավորումից հետո"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Սարքի օգտագործումը վերջին լրիվ լիցքավորումից հետո"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Մարտկոցի օգտագործման չափը անջատումից հետո"</string>
@@ -1944,10 +1941,10 @@
     <string name="packages_subtitle" msgid="4736416171658062768">"Ներառված փաթեթները"</string>
     <string name="power_screen" msgid="3023346080675904613">"Էկրան"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"Լապտեր"</string>
-    <string name="power_camera" msgid="4976286950934622605">"Ֆոտոխցիկ"</string>
+    <string name="power_camera" msgid="4976286950934622605">"Տեսախցիկ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Բջիջը սպասման կարգավիճակում է"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Բջջային ցանցի սպասման կարգավիճակ"</string>
     <string name="power_phone" msgid="5392641106474567277">"Ձայնային զանգեր"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Սպասման ռեժիմ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Սպասման ռեժիմ"</string>
@@ -1971,7 +1968,7 @@
     <string name="usage_type_data_wifi_recv" msgid="5678475911549183829">"Ստացված Wi-Fi փաթեթներ"</string>
     <string name="usage_type_audio" msgid="6957269406840886290">"Աուդիո"</string>
     <string name="usage_type_video" msgid="4295357792078579944">"Տեսանյութ"</string>
-    <string name="usage_type_camera" msgid="8299433109956769757">"Ֆոտոխցիկ"</string>
+    <string name="usage_type_camera" msgid="8299433109956769757">"Տեսախցիկ"</string>
     <string name="usage_type_flashlight" msgid="1516392356962208230">"Լապտեր"</string>
     <string name="usage_type_on_time" msgid="3351200096173733159">"Ժամանակը միացման պահից"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"Ժամանակը առանց ազդանշանի"</string>
@@ -2007,13 +2004,13 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Մարտկոցի օգտագործումը ծախսված հոսանքի մոտավոր հաշվարկն է և չի ներառում մարտկոցի ողջ սպառումը: Տարաբնույթ ծախսերը ցույց են տալիս հոսանքի հաշվարկված ծախսի և իրական ծախսի տարբերությունը:"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Մարտկոցի գերօգտագործում"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Օգտագործվել է %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Օգտագործվել է <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_detail_foreground" msgid="3350401514602032183">"Ակտիվ օգտագործման ժամանակ"</string>
+    <string name="battery_footer_summary" msgid="4701358808575132647">"Աշխատանքի մնացած ժամանակը մոտավոր է և կարող է փոխվել՝ կախված օգտագործումից"</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>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"Հավելվածների ընդհանուր օգտագործման <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g> մԱժ)"</string>
@@ -2029,8 +2026,8 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Մեդիասերվեր"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Հավելվածի օպտիմալացում"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Մարտկոցի էներգախնայիչ"</string>
-    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ավտոմատ միանալ"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Մարտկոցի տնտեսման ռեժիմ"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ավտոմատ միացնել"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Երբեք"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"մատկոցի <xliff:g id="PERCENT">%1$s</xliff:g> լիցքի դեպքում"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Մարտկոցի լիցքի տոկոսը"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ձայնի մուտքի &amp; ելքի կարգավորումներ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ձայնային որոնում"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android ստեղնաշար"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Խոսք"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Ձայնային ներածման կայանքներ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Ձայնային ներածում"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ձայնային ներածման ծառայություններ"</string>
@@ -2154,9 +2150,9 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Անձնական տվյալներ"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Պահուստավորել իմ տվյալները"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Պահուստավորել հավելվածի տվյալները, Wi-Fi գաղտնաբառերը և Google սերվերների այլ կարգավորումները"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Պահուստավորել հաշիվը"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Պահուստային հաշիվ"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Ներառել ծրագրի տվյալները"</string>
-    <string name="auto_restore_title" msgid="5397528966329126506">"Ինքնուրույն վերականգնում"</string>
+    <string name="auto_restore_title" msgid="5397528966329126506">"Ավտոմատ վերականգնում"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Այս ծրագիրը ապատեղադրելու համար վերականգնեք կարգավորումները և տվյալները"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"Պահուստավորման ծառայությունը ակտիվ չէ"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Պահուստավորված տվյալներով հաշիվ չկա ներկայումս"</string>
@@ -2338,13 +2334,13 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Միացնե՞լ տվյալների ինքնահամաժամեցումը:"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Ոստայնում ձեր հաշվի մեջ կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր պլանշետում:\n\nՈրոշ հաշիվներ կարող են պլանշետով կատարած փոփոխություններն ավտոմատ պատճենել ոստայնում: Google հաշիվն աշխատում է հենց այդպես:"</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Ոստայնում ձեր հաշվի մեջ կատարած ցանկացած փոփոխություն ավտոմատ կպատճենվի ձեր հեռախոսում:\n\nՈրոշ հաշիվներ կարող են հեռախոսով կատարած փոփոխություններն ավտոմատ պատճենել ոստայնում: Google հաշիվն աշխատում է հենց այդպես:"</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Անջատե՞լ տվյալների ինքնահամաժամեցումը:"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Սա կպահպանի տվյալներն ու մարտկոցի օգտագործման չափը, բայց դուք պետք է ձեռքով համաժամեցնեք ամեն մի հաշիվ` նախկին տեղեկատվությունը հավաքելու համար: Թարմացումների դեպքում ծանուցումներ չեք ստանալու:"</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Տվյալների աշխատաշրջանի ամսաթվի վերասահմանում"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ամենամսյա ամսաթիվ`"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Կարգավորել"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Անջատե՞լ ինքնահամաժամեցումը"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Դա կկրճատի թրաֆիկն ու մարտկոցի օգտագործման չափը, սակայն նոր տվյալներ ստանալու համար անհրաժեշտ կլինի ձեռքով համաժամեցնել յուրաքանչյուր հաշիվ։ Թարմացումների մասին ծանուցումներ չեն ցուցադրվի։"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Վիճակագրության վերակայում"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ամսվա օրը`"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Պահել"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Սահմանել տվյալների օգտագործման նախազգուշացում"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Կարգավորել տվյալների օգտագործման սահմանը"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Թրաֆիկի օգտագործման սահմանը"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Սահմանափակել տվյալների օգտագործումը"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Նշված սահմանաչափն անցնելու դեպքում պլանշետը կանջատի բջջային ինտերնետը։\n\nՔանի որ տվյալների օգտագործումը չափում է պլանշետը, իսկ օպերատորի հաշվարկները կարող են տարբերվել, խորհուրդ ենք տալիս նշել նախատեսվածից ցածր սահմանաչափ։"</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Նշված սահմանաչափն անցնելու դեպքում հեռախոսը կանջատի բջջային ինտերնետը։\n\nՔանի որ տվյալների օգտագործումը չափում է հեռախոսը, իսկ օպերատորի հաշվարկները կարող են տարբերվել, խորհուրդ ենք տալիս նշել նախատեսվածից ցածր սահմանաչափ։"</string>
@@ -2361,11 +2357,11 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>` մոտավորապես <xliff:g id="TOTAL">%1$s</xliff:g> է օգտագործված` ըստ պլանշետի չափման: Օպերատորի հաշիվների տվյալները կարող են այլ լինել:"</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>` մոտավորապես <xliff:g id="TOTAL">%1$s</xliff:g> օգտագործված է` ըստ հեռախոսի տվյալների: Օպերատորի տվյալները կարող են տարբերվել:"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Ցանցային սահմանափակումներ"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Երբ ֆոնային տվյալների օգտագործումը սահմանափակված է, չափված ցանցերը դիտարկվում են որպես բջջային ցանցեր: Ծավալուն ներբեռնումների դեպքում հավելվածները կարող են զգուշացնել՝ այս ցանցերն օգտագործելուց առաջ:"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Եթե ֆոնային ռեժիմում տվյալների փոխանցումը սահմանափակ է, ապա սահմանափակումներով ցանցերը դիտարկվում են որպես բջջային ցանցեր: Մեծ ծավալի ներբեռնումների դեպքում հավելվածներում զգուշացում է ցուցադրվում՝ նախքան այսպիսի ցանց օգտագործելը։"</string>
     <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" msgid="1761738002328299714">"Սահմանափակ Wi-Fi ցանցեր"</string>
     <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Չափված ցանցեր ընտրելու համար միացրեք Wi‑Fi-ը:"</string>
-    <string name="data_usage_disclaimer" msgid="6887858149980673444">"Օպերատորի հաշվարկը տվյալների կապի վերաբերյալ կարող է տարբերվել սարքի հաշվարկից:"</string>
+    <string name="data_usage_disclaimer" msgid="6887858149980673444">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի վիճակագրությունից։"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Շտապ կանչ"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Վերադառնալ զանգին"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Անուն"</string>
@@ -2449,11 +2445,11 @@
     <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="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="spellcheckers_settings_title" msgid="399981228588011501">"Ուղղագրիչ"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Մուտքագրեք ընթացիկ գաղտնաբառը"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Մուտքագրեք նոր գաղտնաբառը"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Կրկին մուտքագրեք նոր գաղտնաբառը"</string>
+    <string name="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>
@@ -2497,7 +2493,7 @@
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"Դուք կարող եք սահմանափակել մուտքի իրավունքը ծրագրեր և ձեր հաշվի բովանդակություն:"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"Օտատեր"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Սահմանափակված պրոֆիլ"</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">"Ավելացնե՞լ նոր օգտատեր:"</string>
+    <string name="user_add_user_title" msgid="2108112641783146007">"Ավելացնե՞լ նոր օգտատեր"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Ավելացնելով հավելյալ օգտատերներ՝ սարքը կարող եք համօգտագործել այլ մարդկանց հետ: Ամեն մի օգտատեր կունենա իր սեփական տարածքը, որը կարող է հարմարեցնել իր հավելվածներով, պաստառով և այլ բաներով: Օգտատերերը կարող են նաև կարգաբերել Wi‑Fi-ի և սարքի այլ կարգավորումները, որոնք առնչվում են բոլորին:\n\nԵրբ նոր օգտատեր եք ավելացնում, նա պետք է կարգավորի իր տարածքը:\n\nՑանկացած օգտատեր կարող է թարմացնել բոլոր օգտատերների հավելվածները:"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"Երբ նոր օգտատեր եք ավելացնում, նա պետք է կարգավորի իր պրոֆիլը:\n\nՑանկացած օգտատեր կարող է թարմացնել հավելվածները մյուս բոլոր հաշիվների համար:"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Ստեղծե՞լ օգտատեր հիմա:"</string>
@@ -2510,18 +2506,18 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Սահմանափակված պրոֆիլները չեն կարող հաշիվներ ավելացնել"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Ջնջել <xliff:g id="USER_NAME">%1$s</xliff:g>-ին այս սարքից"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Էկրանի կողպման կարգավորումները"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ավելացնել օգտվողներ կողպէկրանից"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Ավելացնել օգտատերեր կողպէկրանից"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Նոր օգտատեր"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Նոր պրոֆիլ"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Ջնջե՞լ ձեզ:"</string>
-    <string name="user_confirm_remove_title" msgid="1163721647646152032">"Հեռացնե՞լ այս օգտատիրոջը:"</string>
+    <string name="user_confirm_remove_title" msgid="1163721647646152032">"Հեռացնե՞լ այս օգտատիրոջը"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Հեռացնե՞լ այս պրոֆիլը:"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Հեռացնե՞լ աշխ. պրոֆիլը:"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"Դուք կկորցնեք ձեր պլանշետի տարածքը և տվյալները: Դուք կարող եք հետարկել այս գործողությունը:"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"Դուք կկորցնեք հեռախոսի վրա պահպանվող ձեր տարածքն ու տվյալները: Այս գործընթացն անշրջելի է:"</string>
-    <string name="user_confirm_remove_message" msgid="1020629390993095037">"Բոլոր ծրագրերը և տվյալները կջնջվեն:"</string>
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"Բոլոր հավելվածներն ու տվյալները կջնջվեն:"</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"Շարունակելու դեպքում այս պրոֆիլի բոլոր հավելվածներն ու տվյալները կջնջվեն:"</string>
-    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"Բոլոր ծրագրերը և տվյալները կջնջվեն:"</string>
+    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"Բոլոր հավելվածներն ու տվյալները կջնջվեն:"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"Նոր օգտատիրոջ ավելացում…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"Ջնջել օգտատիրոջը"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"Ջնջել"</string>
@@ -2531,14 +2527,14 @@
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Այս աշխատաշրջանի բոլոր ծրագրերն ու տվյալները կջնջվեն:"</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Հեռացնել"</string>
     <string name="user_enable_calling" msgid="5128605672081602348">"Միացնել հեռախոսազանգերը"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Թույլատրել զանգերն ու SMS-ները"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Միացնել զանգերն ու SMS-ները"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Հեռացնել օգտատիրոջը"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Միացնե՞լ հեռախոսազանգերը:"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Զանգերի պատմությունը կհամօգտագործվի այս օգտատիրոջ հետ:"</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Միացնե՞լ հեռախոսազանգերն ու SMS-ները:"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Զանգերի և SMS-ների պատմությունը հասանելի կլինի այս օգտատիրոջը:"</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Անհետաձգելի բուժօգնության տվյալներ"</string>
-    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> օգտվողի տվյալները և կոնտակտները"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Անձնական բուժտվյալներ"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> օգտատիրոջ տվյալներն ու կոնտակտները"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Թույլատրել ծրագրերը և բովանդակությունը"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Սահմանափակումներով ծրագրեր"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"Ընդլայնել ծրագրի կարգավորումները"</string>
@@ -2548,13 +2544,13 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Հպել ու վճարել"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Ինչպես է այն աշխատում"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Վճարեք հեռախոսի միջոցով խանութներում"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Վճարման կանխադրված կարգավորումներ"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Վճարման հիմնական հավելվածը"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Կարգավորված չէ"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Օգտագործել կանխադրվածը"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Միշտ"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Բացի այն դեպքերից, երբ վճարումների այլ հավելված է բացված"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"«Հպեք և վճարեք» տերմինալում կատարեք գնումներ վճարումների հետևյալ հավելվածներով՝"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"«Հպել ու վճարել» տերմինալում օգտագործել"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Վճարում տերմինալով"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Տեղադրեք վճարումների որևէ հավելված: Ապա պարզապես մոտեցրեք հեռախոսը հետևի մասով ցանկացած տերմինալի՝ առանց կոնտակտի նշանը դեպի տերմինալը:"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Պարզ է"</string>
@@ -2582,12 +2578,12 @@
     <string name="call_manager_title" msgid="4479949569744516457">"Զանգերի կառավարիչ"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
-    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Արտակարգ իրավիճակների ժամանակ հեռարձակում"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Ծանուցում արտակարգ իրավիճակների մասին"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Կապի օպերատորներ"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Մատչման կետերի անունները"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Ընդլայնված 4G LTE ռեժիմ"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"Օգտագործեք LTE տվյալների կապը՝ ձայնի և հաղորդակցման որակը բարձրացնելու համար (Խորհուրդ է տրվում)"</string>
-    <string name="preferred_network_type_title" msgid="3431041717309776341">"Նախընտրելի ցանցի տեսակը"</string>
+    <string name="preferred_network_type_title" msgid="3431041717309776341">"Ցանցի նախընտրելի տեսակը"</string>
     <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (խորհուրդ է տրվում)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"Աշխատանքային SIM"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"Ծրագրերի և բովանդակության մուտք"</string>
@@ -2658,7 +2654,7 @@
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"Ցանց և ինտերնետ"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, շարժական, տվյալների օգտագործում, թեժ կետ"</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">"Bluetooth, Cast, NFC"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Հավելվածներ և ծանուցումներ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Թույլտվություններ, կանխադրված հավելվածներ"</string>
@@ -2731,15 +2727,17 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ծանուցման ձայնի բարձրություն"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Հեռախոսի զանգերանգ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Ծանուցման կանխադրված ձայնը"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Հավելվածի տրամադրված ձայնը"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Ծանուցման կանխադրված ձայնը"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Զարթուցիչի կանխադրված ձայնը"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Նաև թրթռալ զանգերի ժամանակ"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Թրթռոց զանգերի ժամանակ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Այլ ձայներ"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Թվաշարի հնչերանգները"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Թվաշարի հնչերանգներ"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Էկրանի կողպման ձայներ"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Լիցքավորման ազդանշաններ"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Միակցման ձայներ"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Հպման ձայներ"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Հպելու դեպքում թրթռալ"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Հպման թրթռոց"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Նվագարկել միակցիչի բարձրախոսով"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Բոլոր աուդիոֆայլերը"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Միայն մեդիակրիչի աուդիոֆայլերը"</string>
@@ -2747,19 +2745,19 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Զգուշացում"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Թրթռալ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Միացման ձայներ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Միացված ավտոմատ կանոններ չկան"</string>
+    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"Կանոններ չկան"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
       <item quantity="one"><xliff:g id="ON_COUNT">%d</xliff:g> automatic rules turned on</item>
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ավտոմատ կանոն միացված է</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Չանհանգստացնելու ռեժիմի կարգավորումներ"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"«Չանհանգստացնել» ռեժիմի կարգավորումներ"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Միայն կարևորները"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Ինքնաշխատ կանոններ"</string>
+    <string name="zen_mode_automation_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_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>
+    <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Կատարյալ լռություն"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>՝ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
     <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Արգելափակել տեսողական ծանուցումները"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Աշխատանքային պրոֆիլի ձայները"</string>
@@ -2781,7 +2779,7 @@
     <string name="profile_section_header" msgid="2320848161066912001">"Աշխատանքային ծանուցումներ"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Թարթող լույս"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Կողպէկրանին"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ցուցադրել ծանուցման ողջ բովանդակությունը"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ցուցադրել ամբողջ ծանուցումը"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Թաքցնել անձնական տեղեկությունները"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Չցուցադրել ծանուցումներ"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Ընտրեք ծանուցումների ցուցադրման ռեժիմը կողպված սարքում։"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Երբեք չցուցադրել ծանուցումները"</string>
@@ -2799,23 +2798,23 @@
     <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_min_summary" msgid="8233873580287975662">"Ցածր՝ առանց ձայնի և տեսողական ընդհատումների"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Միջին՝ առանց ձայնի"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Բարձր՝ ձայն հանել"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Հրատապ՝ ձայն հանել և ցուցադրել էկրանին"</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="6585849855452076626">"Թույլատրել ձայնը"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ձայնային ազդանշան չհնչեցնել, չթրթռալ և ընթացիկ էկրանին այս ծանուցումները չցուցադրել:"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Ծանուցումների օգնական"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Մուտք ծանուցումներին"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Ծանուցումների օգտագործում"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ծրագրիը չի կարող կարդալ ծանուցումները"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d հավելված կարող է ծանուցումներ կարդալ</item>
       <item quantity="other">%d հավելված կարող է ծանուցումներ կարդալ</item>
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"Տեղադրված հավելվածներից ոչ մեկը հարցում չի ուղարկել"</string>
-    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Թո՞ւյլ տալ ծանուցմանը օգտվել <xliff:g id="SERVICE">%1$s</xliff:g>-ից:"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>-ը կկարողանա կարդալ բոլոր ծանուցումները, ներառյալ անձնական տվյալները, ինչպիսիք են, օրինակ, կոնտակտների անունները և ձեր կողմից ստացվող հաղորդագրությունների բովանդակությունը: Այն նաև կկարողանա փակել դրանցում պարունակվող ծանուցումները և ակտիվացնել գործողությունների կոճակները: \n\nՀավելվածին նաև կտրվի «Չընդհատել» գործառույթը միացնելու կամ անջատելու, ինչպես նաև առնչվող կարգավորումները փոխելու հնարավորություն:"</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Եթե անջատեք ծանուցումները <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> օգտատիրոջ համար, «Չընդհատել» գործառույթը նույնպես կարող է անջատվել:"</string>
+    <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Թույլատրե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ին օգտագործել ծանուցումները"</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>-ը կկարողանա կարդալ բոլոր ծանուցումները, ներառյալ անձնական տվյալները, ինչպիսիք են, օրինակ, կոնտակտների անունները և ձեր կողմից ստացվող հաղորդագրությունների բովանդակությունը: Այն նաև կկարողանա փակել դրանցում պարունակվող ծանուցումները և ակտիվացնել գործողությունների կոճակները: \n\nՀավելվածին նաև կտրվի «Չանհանգստացնել» գործառույթը միացնելու կամ անջատելու, ինչպես նաև առնչվող կարգավորումները փոխելու հնարավորություն:"</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Եթե անջատեք ծանուցումները <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> օգտատիրոջ համար, «Չանհանգստացնել» գործառույթը նույնպես կարող է անջատվել:"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Անջատել"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Չեղարկել"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR օգնության ծառայություններ"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Հասանելիությունը՝ «չանհանգստացնել»"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Տեղադրված հավելվածներից ոչ մեկը Չանհանգստացնել հարցում չի ուղարկել"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android-ն արգելափակում այս հավելվածի ծանուցումների ցուցադրումը"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android-ն արգելափակում է ծանուցումների տվյալ կատեգորիայի ցուցադրումը"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Կարգեր"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Այլ"</string>
     <string name="no_channels" msgid="3077375508177744586">"Այս հավելվածը ծանուցումներ չի փակցրել"</string>
@@ -2858,8 +2859,8 @@
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Երբեք չցուցադրել ծանուցումները ստվերում կամ արտաքին սարքերի վրա"</string>
     <string name="notification_badge_title" msgid="7166470350070693657">"Նշանակի հավելվածի պատկերակ"</string>
     <string name="notification_badge_summary" msgid="3944771498030335669">"Հնարավորության դեպքում ծանուցումները Հիմնական հավելվածում ցուցադրել նշանակների տեսքով:"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Վրագրել «Չընդհատել» պարամետրը"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Թույլ տալ այս ծանուցումների կողմից ընդհատումները, երբ «Չընդհատել» պարամետրի համար նշանակված է «Միայն կարևորները» արժեքը"</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Վրագրել «Չանհանգստացնել» պարամետրը"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Թույլ տալ այս ծանուցումների կողմից ընդհատումները, երբ «Չանհանգստացնել» պարամետրի համար նշանակված է «Միայն կարևորները» արժեքը"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Կողպէկրանին"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Արգելափակված է"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Կարևոր"</string>
@@ -2874,7 +2875,7 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Կանոնի անունը"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Մուտքագրեք կանոնի անունը"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Կանոնի անունն արդեն օգտագործվում է"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Ավելացնել ավելին"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Ավելացնել"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Ջնջել կանոնը"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Ընտրեք կանոնի տեսակը"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Ջնջե՞լ «<xliff:g id="RULE">%1$s</xliff:g>» կանոնը:"</string>
@@ -2882,9 +2883,9 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Կանոնի տեսակը"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Անհայտ"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Կազմաձևել կանոնը"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Ժամանակի կանոն"</string>
+    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Ժամանակ"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Ինքնաշխատորեն կարգավորված է միացնել Չանհանգստացնել ընտրանքը նշված ժամանակներում"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Իրադարձության կանոն"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Միջոցառում"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Ինքնաշխատորեն կարգավորված է միացնել Չանհանգստացնել ընտրանքը նշված իրադարձությունների ժամանակ"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"Հետևյալ իրադարձությունների ընթացքում՝"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"<xliff:g id="CALENDAR">%1$s</xliff:g>-ի իրադարձությունների ընթացքում"</string>
@@ -2896,7 +2897,7 @@
     <string name="zen_mode_event_rule_reply_yes_or_maybe" msgid="2769656565454495824">"Այո կամ Միգուցե"</string>
     <string name="zen_mode_event_rule_reply_yes" msgid="1003598835878784659">"Այո"</string>
     <string name="zen_mode_rule_not_found_text" msgid="8963662446092059836">"Կանոնը չի գտնվել:"</string>
-    <string name="zen_mode_rule_summary_enabled_combination" msgid="976098744828219297">"Միացրած / <xliff:g id="MODE">%1$s</xliff:g>"</string>
+    <string name="zen_mode_rule_summary_enabled_combination" msgid="976098744828219297">"Միացված է / <xliff:g id="MODE">%1$s</xliff:g>"</string>
     <string name="zen_mode_rule_summary_provider_combination" msgid="2101201392041867409">"<xliff:g id="PACKAGE">%1$s</xliff:g>\n<xliff:g id="SUMMARY">%2$s</xliff:g>"</string>
     <string name="zen_mode_schedule_rule_days" msgid="3195058680641389948">"Օրեր"</string>
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"Չկան"</string>
@@ -2910,17 +2911,17 @@
     <string name="zen_mode_messages" msgid="5886440273537510894">"Հաղորդագրություններ"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Բոլոր հաղորդագրությունները"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Ընտրված հաղորդագրություններ"</string>
-    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Ցանկացած մարդուց"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Ցանկացած զանգողից"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Միայն կոնտակտներից"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Միայն աստղանշված կոնտակտներից"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ոչ մի"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"Ոչ ոքից"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Զարթուցիչ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Հիշեցումներ"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Միջոցառումներ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Բոլոր զանգողները"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Ընտրված զանգողներ"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Բազմակի զանգեր կատարած"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Թույլատրել նույն անձին <xliff:g id="MINUTES">%d</xliff:g> րոպեի ընթացքում կատարել երկրորդ զանգը"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Կրկնակի զանգեր"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Թույլատրել, եթե նույն անձը <xliff:g id="MINUTES">%d</xliff:g> րոպեի ընթացքում նորից է զանգում"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Ավտոմատ միացնել"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Երբեք"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Ամեն գիշեր"</string>
@@ -2939,11 +2940,11 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Ակտիվացնել «Միայն զարթուցիչը» ռեժիմը մինչև <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>-ը"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ակտիվացնել «Միշտ ընդհատել» ռեժիմը"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Արգելափակել երբ էկրանը միացված է"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"«Չընդհատել» գործառույթի կողմից լռեցված ծանուցումներին արգելել հայտնվել էկրանի վրա՝ նույնիսկ թռուցիկ"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Արգելափակել երբ էկրանն անջատված է"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"«Չընդհատել» գործառույթի կողմից լռեցված ծանուցումներին արգելել միացնել էկրանը կամ գործարկել ծանուցման լույսի թարթումը"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Արգելել միացնել էկրանը «Չընդհատել» ռեժիմում լռեցված ծանուցումներին"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Արգելափակել միացած էկրանի դեպքում"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"«Չանհանգստացնել» գործառույթի կողմից լռեցված ծանուցումներին արգելել հայտնվել էկրանի վրա՝ նույնիսկ թռուցիկ"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Արգելափակել անջատված էկրանի դեպքում"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"«Չանհանգստացնել» գործառույթի կողմից լռեցված ծանուցումներին արգելել միացնել էկրանը կամ գործարկել ծանուցման լույսի թարթումը"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Արգելել միացնել էկրանը «Չանհանգստացնել» ռեժիմում լռեցված ծանուցումներին"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Անջատված է"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Երբ էկրանը միացված է"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Երբ էկրանն անջատված է"</string>
@@ -2951,14 +2952,14 @@
     <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Կարծիք հայտնել այս սարքի մասին"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Մուտքագրեք ադմինիստրատորի PIN կոդը"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"Միացված"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"Միացված է"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Անջատված"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Ամրակցել էկրանը"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Երբ այս կարգավորումը միացված է, կարող եք օգտագործել էկրանի ամրացումը՝ ընթացիկ էկրանը մինչև ապամրացումը տեսադաշտում պահելու համար:\n\nԷկրանի ամրացումից օգտվելու համար՝\n\n1. Համոզվեք, որ այն միացված է:\n\n2. Բացեք էկրանը, որը ցանկանում եք ամրացնել:\n\n3. Հպեք Համատեսքին:\n\n4. Սահեցրեք վերև և հպեք ամրացման պատկերակին:"</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Էկրանի ամրակցում"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Էկրանի ամրակցումը կարող եք օգտագործել ընթացիկ էկրանը տեսադաշտում պահելու համար:\n\nԷկրանի ամրակցումն օգտագործելու համար՝\n\n1. Համոզվեք, որ այն միացված է:\n\n2. Բացեք էկրանը, որը ցանկանում եք ամրակցել:\n\n3. Հպեք Համատեսքին:\n\n4. Սահեցրեք վերև և հպեք ամրակցման պատկերակին:"</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Ապաամրացնելուց առաջ հարցնել ապակողպող նախշը"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Ապաամրացնելուց առաջ հարցնել PIN-կոդը"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Ապաամրացնելուց առաջ հարցնել գաղտնաբառը"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Ապամրացման ժամանակ կողպել սարքը"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Ապամրացնելիս կողպել սարքը"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Այս աշխատանքային պրոֆիլը կառավարվում է այս հավելվածի օգնությամբ՝"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Կառավարիչ՝ <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Փորձնական)"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Մնալ ընթացիկ դիրքով"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Ապահով մեկնարկ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Շարունակել"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Դուք կարող եք նաև պաշտպանել այս սարքը՝ այն մեկնարկելուց առաջ պահանջելով մուտքագրել PIN-ը: Մինչև սարքը չապակողպեք, այն չի կարողանա ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում՝ զարթուցիչներ: \n\n Այս գործառույթն օգնում է պաշտպանել կորած կամ գողացած սարքերում եղած տվյալները։"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Դուք կարող եք նաև պաշտպանել այս սարքը՝ այն մեկնարկելուց առաջ պահանջելով մուտքագրել ապակողպման նախշը: Մինչև սարքը չապակողպեք, այն չի կարողանա ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում՝ զարթուցիչներ: \n\n Այս գործառույթն օգնում է պաշտպանել կորած կամ գողացած սարքերում եղած տվյալները։"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Դուք կարող եք նաև պաշտպանել այս սարքը՝ այն մեկնարկելուց առաջ պահանջելով մուտքագրել գաղտնաբառը: Մինչև սարքը չապակողպեք, այն չի կարողանա ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում՝ զարթուցիչներ: \n\n Այս գործառույթն օգնում է պաշտպանել կորած կամ գողացած սարքերում եղած տվյալները։"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Բացի մատնահետքի միջոցով սարքը ապակողպելուց, սարքը կարող եք նաև պաշտպանել՝ մեկնարկելուց առաջ ձեր PIN կոդը պահանջելով: Մինչև սարքը չապակողպեք, այն չի կարողանա ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զգուշացումներ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում:"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Բացի մատնահետքի միջոցով սարքը ապակողպելուց, սարքը կարող եք նաև պաշտպանել՝ մեկնարկելուց առաջ ձեր նախշը պահանջելով: Մինչև սարքը չապակողպեք, այն չի կարողանա ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զգուշացումներ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում:"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Բացի մատնահետքի միջոցով սարքը ապակողպելուց, սարքը կարող եք նաև պաշտպանել՝ մեկնարկելուց առաջ ձեր գաղտնաբառը պահանջելով: Մինչև սարքը չապակողպեք, այն չի կարողանա ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զգուշացումներ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում:"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Սարքը միացնելուց պահանջել PIN"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Սարքը միացնելուց պահանջել նախշ"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Սարքը միացնելուց պահանջել գաղտնաբառ"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ոչ"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ոչ"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ոչ"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Այս սարքը կարող եք նաև պաշտպանել՝ պահանջելով մուտքագրել PIN կոդը նախքան դրա գործարկումը: Մինչև գործարկումը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ: \n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ մուտքագրել PIN կոդը՝ ձեր սարքը գործարկելու համար:"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Այս սարքը կարող եք նաև պաշտպանել՝ պահանջելով մուտքագրել նախշը նախքան դրա գործարկումը: Մինչև գործարկումը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ: \n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ մուտքագրել նախշը՝ ձեր սարքը գործարկելու համար:"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Այս սարքը կարող եք նաև պաշտպանել՝ պահանջելով մուտքագրել գաղտնաբառը նախքան դրա գործարկումը: Մինչև գործարկումը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ: \n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ գաղտնաբառ՝ ձեր սարքը գործարկելու համար:"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Բացի մատնահետքի միջոցով սարքը ապակողպելուց, սարքը կարող եք նաև պաշտպանել՝ պահանջելով մուտքագրել PIN կոդը նախքան դրա գործարկումը: Մինչև գործարկումը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ մուտքագրել PIN կոդը՝ ձեր սարքը գործարկելու համար:"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Բացի մատնահետքի միջոցով սարքը ապակողպելուց, սարքը կարող եք նաև պաշտպանել՝ պահանջելով մուտքագրել նախշը նախքան դրա գործարկումը: Մինչև գործարկումը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ մուտքագրել նախշը՝ ձեր սարքը գործարկելու համար:"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Բացի մատնահետքի միջոցով սարքը ապակողպելուց, սարքը կարող եք նաև պաշտպանել՝ պահանջելով մուտքագրել գաղտնաբառը նախքան դրա գործարկումը: Մինչև գործարկումը սարքը չի կարող ստանալ զանգեր, հաղորդագրություններ կամ ծանուցումներ, այդ թվում նաև զարթուցիչի ազդանշաններ:\n\nԱյս գործառույթն օգնում է պաշտպանել տվյալները կորած կամ գողացված սարքերում: Պահանջե՞լ գաղտնաբառ՝ ձեր սարքը գործարկելու համար:"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Այո"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ոչ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Պահանջե՞լ PIN-ը:"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Պահանջե՞լ ապակողպման նախշը:"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Պահանջե՞լ գաղտնաբառը:"</string>
@@ -3012,7 +3009,7 @@
     <string name="notifications_silenced" msgid="4728603513072110381">"Լռեցված"</string>
     <string name="notifications_redacted" msgid="4493588975742803160">"Չցուցադրել գաղտնի բովանդակությունը կողպէկրանին"</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"Չեն ցուցադրվում կողպէկրանին"</string>
-    <string name="notifications_priority" msgid="1066342037602085552">"«Չընդհատել» ռեժիմը անտեսվելու է"</string>
+    <string name="notifications_priority" msgid="1066342037602085552">"«Չանհանգստացնել» ռեժիմը անտեսվելու է"</string>
     <string name="notifications_summary_divider" msgid="9013807608804041387">" / "</string>
     <string name="notification_summary_level" msgid="2726571692704140826">"Աստիճան %d"</string>
     <string name="notification_summary_channel" msgid="5831124672372023524">"<xliff:g id="CHANNEL_NAME">%1$s</xliff:g> • <xliff:g id="GROUP_NAME">%2$s</xliff:g>"</string>
@@ -3031,12 +3028,12 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Թույլտվություններ չեն շնորհվել"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Թույլտվություններ չեն հայցվել"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"Բոլոր հավելվածները"</string>
-    <string name="filter_enabled_apps" msgid="5395727306799456250">"Տեղադրված հավելվածները"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"Տեղադրված հավելվածներ"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"Ակնթարթորեն գործարկվող հավելվածները"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Անձնական"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Աշխատանքային"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"Հավելվածներ՝ բոլորը"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Հավելվածներ՝ անջատված"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Հավելվածներ՝ անջատած"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Կատեգորիաներ՝ հրատապ կարևորություն"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Կատեգորիաներ՝ ցածր կարևորություն"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Կատեգորիաներ՝ անջատված"</string>
@@ -3044,7 +3041,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Լրացուցիչ"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Հավելվածների կազմաձևում"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Անհայտ հավելված"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"Հավելվածների թույլտվությունները"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Հավելվածների թույլտվություններ"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> օգտագործող հավելվածները"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Հպեք՝ արթնացնելու համար"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Երկակի հպեք էկրանի ցանկացած մասին՝ սարքը արթնացնելու համար"</string>
@@ -3063,7 +3060,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Չճանաչվեց"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Կանխադրված"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Կանխադրված՝ աշխատանքի համար"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Հուշումներ և ձայնային ներածում"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Օգնական և ձայնային ներածում"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Օգնական հավելված"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Սահմանե՞լ <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> հավելվածը որպես օգնական:"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Օգնականը կարողանալու է կարդալ համակարգում աշխատեցվող հավելվածների վերաբերյալ տեղեկությունները, այդ թվում նաև էկրանին ցուցադրվող կամ հավելվածներից ստացվող տեղեկությունները:"</string>
@@ -3096,7 +3093,7 @@
     <string name="additional_battery_info" msgid="4754099329165411970">"Օգտագործման զգուշացումներ"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Ցուցադրել բոլոր հավելվածները"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Թաքցնել լրացուցիչ հավելվածները"</string>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"Չօպտիմալացված"</string>
+    <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_system" msgid="7362862974428225301">"Մարտկոցի օպտիմալացումը հասանելի չէ"</string>
@@ -3104,7 +3101,7 @@
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Թույլ տա՞լ հավելվածին միշտ աշխատել ֆոնում:"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> հավելվածին ֆոնում միշտ աշխատելու թույլատվություն տրամադրելու դեպքում մարտկոցի օգտագործման ժամանակը կարող է նվազել: \n\nԱյս կարգավորումը կարող եք հետագայում փոխել՝ անցնելով Կարգավորումներ &gt; Հավելվածներ և ծանուցումներ:"</string>
     <string name="battery_summary" msgid="8044042095190688654">"Վերջին լրիվ լիցքավորումից հետո օգտագործվել է <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="battery_power_management" msgid="5571519699679107523">"Մարտկոցի լիցքի կառավարում"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"Սնուցման կառավարում"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Վերջին լրիվ լիցքավորումից հետո մարտկոցը չի օգտագործվել"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Հավելվածի կարգավորումներ"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"Ցուցադրել Համակարգի ՕՄ-ի ընդունիչը"</string>
@@ -3163,11 +3160,11 @@
     <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>
+    <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Թույլատրե՞լ <xliff:g id="APP">%1$s</xliff:g> հավելվածին միացնել/անջատել «Չանհանգստացնել» գործառույթը:"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Հավելվածը կարող է միացնել/անջատել «Չանհանգստացնել» գործառույթը և փոփոխել նրան առնչվող կարգավորումները:"</string>
     <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Պետք է միացած մնա, քանի որ ծանուցումների օգտագործումն ակտիվացված է"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Չեղարկե՞լ <xliff:g id="APP">%1$s</xliff:g> հավելվածին տրամադրված «Չխանգարել» գործառույթն օգտագործելու թույլտվությունը:"</string>
-    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Այս հավելվածի կողմից ստեղծված բոլոր «Չխանգարել» կանոնները կհեռացվեն:"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Չեղարկե՞լ <xliff:g id="APP">%1$s</xliff:g> հավելվածին տրամադրված «Չանհանգստացնել» գործառույթն օգտագործելու թույլտվությունը:"</string>
+    <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Այս հավելվածի կողմից ստեղծված բոլոր «Չանհանգստացնել» կանոնները կհեռացվեն:"</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Չօպտիմալացնել"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Օպտիմալացնել"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Մարտկոցի լիցքը կարող է ավելի արագ սպառվել"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Թույլտվություն ունեցող հավելվածներ"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Այո"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Ոչ"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Տեղադրել անհայտ հավելվածներ"</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>
@@ -3204,31 +3201,31 @@
     <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_trusted" msgid="6857780460845250885">"Այո"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ոչ"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Թույլատրել հավելվածների տեղադրումները"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Թույլատրված է"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Արգելված է"</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>
-    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Ֆոտոխցիկ - սնուցման կոճակի կրկնակի սեղմամբ"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Տեսախցիկ - սնուցման կոճակի կրկնակի սեղմամբ"</string>
     <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_short_summary" msgid="7291960817349834688">"Տարրերի մեծացում և փոքրացում"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ցուցադրման խտություն, էկրանի մասշտաբ, մասշտաբ, մասշտաբավորում"</string>
-    <string name="screen_zoom_summary" msgid="6445488991799015407">"Խոշորացնել կամ մանրացնել էկրանի տարրերը: Այս կարգավորումը փոխելուց հետո էկրանի որոշ հավելվածներ կարող են փոխել դիրքը:"</string>
+    <string name="screen_zoom_summary" msgid="6445488991799015407">"Էկրանի տարրերի մեծացում կամ փոքրացում։ Այս կարգավորումը փոխելուց հետո որոշ հավելվածներ կարող են փոխել իրենց դիրքը:"</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"Նախադիտում"</string>
     <string name="screen_zoom_make_smaller_desc" msgid="4622359904253364742">"Փոքրացնել"</string>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Մեծացնել"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
-    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Ողջույն, Արմեն"</string>
-    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Հեյ, չե՞ք ցանկանում սրճել և զրուցել մի փոքր:"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Հիանալի միտք է: Ես մոտակայքում մի շատ լավ տեղ գիտեմ:"</string>
-    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Կատարյալ է"</string>
+    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Արամ ջան, բարև"</string>
+    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Սուրճ չխմե՞նք։"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Խմե՛նք։ Ես մոտակայքում լավ տեղ գիտեմ:"</string>
+    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Թույն"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Երք, 18:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Երք, 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Երք, 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Երք, 18:03"</string>
-    <string name="disconnected" msgid="4836600637485526329">"Կապակցված չէ"</string>
+    <string name="disconnected" msgid="4836600637485526329">"Կապ չկա"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"Օգտագործած տվյալներ՝ <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="one">Off for <xliff:g id="COUNT">%d</xliff:g> apps</item>
@@ -3244,7 +3241,7 @@
     <string name="display_summary_example" msgid="9102633726811090523">"Ակտիվացնել քնի ռեժիմը 10 րոպե անգործուն մնալուց հետո"</string>
     <string name="memory_summary" msgid="8080825904671961872">"<xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>-ից օգտագործվել է <xliff:g id="USED_MEMORY">%1$s</xliff:g>"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Ընթացիկ օգտատերը՝ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="users_summary" msgid="1674864467098487328">"Մուտք եք գործել <xliff:g id="USER_NAME">%1$s</xliff:g> հաշիվ"</string>
+    <string name="users_summary" msgid="1674864467098487328">"Մուտք եք գործել որպես <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ը կանխադրված հավելվածն է"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"ՄԻԱՑՐԱԾ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ԱՆՋԱՏԱԾ"</string>
@@ -3269,7 +3266,7 @@
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"<xliff:g id="ID_1">%1$s</xliff:g> շարժական Wi-Fi թեժ կետն ակտիվ է: Wi-Fi-ն այս սարքի համար անջատված է:"</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Ինքնաթիռի ռեժիմը միացված է"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Wi-Fi, Bluetooth և բջջային ցանցերն անջատված են: Դուք չեք կարող կատարել հեռախոսազանգեր կամ միանալ համացանցին:"</string>
-    <string name="condition_zen_title" msgid="2679168532600816392">"«Չընդհատել» ռեժիմն ակտիվ է (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"«Չանհանգստացնել» ռեժիմն ակտիվ է (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Մարտկոցի տնտեսումը միացված է"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Սարքի արագագործությունը սահմանափակվել է: Տեղորոշման ծառայությունները և ֆոնային տվյալներն անջատվել են:"</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Բջջային ինտերնետն անջատված է"</string>
@@ -3289,8 +3286,8 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor-ի փոփոխությունը կիրառելու համար վերագործարկեք սարքը"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Ավտոմատ համակարգային թարմացումներ"</string>
     <string name="usage" msgid="2977875522080448986">"Օգտագործում"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Բջջային ինտերնետի օգտագործումը"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi տվյալների օգտագործումը"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Բջջային թրաֆիկ"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi թրաֆիկ"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet տվյալների օգտագործում"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
@@ -3307,7 +3304,7 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> restrictions</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> սահմանափակում</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"Օպերատորի հաշվարկը տվյալների օգտագործման վերաբերյալ կարող է տարբերվել սարքի հաշվարկից"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"Օպերատորի վիճակագրությունը կարող է տարբերվել սարքի վիճակագրությունից։"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Օգտագործվել է <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Տվյալների մասին զգուշացում"</string>
     <string name="data_warning" msgid="209133958008062117">"Տվյալների նախազգուշացում"</string>
@@ -3325,7 +3322,7 @@
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Ֆոնային տվյալներն անջատված են"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Միացված է"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Անջատված է"</string>
-    <string name="unrestricted_app_title" msgid="4465437191723332066">"Տվյալների անսահմանափակ օգտագործում"</string>
+    <string name="unrestricted_app_title" msgid="4465437191723332066">"Տվյալների անսահմանափակ փոխանցում"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Թույլ տալ տվյալների անսահմանափակ օգտագործում, երբ Տվյալների խնայումը միացված է"</string>
     <string name="home_app" msgid="4066188520886810030">"Հիմնական հավելված"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Կանխադրված Գլխավոր էջ չկա"</string>
@@ -3335,14 +3332,14 @@
     <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>
-    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Անջատած / <xliff:g id="ID_1">%1$s</xliff:g>"</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>
@@ -3373,26 +3370,27 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ոչ մեկը"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Դասակարգման օբյեկտը բացակայում է:"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Դասակարգման օբյեկտը չի պարունակում այս բանալին:"</string>
-    <string name="special_access" msgid="3458780842491881155">"Հավելվածի հատուկ մուտք"</string>
+    <string name="special_access" msgid="3458780842491881155">"Հատուկ հասանելիություն"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> apps can use unrestricted data</item>
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> հավելված կարող է անսահմանափակ տվյալներ օգտագործել</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Սրբե՞լ օգտատիրոջ տվյալները և անցնել ֆայլի գաղտնագրման:"</string>
-    <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Սրբել և փոխարկել"</string>
+    <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_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="6330657582897417458">"Աջակցում"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Ամենափոքր լայնությունը"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Տեղադրված հավելվածներից ոչ մեկը Պրեմիում SMS-ների օգտագործման հարցում չի կատարել"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"Պրեմիում SMS-ները կարող են առաջացնել լրացուցիչ ծախսեր և ավելացնել բջջային օպերատորի կողմից ներկայացվող վճարման հաշիվները: Եթե նման թույլտվություն տրամադրեք որևէ հավելվածին, ապա այդ հավելվածի միջոցով կկարողանաք ուղարկել Պրեմիում SMS-ներ:"</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"Պրեմիում SMS-ների օգտագործում"</string>
+    <string name="premium_sms_none" msgid="8268105565738040566">"Տեղադրված հավելվածներից ոչ մեկը վճարովի SMS-ների օգտագործման հարցում չի կատարել"</string>
+    <string name="premium_sms_warning" msgid="9086859595338944882">"Վճարովի SMS-ները կարող են լրացուցիչ ծախսեր առաջացնել: Հավելվածին թույտվություն տալու դեպքում կկարողանաք դրա միջոցով վճարովի SMS-ներ ուղարկել։"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Վճարովի SMS"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Տեսանելի չէ այս սարքերի համար"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Կապակցված է"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Մշակողի արագ կարգավորման սալիկներ"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Մեր նպատակն է օգնել ձեզ"</string>
@@ -3411,10 +3409,10 @@
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Հեռախոս"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Զրուցել"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Ուսումնասիրել խորհուրդներն ու հնարքները"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Փնտրել օգնություն և տրամադրել հետադարձ կապ"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Այցելել օգնության կենտրոն կամ կարծիք հայտնել"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Կապվել աջակցության կենտրոնի հետ"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Մուտք գործել"</string>
-    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Չե՞ք կարողանում մուտք գործել:"</string>
+    <string name="support_sign_in_required_help" msgid="5200654782405538114">"Չե՞ք կարողանում մուտք գործել"</string>
     <string name="support_disclaimer_title" msgid="4825302018208770031">"Ուղարկել համակարգի մասին տեղեկատվություն"</string>
     <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"Այլևս ցույց չտալ"</string>
     <string name="support_account_request_prefix" msgid="6387847874661861650">"Հարցվում է որպես"</string>
@@ -3454,15 +3452,15 @@
     <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_title" msgid="64716226816032800">"Անցում տեսախցիկին"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Տեսախցիկն արագ գործարկելու համար երկու անգամ սեղմեք սնուցման կոճակը: Դա կարող եք անել ցանկացած էկրանից:"</string>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Շրջել տեսախցիկը"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Տեսախցիկի շրջում"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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="2521630136233865893">"Ծանուցումներն արագ տեսնելու համար կրկնակի հպեք էկրանին:"</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="8696432220086951466">"Ծանուցումներն արագ տեսնելու համար վերցրեք հեռախոսը:"</string>
@@ -3488,7 +3486,7 @@
     <string name="instant_apps_account" msgid="1433620209791992528">"Ակնթարթորեն գործարկվող հավելվածների հաշիվ"</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>
+    <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>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"Ավտոմատ կերպով համաժամեցնել անձնական տվյալները"</string>
@@ -3572,16 +3570,16 @@
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Հեռախոսի հիշողություն"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Օգտագործված է <xliff:g id="TOTAL">%1$s</xliff:g>-ից"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"զբաղված"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"զբաղված է"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Մաքրել հավելվածի տվյալները"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Հեռացնե՞լ այս ակնթարթորեն գործարկվող հավելվածը։"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Խաղեր"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"Ձայնային ֆայլեր"</string>
-    <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(հեռացված է <xliff:g id="USER">%s</xliff:g> օգտվողի համար)"</string>
-    <string name="webview_disabled_for_user" msgid="1216426047631256825">"(անջատված է <xliff:g id="USER">%s</xliff:g> օգտվողի համար)"</string>
+    <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(հեռացված է <xliff:g id="USER">%s</xliff:g> օգտատիրոջ համար)"</string>
+    <string name="webview_disabled_for_user" msgid="1216426047631256825">"(անջատված է <xliff:g id="USER">%s</xliff:g> օգտատիրոջ համար)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Ինքնալրացման ծառայություն"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ավտոմատ, լրացնել, ինքնալրացում"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Սահմանե՞լ <xliff:g id="APP_NAME_0">%1$s</xliff:g> հավելվածը որպես ինքնալրացման հավելված: <xliff:g id="APP_NAME_1">%1$s</xliff:g> հավելվածը կկարողանա կարդալ ձեր սարքի էկրանը և լրացնել այլ հավելվածների դաշտերը:"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Համոզվեք, որ վստահում եք այս հավելվածին&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; օգտագործում է էկրանի տեղեկատվությունը՝ որոշելու, թե ինչը կարող է ինքնալցվել:"</string>
     <string name="device_theme" msgid="4571803018917608588">"Սարքի թեման"</string>
     <string name="default_theme" msgid="7085644992078579076">"Կանխադրված"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Հիշողության կառավարիչ՝ <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 164ac13..974e36d 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Tidak Ada"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Tidak ada"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -295,7 +297,7 @@
     <item msgid="485564189219029300">"aktifkan VPN"</item>
     <item msgid="7155384795265164395">"tulis wallpaper"</item>
     <item msgid="1835836196806147034">"bantu struktur"</item>
-    <item msgid="5989890403088155055">"bantu tangkapan layar"</item>
+    <item msgid="5989890403088155055">"bantu screenshot"</item>
     <item msgid="8582699692765917557">"baca status telepon"</item>
     <item msgid="1474039653814954902">"tambahkan pesan suara"</item>
     <item msgid="7222837656938871633">"gunakan sip"</item>
@@ -362,7 +364,7 @@
     <item msgid="2482631530338029480">"Aktifkan VPN"</item>
     <item msgid="1662979573471871926">"Tulis wallpaper"</item>
     <item msgid="5964768335278263478">"Bantu struktur"</item>
-    <item msgid="2657138701132782702">"Bantu tangkapan layar"</item>
+    <item msgid="2657138701132782702">"Bantu screenshot"</item>
     <item msgid="8571369610363539266">"Baca status telepon"</item>
     <item msgid="4542463358215230845">"Tambahkan pesan suara"</item>
     <item msgid="864565065016166003">"Gunakan sip"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e22efcd6..051e832 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akun"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akun"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Keamanan &amp; Lokasi"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkripsi &amp; kredensial"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telepon dienkripsi"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telepon dienkripsi"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferensi layar kunci"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privasi"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Dinonaktifkan oleh admin"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Status keamanan"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Kunci layar, sidik jari"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Kunci layar"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Sidik jari"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Mengelola sidik jari"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sidik jari untuk"</string>
@@ -460,7 +459,7 @@
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pilih metode untuk mengunci layar"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Tidak ada"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
-    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Gesek"</string>
+    <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Geser"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Tanpa pengamanan"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pola"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Keamanan sedang"</string>
@@ -477,7 +476,7 @@
     <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Anda dapat membuka kunci ponsel menggunakan sidik jari. Demi keamanan, opsi ini memerlukan kunci layar cadangan."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Dinonaktifkan oleh admin, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tidak ada"</string>
-    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Gesek"</string>
+    <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Geser"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"Pola"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"Sandi"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Beri tahu ketika jaringan publik verkualitas tinggi tersedia"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktifkan Wi‑Fi secara otomatis"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi akan aktif kembali di dekat jaringan berkualitas tinggi yang tersimpan, seperti jaringan rumah Anda"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Tidak tersedia karena pemindaian Wi-Fi dinonaktifkan"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Hindari sambungan buruk"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Jangan gunakan jaringan Wi-Fi kecuali koneksi internetnya bagus"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Hanya gunakan jaringan yang memiliki koneksi internet kuat"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Mengonfigurasi Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Alamat IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Jaringan tersimpan"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Setelan IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Setelan lanjutan Wi-Fi tidak tersedia untuk pengguna ini"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Mati"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Untuk mengontrol yang terjadi saat ponsel dipasang ke dok dan/atau sedang tidur, aktifkan screen saver."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Ketika memulai"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Screensaver saat ini"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulai sekarang"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setelan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk membangunkan"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Layar notifikasi masuk"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Tampilan ruangan"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Membangunkan layar saat Anda menerima notifikasi"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Membuat teks menjadi lebih besar atau lebih kecil"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"Pembaruan sistem tidak dapat dipasang pada media eksternal."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Aplikasi admin perangkat tidak dapat diinstal di media eksternal"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Paksa berhenti?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Jika Anda menghentikan aplikasi secara paksa, mungkin fungsinya akan terganggu."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Jika aplikasi dihentikan paksa, fungsinya mungkin akan terganggu."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Tidak dapat memindahkan apl. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Lokasi pemasangan yang disukai"</string>
@@ -1615,6 +1612,7 @@
     <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 dipasang dari <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Info selengkapnya di <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Pengoperasian aplikasi"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Berjalan"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Tidak pernah digunakan)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pembantu pintasan keyboard"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Tampilkan pintasan yang tersedia"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Default"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kecepatan penunjuk"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Pengendali Game"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Gunakan penggetar"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan layar sejak pengisian baterai penuh terakhir"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumsi layar"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pemindaian jaringan seluler"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> yang lalu"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan aplikasi sejak pengisian baterai terakhir hingga penuh (<xliff:g id="TIME">%1$s</xliff:g> yang lalu)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan aplikasi sejak pengisian baterai terakhir hingga penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah waktu layar diaktifkan sejak pengisian daya terakhir hingga penuh"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan perangkat sejak pengisian baterai penuh terakhir"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Penggunaan baterai sejak dicabut"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Sel siaga"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Jaringan seluler siaga"</string>
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet menganggur"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telepon menganggur"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Penggunaan baterai adalah perkiraan penggunaan daya dan tidak mencakup setiap sumber yang menyebabkan baterai habis. Lain-lain adalah perbedaan antara perkiraan penggunaan daya yang dihitung dan daya baterai habis sebenarnya yang diamati."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan daya yang dihitung berlebih"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Digunakan selama %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dari seluruh penggunaan baterai"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Info penggunaan sejak pengisian baterai terakhir hingga penuh"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Penggunaan sejak pengisian baterai terakhir hingga penuh"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Pengisian baterai penuh terakhir"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Sisa waktu penggunaan baterai merupakan hasil perkiraan dan dapat berubah berdasarkan penggunaan"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Saat aktif digunakan"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Masukan suara &amp; setelan keluaran"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Penelusuran suara"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Keyboard Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Ucapan"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Setelan masukan suara"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Masukan suara"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Layanan masukan suara"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume notifikasi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Suara notifikasi default"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Suara yang diberikan aplikasi"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Suara notifikasi default"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Suara alarm default"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Getarkan juga untuk panggilan"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Suara lainnya"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Saat perangkat dikunci, Anda ingin notifikasi ditampilkan seperti apa?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifikasi profil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notifikasi"</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_blocked" msgid="7938180808339386300">"Jangan pernah tampilkan notifikasi"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Rendah: Tanpa gangguan suara atau visual"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Medium: Tanpa suara"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Tinggi: Aktifkan suara"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Penting: Aktifkan suara dan 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Asisten notifikasi"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android memblokir notifikasi aplikasi ini agar tidak muncul di perangkat ini"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android memblokir kategori notifikasi ini agar tidak muncul di perangkat ini"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategori"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Lainnya"</string>
     <string name="no_channels" msgid="3077375508177744586">"Aplikasi ini belum memposting notifikasi"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Tetap dalam orientasi saat ini"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Proses memulai dengan aman"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Lanjutkan"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum memulai perangkat. Jika perangkat belum dimulai, panggilan telepon, pesan, atau notifikasi, termasuk alarm, tidak dapat diterima. \n\nIni membantu melindungi data pada perangkat yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Anda dapat melindungi perangkat ini lebih lanjut dengan meminta pola sebelum memulai perangkat. Jika perangkat belum dimulai, panggilan telepon, pesan, atau notifikasi, termasuk alarm, tidak dapat diterima. \n\nIni membantu melindungi data pada perangkat yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum memulai perangkat. Jika perangkat belum dimulai, panggilan telepon, pesan, atau notifikasi, termasuk alarm, tidak dapat diterima. \n\nIni membantu melindungi data pada perangkat yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Selain menggunakan sidik jari untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum memulai perangkat. Jika perangkat belum dimulai, perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Selain menggunakan sidik jari untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta pola sebelum memulai perangkat. Jika perangkat belum dimulai, perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Selain menggunakan sidik jari untuk membuka kunci perangkat, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum memulai perangkat. Jika perangkat belum dimulai, perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm.\n\nIni membantu melindungi data di perangkat yang hilang atau dicuri."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Perlu PIN untuk memulai perangkat"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Perlu pola untuk memulai perangkat"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Perlu sandi untuk memulai perangkat"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Lain kali"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Lain kali"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Lain kali"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai. \n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta PIN untuk memulai perangkat?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Anda dapat melindungi perangkat Anda lebih lanjut dengan meminta pola sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai. \n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta pola untuk memulai perangkat?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Anda dapat melindungi perangkat lebih lanjut dengan meminta sandi sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai. \n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta sandi untuk memulai perangkat?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Selain menggunakan sidik jari untuk membuka kunci, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta PIN sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta PIN untuk memulai perangkat?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Selain menggunakan sidik jari untuk membuka kunci, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta pola sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta pola untuk memulai perangkat?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Selain menggunakan sidik jari untuk membuka kunci, Anda dapat melindungi perangkat ini lebih lanjut dengan meminta sandi sebelum memulai perangkat. Perangkat tidak dapat menerima panggilan, pesan, atau notifikasi, termasuk alarm sampai perangkat dimulai.\n\nHal ini membantu melindungi data pada perangkat yang hilang atau dicuri. Minta sandi untuk memulai perangkat&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ya"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Tidak"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Perlu PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Perlu pola?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Perlu sandi?"</string>
@@ -3093,7 +3090,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Pengoptimalan baterai"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Lansiran penggunaan"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Pemberitahuan penggunaan"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Tampilkan semua aplikasi"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Sembunyikan aplikasi ekstra"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Tidak dioptimalkan"</string>
@@ -3137,14 +3134,14 @@
     <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>
     <string name="assist_access_context_summary" msgid="1991421283142279560">"Izinkan aplikasi bantuan mengakses konten layar sebagai teks"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Gunakan tangkapan layar"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Gunakan screenshot"</string>
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Izinkan aplikasi bantuan mengakses gambar layar"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Kedipkan layar"</string>
-    <string name="assist_flash_summary" msgid="9160668468824099262">"Kedipkan tepi layar saat aplikasi bantuan mengakses teks dari layar atau tangkapan layar"</string>
+    <string name="assist_flash_summary" msgid="9160668468824099262">"Kedipkan tepi layar saat aplikasi bantuan mengakses teks dari layar atau screenshot"</string>
     <string name="assist_footer" msgid="1982791172085896864">"Aplikasi bantuan dapat membantu Anda berdasarkan informasi dari layar yang sedang Anda lihat. Beberapa aplikasi mendukung peluncur dan layanan masukan suara untuk memberikan bantuan terintegrasi."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Rata-rata penggunaan memori"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Penggunaan memori maksimum"</string>
-    <string name="memory_usage" msgid="1781358557214390033">"Penggunaan memori"</string>
+    <string name="memory_usage" msgid="1781358557214390033">"Pemakaian memori"</string>
     <string name="app_list_memory_use" msgid="6987417883876419338">"Penggunaan aplikasi"</string>
     <string name="memory_details" msgid="5943436005716991782">"Detail"</string>
     <string name="memory_use_summary" msgid="5608257211903075754">"<xliff:g id="SIZE">%1$s</xliff:g> rata-rata memori yang digunakan dalam 3 jam terakhir"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Izin ini memungkinkan aplikasi mengubah setelan sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ya"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Tidak"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Izinkan penginstalan aplikasi"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Diizinkan"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Tidak diizinkan"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Izinkan dari sumber ini"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Putar dua kali untuk kamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Membuka aplikasi kamera dengan memutar pergelangan tangan dua kali"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tekan tombol daya dua kali untuk kamera"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Tersambung ke"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ubin developer setelan cepat"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Kami siap membantu"</string>
@@ -3579,9 +3577,9 @@
     <string name="audio_files_title" msgid="4777048870657911307">"File audio"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(di-uninstal untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dinonaktifkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Layanan isiotomatis"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Layanan IsiOtomatis"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"otomatis, isi, isiotomatis"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Jadikan <xliff:g id="APP_NAME_0">%1$s</xliff:g> aplikasi isiotomatis? <xliff:g id="APP_NAME_1">%1$s</xliff:g> dapat membaca layar dan mengisi kolom di aplikasi lain."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Pastikan Anda memercayai aplikasi ini&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google IsiOtomatis&gt;%1$s&lt;/xliff:g&gt; menggunakan item yang ada di layar untuk menentukan item apa saja yang dapat diisi otomatis."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema perangkat"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Pengelola Penyimpanan: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 41f34f4..e42514d 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ekkert"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Engin"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index d80c9ec..1786a43 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Reikningar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Staðsetning"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Reikningar"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Öryggi og staðsetning"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Dulkóðun og skilríki"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Sími dulkóðaður"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Sími dulkóðaður"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Kjörstillingar lásskjás"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Stilla staðsetninguna mína, opnun skjás, SIM-kortalás, lás skilríkjageymslu"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stilla staðsetninguna mína, opnun skjás, lás skilríkjageymslu"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Persónuvernd"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Gert óvirkt af kerfisstjóra"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Öryggisstaða"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Skjálás, fingrafar"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skjálás"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingrafar"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Stjórna fingraförum"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Nota fingrafar fyrir"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Tilkynna þegar opið gæðanet er tiltækt"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Kveikja sjálfkrafa á Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi mun kveikja á sér innan sendisviðs vistaðra gæðaneta, eins og netsins þíns heima"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ekki tiltækt vegna þess að slökkt er á Wi‑Fi leit"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Forðast lélegar tengingar"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ekki nota Wi-Fi net nema nettengingin sé góð"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Nota aðeins net með góða tengingu"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Stilla Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Undirnetssía"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-tölur"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Vistuð net"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-stillingar"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Ítarlegar Wi‑Fi stillingar eru ekki í boði fyrir þennan notanda"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Slökkt"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Kveiktu á skjávaranum til að stjórna því hvað gerist þegar síminn er í dokku og/eða í biðstöðu."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Hvenær á að byrja"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Núverandi skjávari"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Byrja núna"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Stillingar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Sjálfvirk birtustilling"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Lyfta til að vekja"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Skjár tilkynninga sem berast"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Umhverfisskjár"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vekja skjáinn þegar þú færð tilkynningar"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Leturstærð"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gera texta stærri eða minni"</string>
@@ -1280,11 +1277,11 @@
     <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">"Netstillingar endurstilltar"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Endurstilling netstillinga"</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 stillingar"</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>
-    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Endurstilla stillingar"</string>
+    <string name="reset_network_final_button_text" msgid="1797434793741744635">"Endurstilla"</string>
     <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>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Verslun"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Upplýsingar um forrit"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Forrit sett upp af <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Frekari upplýsingar í <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Forritsaðgerðir"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Í birtingu"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Aldrei notað)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Flýtilyklaaðstoð"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Sýna tiltæka flýtilykla"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Sjálfgefið"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mús/snertiflötur"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Hraði bendils"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Leikjafjarstýring"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Nota titring"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Skjánotkun frá síðustu fullu hleðslu"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Orkunotkun skjásins"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Leit að farsímaneti"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"fyrir <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Notkun forrita frá síðustu fullu hleðslu (fyrir <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Notkun forrita frá fullri hleðslu (fyrir <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Liðinn tími frá síðustu fullu hleðslu"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Tækjanotkun frá síðustu fullu hleðslu"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Rafhlöðunotkun frá síðustu hleðslu"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Myndavél"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Farsímakerfi í biðstöðu"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Farsímakerfi í biðstöðu"</string>
     <string name="power_phone" msgid="5392641106474567277">"Símtöl"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Spjaldtölva aðgerðalaus"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Sími aðgerðalaus"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Rafhlöðunotkun er áætluð orkunotkun og felur ekki í sér allt það sem notar rafhlöðuorku. Önnur orkunotkun er mismunur áætlaðrar orkunotkunar samkvæmt útreikningi og raunverulegrar notkunar rafhlöðunnar."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Oftalin orkunotkun"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Notað í %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Notað fyrir <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> notuð af <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> af heildarrafhlöðuorku"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Greining frá síðustu fullu hleðslu"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Stillingar raddinntaks og -úttaks"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Raddleit"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android lyklaborð"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Tal"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Stillingar raddinntaks"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Raddinntak"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Raddinntaksþjónusta"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hljóðstyrkur tilkynninga"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Hringitónn síma"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Sjálfgefið hljóð tilkynninga"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Hljóð úr forriti"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Sjálfgefið hljóð tilkynninga"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Sjálfgefið hljóð í vekjara"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Titra líka fyrir símtöl"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Önnur hljóð"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hvernig viltu að tilkynningar frá sniði birtist þegar tækið er læst?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Sniðtilkynningar"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Tilkynningar"</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_blocked" msgid="7938180808339386300">"Aldrei sýna tilkynningar"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Lágt: Ekkert hljóð eða sjónræn truflun"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Miðlungs: Ekkert hljóð"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Hátt: Spila hljóð"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Mikilvægt: Spila hljóð og birta sprettitilkynningu"</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="6585849855452076626">"Leyfa hljóð"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ekki nota hljóð, titring eða birta tilkynningar á núverandi skjá."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Tilkynningaaðstoð"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android kemur í veg fyrir að tilkynningar þessa forrits birtist í þessu tæki"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android kemur í veg fyrir að tilkynningar birtist í þessu tæki"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Flokkar"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Annað"</string>
     <string name="no_channels" msgid="3077375508177744586">"Þetta forrit hefur ekki birt neinar tilkynningar"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Halda þessari stefnu"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Örugg ræsing"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Halda áfram"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Þú getur verndað þetta tæki betur með því að krefjast PIN-númers fyrir ræsingu. Áður en tækið er ræst getur það ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjurum. \n\nÞetta eykur gagnavernd í týndum eða stolnum tækjum."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Þú getur verndað þetta tæki betur með því að krefjast mynsturs fyrir ræsingu. Áður en tækið er ræst getur það ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjurum. \n\nÞetta eykur gagnavernd í týndum eða stolnum tækjum."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Þú getur verndað þetta tæki betur með því að krefjast aðgangsorðs fyrir ræsingu. Áður en tækið er ræst getur það ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjurum. \n\nÞetta eykur gagnavernd í týndum eða stolnum tækjum."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Til viðbótar við að nota fingrafar til að taka tækið úr lás geturðu aukið öryggið enn frekar með því að krefjast PIN-númers fyrir ræsingu. Tækið getur ekki tekið á móti símtölum, skilaboðum og tilkynningum, þar á meðal vekjurum, fyrr en það hefur verið ræst.\n\nÞetta eykur gagnaöryggi tækja sem týnast eða er stolið."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Til viðbótar við að nota fingrafar til að taka tækið úr lás geturðu aukið öryggið enn frekar með því að krefjast mynsturs fyrir ræsingu. Tækið getur ekki tekið á móti símtölum, skilaboðum og tilkynningum, þar á meðal vekjurum, fyrr en það hefur verið ræst.\n\nÞetta eykur gagnaöryggi tækja sem týnast eða er stolið."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Til viðbótar við að nota fingrafar til að taka tækið úr lás geturðu aukið öryggið enn frekar með því að krefjast aðgangsorðs fyrir ræsingu. Tækið getur ekki tekið á móti símtölum, skilaboðum og tilkynningum, þar á meðal vekjurum, fyrr en það hefur verið ræst.\n\nÞetta eykur gagnaöryggi tækja sem týnast eða er stolið."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Krefjast PIN-númers til að ræsa tækið"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Krefjast mynsturs til að ræsa tækið"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Krefjast aðgangsorðs til að ræsa tækið"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nei, takk"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nei, takk"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nei, takk"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Þú getur aukið vernd tækisins með því að krefjast PIN-númers áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast PIN-númers til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Þú getur aukið vernd tækisins með því að krefjast mynsturs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast mynsturs til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Þú getur aukið vernd tækisins með því að krefjast aðgangsorðs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast aðgangsorðs til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Til viðbótar við að nota fingrafarið til að opna tækið geturðu aukið vernd tækisins með því að krefjast PIN-númers áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast PIN-númers til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Til viðbótar við að nota fingrafarið til að opna tækið geturðu aukið vernd tækisins með því að krefjast mynsturs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast mynsturs til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Til viðbótar við að nota fingrafarið til að opna tækið geturðu aukið vernd tækisins með því að krefjast aðgangsorðs áður en það ræsir sig. Tækið getur ekki tekið á móti símtölum, skilaboðum eða tilkynningum, þar á meðal vekjaratilkynningum, fyrr en það ræsir sig. \n\nÞetta bætir gagnavernd á tækjum sem glatast eða er stolið. Viltu krefjast aðgangsorðs til að ræsa tækið þitt?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Já"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nei"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Krefjast PIN-númers?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Krefjast mynsturs?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Krefjast aðgangsorðs?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Þessi heimild leyfir forriti að breyta kerfisstillingum."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Já"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Já"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nei"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Leyfa uppsetningu forrita"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Heimilað"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Ekki heimilað"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Leyfa frá þessum uppruna"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Tvöfaldur snúningur fyrir myndavél"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Opnaðu myndavélarforritið með því að snúa úlnliðnum tvisvar"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Ýttu tvisvar á aflrofann til að opna myndavélina"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Tengt við"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Reitir fyrir flýtistillingar forritara"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Við erum hér til að hjálpa þér"</string>
@@ -3468,7 +3466,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Taktu upp símann til að skoða tilkynningar með hraði."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Taktu upp spjaldtölvuna til að skoða tilkynningar með hraði."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Taktu upp tækið til að skoða tilkynningar með hraði."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Nota fingrafar til að opna tilkynningar"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Fingrafar til að opna tilkynningar"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Strjúktu niður á fingrafaraskynjaranum aftan á spjaldtölvunni til að skoða tilkynningarnar."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Strjúktu niður á fingrafaraskynjaranum aftan á símanum til að skoða tilkynningarnar."</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(óvirkt fyrir notandann <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Sjálfvirk útfyllingarþjónusta"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"sjálfvirk, útfylling, sjálfvirk útfylling"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Gera <xliff:g id="APP_NAME_0">%1$s</xliff:g> að forriti fyrir sjálfvirka útfyllingu? <xliff:g id="APP_NAME_1">%1$s</xliff:g> verður gert kleift að lesa það sem er á skjánum þínum og fylla inn reiti í öðrum forritum."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Gakktu úr skugga um að þú treystir þessu forriti&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Sjálfvirk útfylling Google&gt;%1$s&lt;/xliff:g&gt; notar það sem er á skjánum til að ákvarða hvað er hægt að fylla sjálfkrafa út."</string>
     <string name="device_theme" msgid="4571803018917608588">"Þema tækisins"</string>
     <string name="default_theme" msgid="7085644992078579076">"Sjálfgefið"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Geymsluumsjón: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index c0680df..d766957 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Nessuno"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nessuna"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -397,7 +399,7 @@
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"Molto piccole"</item>
     <item msgid="6781094565687692782">"Piccole"</item>
-    <item msgid="8222123259497646551">"Medie"</item>
+    <item msgid="8222123259497646551">"Normale"</item>
     <item msgid="5813217276778560466">"Grandi"</item>
     <item msgid="9044232017390975191">"Molto grandi"</item>
   </string-array>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d2d6392..b33d968 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Geolocalizzazione"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Account"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sicurezza e posizione"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Crittografia e credenziali"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefono criptato"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferenze schermata di blocco"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefono criptato"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Pref. schermata di blocco"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Disattivata dall\'amministratore"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stato sicurezza"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Blocco schermo, impronta digitale"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Blocco schermo"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impronta digitale"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestisci impronte digitali"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Utilizza l\'impronta digitale per"</string>
@@ -570,7 +569,7 @@
     <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>
-    <string name="manage_device_admin" msgid="537804979483211453">"App di amministrazione del dispositivo"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"App di amministrazione dispositivo"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Nessuna app attiva"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> app attive</item>
@@ -671,7 +670,7 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Attiva NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC scambia i dati tra questo dispositivo e altri dispositivi o destinazioni nelle vicinanze, ad esempio terminali di pagamento, lettori di accesso e annunci o tag interattivi."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto a trasmettere i contenuti dell\'applicazione tramite NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Pronto a trasmettere i contenuti dell\'app tramite NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"OFF"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Non disponibile perché la tecnologia NFC non è attiva"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Invia notifica quando è disponibile una rete pubblica di alta qualità"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Attiva Wi‑Fi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"La connessione Wi-Fi si riattiverà vicino a reti salvate di alta qualità, ad esempio la connessione di casa"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Non disponibile perché la ricerca di reti Wi-Fi è disattivata"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evita connessioni deboli"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Non utilizzare una rete Wi‑Fi a meno che non abbia una buona connessione a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilizza solo reti con una buona connessione a Internet"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configura Wi‑Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Indirizzi IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Reti salvate"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Impostazioni IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Le impostazioni Wi‑Fi avanzate non sono disponibili per questo utente"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"OFF"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Attiva lo screensaver per controllare ciò che accade quando il telefono è inserito nel dock e/o in stand-by."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quando iniziare"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Screensaver corrente"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Inizia subito"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Impostazioni"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Solleva per riattivare"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Schermata notifica in arrivo"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Display Ambient"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Lo schermo viene riattivato quando ricevi notifiche"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Ingrandisci o riduci il testo"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Dettagli sull\'app"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App installata da <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Ulteriori informazioni su <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Op. app"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"In corso"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Mai utilizzata)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Guida scorciatoie da tastiera"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostra le scorciatoie disponibili"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predefinito"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocità del puntatore"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controller di gioco"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilizzo della vibrazione"</string>
@@ -1795,7 +1792,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Ritardo tocco e pressione"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inversione colori"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Potrebbe influire sulle prestazioni"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Clic quando il puntatore si ferma"</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>
@@ -1912,11 +1909,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Esecuzione in background consentita quando l\'app non è in uso"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Attività in background limitata quando l\'app non è in uso"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Esecuzione in background dell\'app non consentita"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Utilizzo della schermata dall\'ultima ricarica completa"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Utilizzo dello schermo dall\'ultima ricarica completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo dello schermo"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scansione rete mobile"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> fa"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizzo dell\'app dall\'ultima ricarica (<xliff:g id="TIME">%1$s</xliff:g> fa)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> fa"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizzo dell\'app dall\'ultima ricarica (<xliff:g id="TIME">^1</xliff:g> fa)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo per cui la schermata è rimasta attiva dalla ricarica completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizzo del dispositivo dall\'ultima ricarica completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizzo batteria dallo scollegamento"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Fotocamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Cellulare in standby"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Rete mobile in standby"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chiamate vocali"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inattivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefono inattivo"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Il consumo energetico totale è determinato in gran parte dall\'utilizzo della batteria e in misura minore da fattori di diverso tipo. Sono questi altri fattori a determinare la differenza tra il consumo energetico totale previsto e il consumo effettivo della batteria."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo batteria sovrastimato"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Usata per %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Usato per <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizzato da <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> dell\'utilizzo totale della batteria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analisi dettagliata dall\'ultima ricarica completa"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Impostazioni input e output vocale"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ricerca vocale"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tastiera Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Voce"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Impostazioni input vocale"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Input vocale"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Servizi di input vocale"</string>
@@ -2138,7 +2134,7 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Digita la password per l\'archivio credenziali."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Password attuale:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Rimuovere tutti i contenuti?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"La password deve essere formata da almeno 8 caratteri."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"La password deve includere almeno 8 caratteri."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Password errata."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Password non corretta. Hai un\'altra possibilità prima che l\'archivio credenziali venga cancellato."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Password non corretta. Hai altre <xliff:g id="NUMBER">%1$d</xliff:g> possibilità prima che l\'archivio credenziali venga cancellato."</string>
@@ -2169,7 +2165,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Disattiva l\'app di amministrazione di questo dispositivo"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Disinstalla app"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Disattiva e disinstalla"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"App di amministrazione del dispositivo"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"App di ammin. del dispositivo"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Nessuna app di amministrazione del dispositivo disponibile"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personale"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Lavoro"</string>
@@ -2318,7 +2314,7 @@
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"Imposta limite dati Wi‑Fi"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi‑Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
-    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Mobili"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"Rete mobile"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobile"</string>
@@ -2352,7 +2348,7 @@
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi.\n\nQuesta impostazione influisce su tutti gli utenti di questo tablet."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Se limiti i dati mobili in background, alcuni servizi e app non funzioneranno senza connessione a una rete Wi‑Fi.\n\nQuesta impostazione influisce su tutti gli utenti di questo telefono."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"avviso"</font></string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="12">"Avviso"</font>\n<font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limite"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Applicazioni rimosse"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"App e utenti rimossi"</string>
@@ -2430,7 +2426,7 @@
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"La VPN sempre attiva richiede un indirizzo IP per server e DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Nessuna connessione di rete disponibile. Riprova più tardi."</string>
     <string name="vpn_disconnected" msgid="280531508768927471">"Disconnesso da VPN"</string>
-    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Nessuno"</string>
+    <string name="vpn_disconnected_summary" msgid="3082851661207900606">"Nessuna"</string>
     <string name="vpn_missing_cert" msgid="5357192202207234745">"Manca un certificato. Prova a modificare il profilo."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Sistema"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Utente"</string>
@@ -2537,7 +2533,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"La cronologia chiamate verrà condivisa con questo utente."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Desideri attivare chiamate e SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"La cronologia chiamate e SMS verrà condivisa con questo utente."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Informazioni per le emergenze"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Informazioni per emergenze"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Info e contatti per <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Consenti app e contenuti"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Applicazioni con limitazioni"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume notifiche"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Suono di notifica predefinito"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Audio fornito dall\'app"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Suono di notifica predefinito"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Suono sveglia predefinito"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrazione per le chiamate"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Altri suoni"</string>
@@ -2739,7 +2737,7 @@
     <string name="charging_sounds_title" msgid="1132272552057504251">"Suoni caricamento"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Suoni dock"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Suoni alla pressione"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Vibra alla pressione"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Vibrazione alla pressione"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Riproduzioni con altoparlanti dock"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tutti i dispositivi audio"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Dispositivi di solo audio"</string>
@@ -2780,9 +2778,9 @@
     <string name="advanced_section_header" msgid="8833934850242546903">"Avanzate"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Notifiche di lavoro"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Luce lampeggiante"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Nella schermata di blocco"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti della notifica"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Nascondi contenuti sensibili della notifica"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Sulla schermata di blocco"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti delle notifiche"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Nascondi contenuti sensibili delle notifiche"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Non visualizzare del tutto le notifiche"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Quando il dispositivo è bloccato, come desideri che vengano visualizzate le notifiche?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Notifiche"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Quando il dispositivo è bloccato, come desideri che vengano visualizzate le notifiche del profilo?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notifiche del profilo"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notifiche"</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_blocked" msgid="7938180808339386300">"Non mostrare mai notifiche"</string>
@@ -2799,10 +2798,10 @@
     <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">"Con suoneria e visualizzazione sullo schermo"</string>
-    <string name="notification_importance_min_summary" msgid="8233873580287975662">"Bassa: Senza suoneria o interruzione visiva"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Media: Senza suoneria"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Alta: Con suoneria"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgente: Con suoneria e 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Assistente notifica"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android sta bloccando la visualizzazione sul dispositivo delle notifiche dell\'app"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android sta bloccando la visualizzazione sul dispositivo di questa categoria di notifiche"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Altro"</string>
     <string name="no_channels" msgid="3077375508177744586">"L\'app non ha pubblicato alcuna notifica"</string>
@@ -2850,17 +2851,17 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> categoria eliminata</item>
     </plurals>
     <string name="notification_badges" msgid="4468378071033143539">"Badge di notifica"</string>
-    <string name="notification_toggle_on" msgid="650145396718191048">"Attive"</string>
+    <string name="notification_toggle_on" msgid="650145396718191048">"On"</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Non attive"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Blocca tutto"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"Non mostrare mai queste notifiche"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Mostra notifiche"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Non mostrare mai notifiche nella relativa area o su dispositivi periferici"</string>
-    <string name="notification_badge_title" msgid="7166470350070693657">"Icona dell\'app dei badge"</string>
+    <string name="notification_badge_title" msgid="7166470350070693657">"Badge sull\'icona dell\'app"</string>
     <string name="notification_badge_summary" msgid="3944771498030335669">"Mostra notifiche come badge nell\'app Home, se supportato."</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Ignora Non disturbare"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Consenti interruzione per queste notifiche quando l\'opzione Non disturbare è impostata su Solo con priorità"</string>
-    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Nella schermata di blocco"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Consenti notifiche quando l\'opzione Non disturbare è impostata su Solo con priorità"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Sulla schermata di blocco"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloccate"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Priorità"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Riservate"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Rimani in orientamento corrente"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Avvio sicuro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continua"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta del PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta della sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta della password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo il PIN prima dell\'avvio. Fino all\'avvio il dispositivo non potrà ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nQuesto aiuta a proteggere i dati in caso di furto o smarrimento dei dispositivi."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo la sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non potrà ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nQuesto aiuta a proteggere i dati in caso di furto o smarrimento dei dispositivi."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non potrà ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nQuesto aiuta a proteggere i dati in caso di furto o smarrimento dei dispositivi."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Richiedi PIN per avviare il dispositivo"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Richiedi sequenza per avviare il dispositivo"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Richiedi password per avviare il dispositivo"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"No, grazie"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"No, grazie"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"No, grazie"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta del PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere il PIN per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta della sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere la sequenza per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Puoi proteggere ulteriormente il dispositivo attivando la richiesta della password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie. \n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere la password per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo il PIN prima dell\'avvio. Fino all\'avvio, il dispositivo non potrà ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere il PIN per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo la sequenza prima dell\'avvio. Fino all\'avvio, il dispositivo non potrà ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere la sequenza per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Oltre a utilizzare la tua impronta digitale per sbloccare il dispositivo, puoi aggiungere ulteriore protezione richiedendo la password prima dell\'avvio. Fino all\'avvio, il dispositivo non può ricevere chiamate, messaggi o notifiche, incluse le sveglie.\n\nIn questo modo puoi proteggere i dati su dispositivi persi o rubati. Vuoi richiedere la password per avviare il dispositivo?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sì"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Richiedere il PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Richiedere la sequenza?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Richiedere la password?"</string>
@@ -3006,7 +3003,7 @@
     <string name="change" msgid="6657848623929839991">"Cambia"</string>
     <string name="change_storage" msgid="600475265207060436">"Cambia memoria"</string>
     <string name="notifications_label" msgid="8543457911148619898">"Notifiche app"</string>
-    <string name="notifications_enabled" msgid="6983396130566021385">"Attive"</string>
+    <string name="notifications_enabled" msgid="6983396130566021385">"On"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"Tutte disattivate"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_0">%1$d</xliff:g> di <xliff:g id="COUNT_1">%2$d</xliff:g> categorie disattivate"</string>
     <string name="notifications_silenced" msgid="4728603513072110381">"Senza audio"</string>
@@ -3077,10 +3074,10 @@
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predefinito)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Quota di archiviaz. per app"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Accesso a dati di utilizzo"</string>
-    <string name="permit_usage_access" msgid="4012876269445832300">"Consenti accesso a dati di utilizzo"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Accesso ai dati di utilizzo"</string>
+    <string name="permit_usage_access" msgid="4012876269445832300">"Consenti accesso ai dati di utilizzo"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Preferenze di utilizzo delle app"</string>
-    <string name="usage_access_description" msgid="1352111094596416795">"L\'accesso a dati di utilizzo consente a un\'app di controllare quali altre app utilizzi e con quale frequenza, oltre a informazioni come operatore, lingua impostata e altri dettagli."</string>
+    <string name="usage_access_description" msgid="1352111094596416795">"L\'accesso ai dati di utilizzo consente a un\'app di controllare quali altre app utilizzi e con quale frequenza, oltre a informazioni come operatore, lingua impostata e altri dettagli."</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"Memoria"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"Dettagli memoria"</string>
     <string name="always_running" msgid="6042448320077429656">"Sempre attiva (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Questa autorizzazione consente a un\'app di modificare le impostazioni di sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sì"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Sì"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"No"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Consenti l\'installazione di app"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Consentite"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Non consentite"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Consenti da questa fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Doppia rotazione per fotocamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Apri l\'app Fotocamera ruotando due volte il polso"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Premi due volte tasto di acc. per fotoc."</string>
@@ -3297,12 +3294,12 @@
     <string name="cell_data_template" msgid="405684854174361041">"Dati mobili utilizzati: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"Dati Wi-Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"Dati Ethernet: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
-    <string name="cell_warning_only" msgid="763147658209027140">"Avviso relativo ai dati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="cell_warning_and_limit" msgid="2273413629267437470">"Avviso relativo ai dati: <xliff:g id="ID_1">%1$s</xliff:g>/Limite dati: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="cell_warning_only" msgid="763147658209027140">"Avviso sui dati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="cell_warning_and_limit" msgid="2273413629267437470">"Avviso sui dati: <xliff:g id="ID_1">%1$s</xliff:g>/Limite dati: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Ciclo di fatturazione"</string>
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Il ciclo mensile ha inizio il giorno <xliff:g id="ID_1">%1$s</xliff:g> di ogni mese"</string>
     <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mensile a partire dal giorno <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="network_restrictions" msgid="8234695294536675380">"Limitazioni di rete"</string>
+    <string name="network_restrictions" msgid="8234695294536675380">"Restrizioni di rete"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> restrizioni</item>
       <item quantity="one">1 restrizione</item>
@@ -3310,7 +3307,7 @@
     <string name="operator_warning" msgid="1862988028996859195">"I dati dell\'operatore potrebbero differire da quelli del dispositivo"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Dati utilizzati: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"Imposta avviso sui dati"</string>
-    <string name="data_warning" msgid="209133958008062117">"Avviso relativo ai dati"</string>
+    <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>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Connesso a"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Riquadri sviluppatore per impostazioni rapide"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Siamo qui per aiutarti"</string>
@@ -3468,14 +3466,14 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Per controllare velocemente le notifiche, solleva il telefono."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Per controllare velocemente le notifiche, solleva il tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Per controllare velocemente le notifiche, solleva il dispositivo."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Fai scorrere per controllare le notifiche"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Usa l\'impronta digitale per le notifiche"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del telefono."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Per controllare le notifiche, scorri verso il basso sul sensore di impronte digitali sul retro del dispositivo."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistenza gesto"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensibilità"</string>
-    <string name="gesture_setting_on" msgid="3455094265233870280">"Attivati"</string>
+    <string name="gesture_setting_on" msgid="3455094265233870280">"On"</string>
     <string name="gesture_setting_off" msgid="5230169535435881894">"Disattivati"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"Il bootloader è già sbloccato"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"Devi prima connetterti a Internet"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(disattivato per l\'utente <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Servizio di compilazione automatica"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatico, compilazione, compilazione automatica"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Vuoi impostare <xliff:g id="APP_NAME_0">%1$s</xliff:g> come app di compilazione automatica? <xliff:g id="APP_NAME_1">%1$s</xliff:g> sarà in grado di leggere lo schermo e di compilare i campi nelle altre app."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Verifica che questa app sia attendibile&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=La Compilazione Automatica di Google&gt;%1$s&lt;/xliff:g&gt; usa ciò che è presente nella schermata per stabilire quali contenuti possono essere compilati automaticamente."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema del dispositivo"</string>
     <string name="default_theme" msgid="7085644992078579076">"Valore predefinito"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestione memoria: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 26bab42..282da43 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -34,8 +34,8 @@
     <item msgid="8881760709354815449">"30 שניות"</item>
     <item msgid="7589406073232279088">"דקה אחת"</item>
     <item msgid="7001195990902244174">"2 דקות"</item>
-    <item msgid="7489864775127957179">"חמש דקות"</item>
-    <item msgid="2314124409517439288">"עשר דקות"</item>
+    <item msgid="7489864775127957179">"5 דקות"</item>
+    <item msgid="2314124409517439288">"10 דקות"</item>
     <item msgid="6864027152847611413">"30 דקות"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
@@ -122,8 +122,8 @@
     <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
   <string-array name="wifi_p2p_wps_setup">
     <item msgid="5085064298144493867">"לחצן דחיפה"</item>
-    <item msgid="1624323946324499595">"‏PIN ממכשיר עמית"</item>
-    <item msgid="5366790421523328066">"‏PIN ממכשיר זה"</item>
+    <item msgid="1624323946324499595">"קוד גישה ממכשיר עמית"</item>
+    <item msgid="5366790421523328066">"קוד גישה ממכשיר זה"</item>
   </string-array>
   <string-array name="wifi_p2p_status">
     <item msgid="1701505390737218306">"מחובר"</item>
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ללא"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"אין"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index b406b76..1cc9027 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -19,7 +19,7 @@
     <string name="yes" msgid="4676390750360727396">"כן"</string>
     <string name="no" msgid="6731231425810196216">"לא"</string>
     <string name="create" msgid="3578857613172647409">"צור"</string>
-    <string name="allow" msgid="3349662621170855910">"אפשר"</string>
+    <string name="allow" msgid="3349662621170855910">"כן, זה בסדר"</string>
     <string name="deny" msgid="6947806159746484865">"דחה"</string>
     <string name="dlg_close" msgid="7471087791340790015">"סגור"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"עבור אל"</string>
@@ -80,7 +80,7 @@
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"‏מחק כרטיס SD"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"תצוגה מקדימה"</string>
     <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"תצוגה מקדימה, דף <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> מתוך <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
-    <string name="font_size_summary" msgid="1690992332887488183">"הגדל או הקטן את גודל הטקסט שמופיע במסך."</string>
+    <string name="font_size_summary" msgid="1690992332887488183">"שינוי גודל הטקסט שמופיע במסך."</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"הקטנה"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"הגדלה"</string>
     <!-- no translation found for font_size_preview_text (4818424565068376732) -->
@@ -153,14 +153,14 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"האם ברצונך להתחבר אל \"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\"?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"בקשת גישה לספר טלפונים"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> רוצה לגשת אל אנשי הקשר ולהיסטוריית השיחות שלך. האם לתת הרשאה ל-<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>?"</string>
-    <string name="bluetooth_remember_choice" msgid="6919682671787049800">"אל תשאל שוב"</string>
-    <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"אל תשאל שוב"</string>
+    <string name="bluetooth_remember_choice" msgid="6919682671787049800">"ראיתי פעם אחת, זה מספיק"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"ראיתי פעם אחת, זה מספיק"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"בקשת גישה להודעות"</string>
     <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="date_and_time" msgid="9062980487860757694">"תאריך ושעה"</string>
-    <string name="choose_timezone" msgid="1362834506479536274">"בחר אזור זמן"</string>
+    <string name="choose_timezone" msgid="1362834506479536274">"בחירת אזור זמן"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
     <skip />
     <string name="intent_sender_sendbroadcast_text" msgid="1415735148895872715">"שלח <xliff:g id="BROADCAST">broadcast</xliff:g>"</string>
@@ -285,10 +285,10 @@
     <string name="cellular_data_summary" msgid="4660351864416939504">"התר שימוש בנתונים ברשת סלולרית"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"אפשר שימוש בנתונים בעת נדידה"</string>
     <string name="roaming" msgid="3596055926335478572">"נדידת נתונים"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"התחבר לשירותי נתונים בנדידה"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"התחבר לשירותי נתונים בנדידה"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"חיבור לשירותי נתונים בנדידה"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"חיבור לשירותי נתונים בנדידה"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"איבדת את קישוריות הנתונים כיוון שעזבת את הרשת הביתית בזמן שנדידת הנתונים היתה כבויה."</string>
-    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"הפעל"</string>
+    <string name="roaming_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>
@@ -307,11 +307,11 @@
     <string name="date_time_24hour_title" msgid="3203537578602803850">"פורמט 24 שעות"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"פורמט 24 שעות"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"שעה"</string>
-    <string name="date_time_set_time" msgid="5716856602742530696">"הגדר שעה"</string>
+    <string name="date_time_set_time" msgid="5716856602742530696">"הגדרת שעה"</string>
     <string name="date_time_set_timezone_title" msgid="3047322337368233197">"אזור זמן"</string>
-    <string name="date_time_set_timezone" msgid="5045627174274377814">"בחר אזור זמן"</string>
+    <string name="date_time_set_timezone" msgid="5045627174274377814">"אזור זמן"</string>
     <string name="date_time_set_date_title" msgid="6928286765325608604">"תאריך"</string>
-    <string name="date_time_set_date" msgid="7021491668550232105">"הגדר תאריך"</string>
+    <string name="date_time_set_date" msgid="7021491668550232105">"הגדרת תאריך"</string>
     <string name="zone_list_menu_sort_alphabetically" msgid="5683377702671088588">"מיין לפי סדר אלפביתי"</string>
     <string name="zone_list_menu_sort_by_timezone" msgid="2720190443744884114">"מיין לפי אזור זמן"</string>
     <string name="date_picker_title" msgid="1338210036394128512">"תאריך"</string>
@@ -333,20 +333,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"חשבונות"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"מיקום"</string>
     <string name="account_settings_title" msgid="626177544686329806">"חשבונות"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"אבטחה ומיקום"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"הצפנה ופרטי כניסה"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"טלפון מוצפן"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"טלפון מוצפן"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"העדפות מסך הנעילה"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"‏הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"פרטיות"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"הושבת על ידי מנהל המכשיר"</string>
     <string name="security_status_title" msgid="5848766673665944640">"סטטוס אבטחה"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"נהל טביעות אצבע"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"השתמש בטביעות אצבע ל-"</string>
@@ -359,12 +358,12 @@
       <item quantity="one">טביעת אצבע <xliff:g id="COUNT_0">%1$d</xliff:g> הוגדרה</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"פתח עם טביעת אצבע"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_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שים לב: ייתכן ששימוש בטביעת אצבע יעניק פחות אבטחה מקו ביטול נעילה או מקוד גישה חזקים."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"גע בחיישן טביעות האצבע כדי לאשר רכישות או להיכנס לאפליקציות. בחר בקפידה את טביעות האצבע שתוסיף. הבעלים של כל טביעת אצבע שתוסיף יוכל לבצע את כל הפעולות האלה.\n\nשים לב: לא תוכל להשתמש בטביעת האצבע שלך כדי לבטל את הנעילה של מכשיר זה. לקבלת מידע נוסף, פנה למנהל המערכת בארגון שלך."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"גע בחיישן טביעות אצבע כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות. בחר בקפידה את טביעות האצבע שתוסיף. אפילו הבעלים של טביעת אצבע אחת שתוסיף יוכל לבצע את הפעולות האלה.\n\nשים לב: ייתכן ששימוש בטביעת אצבע יעניק פחות אבטחה מאשר קו ביטול נעילה או קוד גישה חזקים."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"בטל"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"גע בחיישן טביעות האצבע כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות. בחר בקפידה את מי שאת טביעות האצבע שלהם ברצונך להוסיף. כל מי שהוספת טביעת אצבע שלו או שלה יוכלו לבצע את הפעולות האלה.\n\nשים לב: ייתכן ששימוש בטביעת אצבע פחות בטוח מאבטחה באמצעות קו ביטול נעילה או קוד גישה חזקים."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"גע בחיישן טביעות האצבע כדי לאשר רכישות או להיכנס לאפליקציות. בחר בקפידה את מי שאת טביעות האצבע שלהם ברצונך להוסיף. כל מי שהוספת טביעת אצבע שלו או שלה יוכלו לבצע את הפעולות האלה.\n\nשים לב: אי אפשר להשתמש בטביעת האצבע שלך כדי לבטל את הנעילה של מכשיר זה. לקבלת מידע נוסף, פנה למנהל המערכת בארגון שלך."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"גע בחיישן טביעות אצבע כדי לבטל את נעילת הטלפון, לאשר רכישות או להיכנס אל אפליקציות. בחר בקפידה את מי שאת טביעות האצבע שלהם ברצונך להוסיף. כל מי שהוספת טביעת אצבע שלו או שלה יוכלו לבצע את הפעולות האלה.\n\nשים לב: ייתכן ששימוש בטביעת אצבע פחות בטוח מאבטחה באמצעות קו ביטול נעילה או קוד גישה חזקים."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"ביטול"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"דלג"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"הוסף טביעת אצבע"</string>
@@ -381,8 +380,8 @@
     <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"איור המציג את המיקום של חיישן טביעת האצבע במכשיר"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"שם"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"אישור"</string>
-    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"מחק"</string>
-    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"בוא נתחיל"</string>
+    <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"מחיקה"</string>
+    <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"אפשר להתחיל"</string>
     <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"הנח את האצבע על החיישן והרם אותה לאחר שתרגיש רטט"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"המשך"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"הזז מעט את האצבע כדי להוסיף את כל החלקים של טביעת האצבע"</string>
@@ -399,7 +398,7 @@
     <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="fingerprint_enroll_button_add" msgid="6317978977419045463">"הוסף עוד"</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>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" אפשרות נעילת המסך מושבתת. למידע נוסף ניתן לפנות למנהל המכשיר בארגון. "<annotation id="admin_details">"למידע נוסף"</annotation>\n\n"עדיין ניתן להשתמש בטביעת האצבע שלך כדי לאשר רכישות ולגשת לאפליקציות. "<annotation id="url">"למידע נוסף"</annotation></string>
@@ -422,8 +421,8 @@
     <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">"‏אין PIN או סיסמה לנעילת מסך"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"‏עליך להגדיר PIN או סיסמה לנעילת מסך כדי שתוכל להתחיל בהצפנה."</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>
@@ -462,15 +461,15 @@
     <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">"‏שנה או השבת אבטחת קו, PIN או סיסמה"</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>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"החלקה"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"אין אבטחה"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"קו"</string>
+    <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"קו ביטול נעילה"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"אבטחה בינונית"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN"</string>
+    <string name="unlock_set_unlock_pin_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_summary" msgid="8856220848940929546">"אבטחה גבוהה"</string>
@@ -485,7 +484,7 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"ללא"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"החלקה"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"קו ביטול נעילה"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</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">"לאחר הגדרה של נעילת מסך, תוכל גם להגדיר את טביעת האצבע ב\'הגדרות\' &gt; \'אבטחה\'."</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"כיבוי נעילת מסך"</string>
@@ -495,8 +494,8 @@
     <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"התכונות להגנת המכשיר לא יפעלו בלי קו ביטול הנעילה.<xliff:g id="EMPTY_LINE">
 
 </xliff:g>גם טביעות האצבעות ששמרת יוסרו מהמכשיר הזה ולא תוכל לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן.\""</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"‏התכונות להגנת המכשיר לא יפעלו בלי ה-PIN."</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"‏התכונות להגנת המכשיר לא יפעלו בלי ה-PIN.<xliff:g id="EMPTY_LINE">
+    <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">
 
 </xliff:g>גם טביעות האצבעות ששמרת יוסרו מהמכשיר הזה ולא תוכל לבטל את נעילת הטלפון, לאשר רכישות או להיכנס לאפליקציות בעזרתן.\""</string>
     <string name="unlock_disable_frp_warning_content_password" msgid="5420612686852555537">"התכונות להגנת המכשיר לא יפעלו בלי הסיסמה."</string>
@@ -525,7 +524,7 @@
 </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>
+    <string name="unlock_change_lock_pin_title" msgid="806629901095938484">"שנה קוד גישה לביטול נעילה"</string>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
     <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"נסה שוב. ניסיון <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> מתוך <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g>."</string>
     <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"ניסיון אחרון"</string>
@@ -533,7 +532,7 @@
     <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"אם תזין קוד גישה שגוי בפרופיל העבודה בניסיון הזה, פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"אם תזין סיסמה שגויה בפרופיל העבודה בניסיון הזה, פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"נעשו יותר מדי ניסיונות שגויים. פרופיל העבודה שלך והנתונים המשויכים יוסרו מהמכשיר הזה."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"בטל"</string>
+    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ביטול"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"צריכה להכיל <xliff:g id="COUNT">%d</xliff:g> תווים לפחות"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"קוד הגישה צריך להיות באורך של <xliff:g id="COUNT">%d</xliff:g> ספרות לפחות"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"המשך"</string>
@@ -588,7 +587,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"ביטול"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"הבא"</string>
     <string name="lock_setup" msgid="3355847066343753943">"ההגדרה הושלמה."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"אפליקציות למנהל המכשיר"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"אפליקציות לניהול המכשיר"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"אין אפליקציות פעילות"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="two"><xliff:g id="COUNT_1">%d</xliff:g> אפליקציות פעילות</item>
@@ -613,10 +612,10 @@
     <string name="bluetooth_pairing_request" msgid="2605098826364694673">"האם להתאים עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_pairing_key_msg" msgid="418124944140102021">"‏קוד התאמת Bluetooth"</string>
     <string name="bluetooth_enter_passkey_msg" msgid="6813273136442138444">"‏הקלד את קוד ההתאמה ולאחר מכן לחץ על Return או Enter"</string>
-    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"‏PIN מכיל אותיות או סמלים"</string>
+    <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"קוד הגישה מכיל אותיות או סמלים"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"בדרך כלל 0000 או 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"חייב להיות בן 16 ספרות"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"‏ייתכן שתצטרך להקליד את קוד ה-PIN הזה גם במכשיר השני."</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"ייתכן שתצטרך להקליד את קוד הגישה הזה גם במכשיר השני."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"ייתכן שתצטרך להקליד את המפתח הזה גם במכשיר השני."</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"‏כדי להתאים עם:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;ודא שהמכשיר מציג סיסמה זו:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"‏מאת:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;לבצע התאמה עם מכשיר זה?"</string>
@@ -646,7 +645,7 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"בטל התאמה"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"התנתק ובטל התאמה"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"אפשרויות..."</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"מתקדם"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"אפשרויות מתקדמות"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"‏Bluetooth מתקדם"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"‏כש-Bluetooth פועל, יש קשר למכשירי Bluetooth אחרים."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"‏כדי לשפר את דיוק המיקום, אפליקציות ושירותים של המערכת יכולים עדיין לזהות התקני Bluetooth. תוכל לשנות זאת ב<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>הגדרות הסריקה<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -689,7 +688,7 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"‏<xliff:g id="REQUESTER">%s</xliff:g> רוצה לכבות את ה-Wi-Fi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</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_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 Beam"</string>
@@ -697,7 +696,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"כבוי"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"‏לא זמין משום שה-NFC כבוי"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"‏כשתכונה זו מופעלת, תוכל לשדר תוכן מאפליקציה למכשיר אחר התומך ב-NFC על ידי החזקת המכשירים קרוב זה לזה. לדוגמה, תוכל לשדר דפי אינטרנט, סרטוני YouTube, אנשי קשר ועוד.\n\nפשוט קרב את המכשירים זה לזה (בדרך כלל גב אל גב) ולאחר מכן גע במסך. האפליקציה תקבע מה ישודר."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"‏כשתכונה זו מופעלת, אפשר לשדר תוכן מאפליקציה למכשיר אחר התומך ב-NFC על ידי החזקת המכשירים קרוב זה לזה. לדוגמה, אפשר לשדר דפי אינטרנט, סרטוני YouTube, אנשי קשר ועוד.\n\nפשוט מקרבים את המכשירים זה לזה (בדרך כלל גב אל גב) ולאחר מכן נוגעים במסך. האפליקציה תקבע מה ישודר."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"‏הפעל את ה-Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi-Fi"</string>
@@ -714,12 +713,13 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏לא זמין מפני שסריקת ה-Wi-Fi כבויה"</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="wifi_install_credentials" msgid="3551143317298272860">"התקן אישורים"</string>
+    <string name="use_open_wifi_automatically_summary" msgid="2982091714252931713">"חיבור אוטומטית לרשתות ציבוריות באיכות גבוהה"</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>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"אל תציג שוב"</string>
@@ -740,10 +740,10 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"‏רשתות Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"‏לחצן WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"אפשרויות נוספות"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"‏ערך PIN ‏של WPS"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"‏ערך קוד גישה ‏של WPS"</string>
     <string name="wifi_menu_p2p" msgid="7619851399250896797">"‏Wi-Fi ישיר"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"סרוק"</string>
-    <string name="wifi_menu_advanced" msgid="7522252991919573664">"מתקדם"</string>
+    <string name="wifi_menu_advanced" msgid="7522252991919573664">"אפשרויות מתקדמות"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"הגדר"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"התחבר לרשת"</string>
     <string name="wifi_menu_remember" msgid="8814185749388713796">"זכור את הרשת"</string>
@@ -761,7 +761,7 @@
     <string name="wifi_wps_setup_title" msgid="8207552222481570175">"Wi‑Fi Protected Setup"</string>
     <string name="wifi_wps_setup_msg" msgid="315174329121275092">"‏מפעיל WPS..."</string>
     <string name="wifi_wps_onstart_pbc" msgid="817003360936932340">"‏לחץ על הלחצן \'Wi‑Fi Protected Setup\' בנתב שלך. ייתכן שבמקום שם זה יופיע הכיתוב \"WPS\" או הסמל הזה:"</string>
-    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"‏הזן את מספר ה-PIN: ‏<xliff:g id="NUMBER">%1$s</xliff:g> בנתב ה-Wi-Fi שלך. הפעולה עשויה לקחת עד שתי דקות."</string>
+    <string name="wifi_wps_onstart_pin" msgid="223344506445335358">"‏הזן את קוד הגישה: ‏<xliff:g id="NUMBER">%1$s</xliff:g> בנתב ה-Wi-Fi שלך. הפעולה עשויה לקחת עד שתי דקות."</string>
     <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>
@@ -807,7 +807,7 @@
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"הזן את סיסמת הרשת שלך"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל האפליקציות שרוצות לסרוק?"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"כדי לכבות, עבור אל \'מתקדם\' באפשרויות הנוספות."</string>
-    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"אפשר"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"כן, זה בסדר"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"דחה"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"האם להיכנס כדי להתחבר?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"<xliff:g id="APP_NAME">%1$s</xliff:g> דורש כניסה באינטרנט לפני חיבור לרשת."</string>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"‏הגדרת 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"מסכת רשת משנה"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏כתובות IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"רשתות שנשמרו"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"‏הגדרות IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"‏הגדרות Wi-Fi מתקדמות אינן זמינות למשתמש הזה"</string>
@@ -987,7 +985,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"בהירות"</string>
     <string name="brightness_summary" msgid="838917350127550703">"התאם את בהירות המסך"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"בהירות מותאמת"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"התאם את רמת הבהירות ביחס לתאורה הזמינה"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"התאמת רמת הבהירות לפי לתאורה הזמינה"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"כבויה"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"הבהירות המועדפת נמוכה מאוד"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"הבהירות המועדפת נמוכה"</string>
@@ -1041,14 +1039,13 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"כבוי"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"כדי לשלוט במה שקורה כאשר הטלפון בעגינה ו/או במצב שינה, הפעל את שומר המסך."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"מתי להפעיל"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"שומר המסך הנוכחי"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"התחל כעת"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"הגדרות"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"הרם כדי להוציא ממצב שינה"</string>
-    <string name="doze_title" msgid="5389406335828323273">"מסך הודעות שהתקבלו"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"הער את המסך כשמתקבלות הודעות"</string>
+    <string name="doze_title" msgid="2259176504273878294">"תצוגת אווירה"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"המסך יתעורר כשמתקבלות הודעות"</string>
     <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>
@@ -1056,24 +1053,24 @@
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"כבוי"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"נעול"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"‏נעילת כרטיס SIM"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"‏נעל כרטיס SIM"</string>
-    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"‏דרוש PIN כדי להשתמש בטאבלט"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"‏דרוש PIN כדי להשתמש בטלפון"</string>
-    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"‏דרוש PIN כדי להשתמש בטאבלט"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"‏נדרש PIN כדי להשתמש בטלפון"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"‏שנה PIN של SIM"</string>
-    <string name="sim_enter_pin" msgid="6608715137008508432">"‏PIN של SIM"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"‏נעל כרטיס SIM"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"‏נעילת כרטיס SIM"</string>
+    <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"דרוש קוד גישה כדי להשתמש בטאבלט"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"דרוש קוד גישה כדי להשתמש בטלפון"</string>
+    <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"דרוש קוד גישה כדי להשתמש בטאבלט"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"כדי להשתמש בטלפון יש להקליד קוד גישה"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"‏שנה קוד גישה ל-SIM"</string>
+    <string name="sim_enter_pin" msgid="6608715137008508432">"‏קוד הגישה ל-SIM"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"‏נעילת כרטיס SIM"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"‏בטל נעילה של כרטיס SIM"</string>
-    <string name="sim_enter_old" msgid="6074196344494634348">"‏PIN ישן של SIM"</string>
-    <string name="sim_enter_new" msgid="8742727032729243562">"‏PIN חדש של SIM"</string>
-    <string name="sim_reenter_new" msgid="6523819386793546888">"‏הקלד שוב את מספר ה-PIN החדש"</string>
-    <string name="sim_change_pin" msgid="7328607264898359112">"‏PIN של SIM"</string>
-    <string name="sim_bad_pin" msgid="2345230873496357977">"‏PIN שגוי"</string>
-    <string name="sim_pins_dont_match" msgid="1695021563878890574">"‏קודי ה-PIN אינם תואמים"</string>
-    <string name="sim_change_failed" msgid="3602072380172511475">"‏לא ניתן לשנות את קוד ה-PIN‏.\nכנראה שקוד ה-PIN שגוי."</string>
-    <string name="sim_change_succeeded" msgid="8556135413096489627">"‏ה-PIN של ה-SIM השתנה בהצלחה"</string>
-    <string name="sim_lock_failed" msgid="2489611099235575984">"‏לא ניתן לשנות את מצב הנעילה של כרטיס ה-SIM‏.\nכנראה שקוד ה-PIN שגוי."</string>
+    <string name="sim_enter_old" msgid="6074196344494634348">"‏קוד גישה ישן ל-SIM"</string>
+    <string name="sim_enter_new" msgid="8742727032729243562">"‏קוד גישה חדש ל-SIM"</string>
+    <string name="sim_reenter_new" msgid="6523819386793546888">"הקלד שוב את קוד הגישה החדש"</string>
+    <string name="sim_change_pin" msgid="7328607264898359112">"‏קוד הגישה ל-SIM"</string>
+    <string name="sim_bad_pin" msgid="2345230873496357977">"קוד גישה שגוי"</string>
+    <string name="sim_pins_dont_match" msgid="1695021563878890574">"קודי הגישה אינם תואמים"</string>
+    <string name="sim_change_failed" msgid="3602072380172511475">"לא ניתן לשנות את קוד הגישה‏.\nכנראה שקוד הגישה שגוי."</string>
+    <string name="sim_change_succeeded" msgid="8556135413096489627">"‏קוד הגישה של ה-SIM השתנה בהצלחה"</string>
+    <string name="sim_lock_failed" msgid="2489611099235575984">"‏לא ניתן לשנות מצב נעילה של כרטיס SIM‏.\nקוד הגישה שגוי."</string>
     <string name="sim_enter_ok" msgid="6475946836899218919">"אישור"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"ביטול"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"‏נמצאו מספר כרטיסי SIM"</string>
@@ -1082,14 +1079,14 @@
     <string name="sim_change_data_message" msgid="5854582807996717811">"להשתמש בחבילת הגלישה ב-<xliff:g id="NEW_SIM">%1$s</xliff:g> במקום ב-<xliff:g id="OLD_SIM">%2$s</xliff:g>?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"‏האם לעדכן כרטיס SIM מועדף?"</string>
     <string name="sim_preferred_message" msgid="8466930554330635780">"‏<xliff:g id="NEW_SIM">%1$s</xliff:g> הוא ה-SIM היחיד במכשיר. האם להשתמש ב-SIM זה לחיבור לאינטרנט באמצעות חבילת גלישה, לשיחות ולהודעות SMS?"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‏מספר PIN שגוי של כרטיס ה-SIM. עליך ליצור כעת קשר עם הספק על מנת לבטל את נעילת המכשיר."</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"‏קוד גישה שגוי של כרטיס ה-SIM. עליך ליצור כעת קשר עם הספק על מנת לבטל את נעילת המכשיר."</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <item quantity="two">‏קוד PIN שגוי של כרטיס SIM. נותרו לך <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות.</item>
-      <item quantity="many">‏קוד PIN שגוי של כרטיס SIM. נותרו לך <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות.</item>
-      <item quantity="other">‏קוד PIN שגוי של כרטיס SIM. נותרו לך <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות.</item>
-      <item quantity="one">‏קוד PIN שגוי של כרטיס SIM. נותר לך ניסיון <xliff:g id="NUMBER_0">%d</xliff:g> לפני שיהיה עליך ליצור קשר עם הספק כדי לבטל את נעילת המכשיר.</item>
+      <item quantity="two">‏קוד גישה שגוי של כרטיס SIM. נותרו לך <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות.</item>
+      <item quantity="many">‏קוד גישה שגוי של כרטיס SIM. נותרו לך <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות.</item>
+      <item quantity="other">‏קוד גישה שגוי של כרטיס SIM. נותרו לך <xliff:g id="NUMBER_1">%d</xliff:g> ניסיונות.</item>
+      <item quantity="one">‏קוד גישה שגוי של כרטיס SIM. נותר לך ניסיון <xliff:g id="NUMBER_0">%d</xliff:g> לפני שיהיה עליך ליצור קשר עם הספק כדי לבטל את נעילת המכשיר.</item>
     </plurals>
-    <string name="pin_failed" msgid="1848423634948587645">"‏פעולת מספר ה-PIN של כרטיס ה-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>
@@ -1189,7 +1186,7 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"שכח"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"הגדר"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"עיין"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"פנה שטח אחסון"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"פינוי שטח אחסון"</string>
     <string name="storage_menu_manage" msgid="5914482953856430780">"נהל אחסון"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"‏חיבור USB למחשב"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"חבר בתור"</string>
@@ -1296,7 +1293,7 @@
     <string name="menu_delete" msgid="6981294422841124659">"‏מחק APN"</string>
     <string name="menu_new" msgid="3014205883303921729">"‏צור APN חדש"</string>
     <string name="menu_save" msgid="8109345640668285399">"שמור"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"מחק"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"מחיקה"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"השדה \'שם\' לא יכול להיות ריק."</string>
     <string name="error_apn_empty" msgid="4932211013600863642">"‏ה-APN לא יכול להיות ריק."</string>
@@ -1308,9 +1305,9 @@
     <string name="reset_dashboard_title" msgid="4412694650600342973">"איפוס המכשיר"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"איפוס של הגדרות הרשת"</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>
@@ -1376,7 +1373,7 @@
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"קשירת <xliff:g id="DEVICE_NAME">%1$s</xliff:g> תבוטל."</string>
     <string name="tethering_footer_info" msgid="7287131664937054043">"השתמש בנקודה לשיתוף אינטרנט ובשיתוף אינטרנט בין ניידים כדי לספק חיבור לאינטרנט למכשירים אחרים באמצעות החיבור שלך לחבילת הגלישה."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"עזרה"</string>
-    <string name="network_settings_title" msgid="2876509814832830757">"רשת סלולרית"</string>
+    <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>
@@ -1410,9 +1407,9 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"‏השתמש ב-GPS לקביעת המיקום"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"סריקה"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"‏סריקת Wi-Fi"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"‏שפר את דיוק המיקום על ידי כך שתאפשר לשירותים ואפליקציות של המערכת לזהות רשתות Wi‑Fi בכל עת."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"‏ניתן לשפר את דיוק המיקום אם מאפשרים לשירותים ולאפליקציות של המערכת לזהות רשתות Wi‑Fi בכל עת."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"‏סריקת Bluetooth"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"‏שפר את דיוק המיקום על ידי כך שתאפשר לשירותים ואפליקציות של המערכת לזהות התקני Bluetooth בכל עת."</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"‏ניתן לשפר את דיוק המיקום אם מאפשרים לשירותים ולאפליקציות של המערכת לזהות התקני Bluetooth בכל עת."</string>
     <string name="location_network_based" msgid="9134175479520582215">"‏מיקום רשת Wi-Fi ורשת סלולרית"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"‏אפשר לאפליקציות להשתמש בשירות המיקום של Google כדי להעריך את מיקומך מהר יותר. נתוני מיקום אנונימיים ייאספו ויישלחו אל Google."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"‏המיקום נקבע באמצעות Wi-Fi"</string>
@@ -1452,17 +1449,17 @@
     <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_pattern_header" msgid="6949761069941694050">"הגדרת הקו"</string>
-    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"‏בחר את ה-PIN"</string>
+    <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"הגדרת הקו לביטול נעילה"</string>
+    <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"בחר את קוד הגישה"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"אשר את הסיסמה"</string>
-    <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"אשר את הקו"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"‏אשר את ה-PIN"</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_pins_dont_match" msgid="7226244811505606217">"‏קודי ה-PIN אינם תואמים"</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_pin_set_toast" msgid="6011826444725291475">"‏PIN הוגדר"</string>
-    <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"הוגדר קו"</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>
@@ -1475,12 +1472,12 @@
     <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_invalid_pin" msgid="15588049067548470">"‏מספר PIN שגוי"</string>
+    <string name="lockpassword_invalid_pin" msgid="15588049067548470">"קוד גישה שגוי"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"סיסמה שגויה"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"קו ביטול נעילה שגוי"</string>
     <string name="lock_settings_title" msgid="4213839087748988686">"אבטחת המכשיר"</string>
     <string name="lockpattern_change_lock_pattern_label" msgid="5679630792003440352">"שנה את קו ביטול הנעילה"</string>
-    <string name="lockpattern_change_lock_pin_label" msgid="266707138486731661">"‏שנה PIN לביטול נעילה"</string>
+    <string name="lockpattern_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>
@@ -1493,9 +1490,9 @@
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"נקה"</string>
     <string name="lockpattern_continue_button_text" msgid="4723771754714471410">"המשך"</string>
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"קו ביטול נעילה"</string>
-    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"דרוש קו"</string>
+    <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"יש צורך בקו לביטול הנעילה"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"יש לצייר קו לביטול נעילת המסך"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"הפוך את הקו לגלוי"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"הקו לביטול נעילה יהיה גלוי"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"הפיכת קו ביטול הנעילה של הפרופיל לגלוי"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"רטט בעת הקשה"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"לחצן ההפעלה ננעל מיידית"</string>
@@ -1517,7 +1514,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"זהה לנעילת המסך במכשיר"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"נהל אפליקציות"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"נהל והסר אפליקציות מותקנות"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"פרטי אפליקציה"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"פרטי אפליקציות"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"ניהול אפליקציות, הגדרת קיצורי דרך להפעלה מהירה"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"הגדרות אפליקציה"</string>
     <string name="install_applications" msgid="4872012136210802181">"מקורות לא ידועים"</string>
@@ -1526,7 +1523,7 @@
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"הטלפון והנתונים האישיים שלך פגיעים יותר להתקפות של אפליקציות לא מוכרות. על ידי התקנת אפליקציות ממקור זה, אתה מסכים לכך שאתה האחראי לכל נזק לטלפון או לכל אובדן של נתונים שעשויים להיגרם כתוצאה מהשימוש באפליקציות אלה."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"הגדרות מתקדמות"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"אפשר עוד אפשרויות הגדרה."</string>
-    <string name="application_info_label" msgid="5736524913065714880">"פרטי אפליקציה"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"פרטי אפליקציות"</string>
     <string name="storage_label" msgid="8700867073480107253">"אחסון"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"פתח כברירת מחדל"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ברירות מחדל"</string>
@@ -1554,7 +1551,7 @@
     <string name="uninstall_all_users_text" msgid="851857393177950340">"הסר התקנה עבור כל המשתמשים"</string>
     <string name="install_text" msgid="884360662922471113">"התקן"</string>
     <string name="disable_text" msgid="6544054052049395202">"השבת"</string>
-    <string name="enable_text" msgid="9217362512327828987">"הפעל"</string>
+    <string name="enable_text" msgid="9217362512327828987">"הפעלה"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"נקה נתונים"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"הסר התקנה של עדכונים"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"בחרת להפעיל אפליקציה זו כברירת מחדל עבור פעולות מסוימות."</string>
@@ -1570,7 +1567,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>
@@ -1630,7 +1627,7 @@
     <string name="system_package" msgid="1352722848400644991">"לא ניתן להתקין עדכוני מערכת במדיה חיצונית."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"אין אפשרות להתקין את אפליקציית מנהל המכשיר על מדיה חיצונית"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"לאלץ עצירה?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"אם אתה מאלץ עצירה של אפליקציה, ייתכן שהיא לא תפעל כהלכה."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"אם אתה מפסיק את פעילות האפליקציה בצורה מאולצת, ייתכן שהיא לא תפעל כהלכה."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"לא ניתן להעביר את האפליקציה. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"מיקום התקנה מועדף"</string>
@@ -1645,6 +1642,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(מעולם לא נעשה שימוש)"</string>
@@ -1717,11 +1715,10 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"סיוע למקלדת"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"מקלדת פיזית"</string>
     <string name="show_ime" msgid="2658582193437188227">"הצגת מקלדת וירטואלית"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"השאר אותו במסך בזמן שהמקלדת הפיזית פעילה"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"תישאר במסך בזמן שהמקלדת הפיזית פעילה"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"מסייע למקשי הקיצור"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"הצגת מקשי קיצור זמינים"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ברירת מחדל"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"עכבר/משטח עקיבה"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"מהירות המצביע"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"בקר משחק"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"השתמש ברטט"</string>
@@ -1746,8 +1743,8 @@
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"קיצור אופציונלי"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ערוך מילה"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ערוך"</string>
-    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"מחק"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"אין לך מילים במילון המשתמש. כדי להוסיף מילה, הקש על הלחצן \'הוסף\' (+)."</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"מחיקה"</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"אין לך מילים במילון המשתמש. כדי להוסיף מילה יש להקיש על לחצן \'הוספה\' (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"לכל השפות"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"שפות נוספות..."</string>
     <string name="testing" msgid="6584352735303604146">"בדיקה"</string>
@@ -1758,7 +1755,7 @@
     <string name="current_input_method" msgid="2636466029213488159">"מקלדת נוכחית"</string>
     <string name="input_method_selector" msgid="4311213129681430709">"בורר שיטות קלט"</string>
     <string name="input_method_selector_show_automatically_title" msgid="1001612945471546158">"אוטומטי"</string>
-    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"הצג תמיד"</string>
+    <string name="input_method_selector_always_show_title" msgid="3891824124222371634">"יופיע תמיד"</string>
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"הסתר תמיד"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"הגדר שיטות קלט"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"הגדרות"</string>
@@ -1775,11 +1772,11 @@
     <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_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="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>
@@ -1789,7 +1786,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"נגישות"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"הגדרות נגישות"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"קוראי מסך, פקדי אינטראקציה, תצוגה"</string>
-    <string name="vision_settings_title" msgid="4204111425716868288">"הגדרות ראייה"</string>
+    <string name="vision_settings_title" msgid="4204111425716868288">"הגדרות תצוגה"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"ניתן להתאים אישית את המכשיר הזה כדי שיתאים לצרכיך. ניתן לשנות את תכונות הנגישות מאוחר יותר ב\'הגדרות\'."</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"קוראי מסך"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"הקראת טקסט שמופיע במסך"</string>
@@ -1802,18 +1799,18 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"הקש על פריטים במסך כדי לשמוע הקראה שלהם"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"כתוביות"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"הגדלה"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"הגדלה באמצעות הקשה שלוש פעמים"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"הגדלה על-ידי הקשה שלוש פעמים"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"הגדלה בעזרת לחצן"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"הגדלה בעזרת לחצן והקשה שלוש פעמים"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"התקרב אל המסך"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"שינוי מרחק התצוגה (זום)"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"הקש שלוש פעמים כדי לשנות את המרחק מהתצוגה"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"הקש על לחצן כדי לשנות את מרחק התצוגה"</string>
     <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_shortcut_service_title" msgid="4779360749706905640">"שירות קיצור דרך"</string>
-    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"אפשר ממסך הנעילה"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"קיצור דרך לנגישות"</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_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"טקסט בניגודיות גבוהה"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"עדכון אוטומטי של הגדלת מסך"</string>
@@ -1821,11 +1818,11 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"לחצן ההפעלה מסיים שיחה"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"מצביע עכבר גדול"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"אודיו במונו"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"שלב ערוצים כאשר אתה מפעיל אודיו"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"שילוב ערוצים כאשר מפעילים אודיו"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"עיכוב של נגיעה והחזקה"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"היפוך צבעים"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"עשוי להשפיע על הביצועים"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"לחץ לאחר שהמצביע מפסיק לזוז"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"לחיצה אחרי שהמצביע מפסיק לזוז"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"השהייה לפני לחיצה"</string>
     <string name="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>
@@ -1900,10 +1897,10 @@
     <string name="touch_filtered_warning" msgid="8644034725268915030">"יש אפליקציה שמסתירה את בקשת ההרשאה, ולכן להגדרות אין אפשרות לאמת את התשובה."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"אם תפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"מפני שהפעלת שירות נגישות, המכשיר לא ישתמש בנעילת המסך כדי להגביר את הצפנת הנתונים."</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את תבנית ביטול הנעילה שלך."</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"‏מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את מספר ה-PIN שלך."</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"הפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, לכן עליך לאשר את קו ביטול הנעילה שלך."</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את קוד הגישה שלך."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"מאחר שהפעלת <xliff:g id="SERVICE">%1$s</xliff:g> משפיעה על הצפנת הנתונים, עליך לאשר את הסיסמה שלך."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"להציג את הפעולות שלך"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"זיהוי הפעולות שלך"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"קבל התראות כשאתה מבצע אינטראקציה עם אפליקציה."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"האם לעצור את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"הקשה על \'אישור\' תפסיק את <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
@@ -1934,7 +1931,7 @@
     <string name="print_print_jobs" msgid="3582094777756968793">"עבודות הדפסה"</string>
     <string name="print_print_job" msgid="7563741676053287211">"עבודת הדפסה"</string>
     <string name="print_restart" msgid="8373999687329384202">"הפעל מחדש"</string>
-    <string name="print_cancel" msgid="3621199386568672235">"בטל"</string>
+    <string name="print_cancel" msgid="3621199386568672235">"ביטול"</string>
     <string name="print_job_summary" msgid="8472427347192930694">"<xliff:g id="PRINTER">%1$s</xliff:g>\n<xliff:g id="TIME">%2$s</xliff:g>"</string>
     <string name="print_printing_state_title_template" msgid="5736107667714582025">"מדפיס את <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
     <string name="print_cancelling_state_title_template" msgid="7102968925358219875">"מבטל את <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -1957,8 +1954,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"שימוש במסך מאז הטעינה המלאה"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"צריכת החשמל של המסך"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"סריקה של רשתות סלולריות"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"לפני <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"שימוש באפליקציה מאז הטעינה המלאה (לפני <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"לפני <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"שימוש באפליקציה מאז הטעינה המלאה (לפני <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"משך הזמן שבו המסך פעל מאז הטעינה המלאה"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"שימוש במכשיר מאז הטעינה המלאה"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"צריכת סוללה מאז הניתוק"</string>
@@ -1989,7 +1986,7 @@
     <string name="power_camera" msgid="4976286950934622605">"מצלמה"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"סלולרי במצב המתנה"</string>
+    <string name="power_cell" msgid="3392999761958982492">"רשת סלולרית במצב המתנה"</string>
     <string name="power_phone" msgid="5392641106474567277">"שיחות קוליות"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"טאבלט לא פעיל"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"טלפון לא פעיל"</string>
@@ -2049,14 +2046,14 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"צריכת הסוללה היא הערכה מקורבת של צריכת החשמל ואינה כוללת את כל הגורמים לניצול הסוללה. \'שונות\' הוא ההפרש בין הצריכה המקורבת שחושבה ובין הניצול בפועל שאובחן בסוללה."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"חישוב יתר של שימוש בחשמל"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> מיליאמפר לשעה"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"‏%1$s שימוש"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"משך השימוש: <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_detail_foreground" msgid="3350401514602032183">"בזמן שימוש פעיל"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"בזמן שהיא ברקע"</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>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"‏<xliff:g id="PERCENT">%1$s</xliff:g> מתוך סה\"כ השימוש באפליקציה (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"מאז הטעינה המלאה"</string>
@@ -2072,7 +2069,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"אופטימיזציית אפליקציה"</string>
     <string name="battery_saver" msgid="1426682272004907982">"חיסכון בסוללה"</string>
-    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"הפעל אוטומטית"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"הפעלה אוטומטית"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"אף פעם"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"סוללה ברמת טעינה של <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_percentage" msgid="723291197508049369">"אחוז הטעינה של הסוללה"</string>
@@ -2109,7 +2106,7 @@
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 שעות"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 שעות"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"יום אחד"</string>
-    <string name="menu_show_system" msgid="8864603400415567635">"הצג מערכת"</string>
+    <string name="menu_show_system" msgid="8864603400415567635">"תהליכי מערכת"</string>
     <string name="menu_hide_system" msgid="4106826741703745733">"הסתר מערכת"</string>
     <string name="menu_show_percentage" msgid="4717204046118199806">"הצג אחוזים"</string>
     <string name="menu_use_uss" msgid="467765290771543089">"‏השתמש ב-Uss"</string>
@@ -2121,7 +2118,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"הגדרות קלט ופלט קולי"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"חיפוש קולי"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"‏מקלדת Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"דיבור"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"הגדרות של קלט קולי"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"קלט קולי"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"שירותי קלט קולי"</string>
@@ -2139,7 +2135,7 @@
     <string name="tts_install_voices_open" msgid="667467793360277465">"פתח האפליקציה"</string>
     <string name="tts_install_voices_cancel" msgid="4711492804851107459">"ביטול"</string>
     <string name="tts_reset" msgid="2661752909256313270">"איפוס המכשיר"</string>
-    <string name="tts_play" msgid="2628469503798633884">"הפעל"</string>
+    <string name="tts_play" msgid="2628469503798633884">"הפעלה"</string>
     <string name="gadget_title" msgid="5519037532720577836">"בקרת צריכת חשמל"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"‏מעדכן את הגדרת ה-Wi-Fi"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"‏מעדכן הגדרת Bluetooth"</string>
@@ -2161,15 +2157,15 @@
     <string name="credentials_title" msgid="4446234003860769883">"אחסון אישורים"</string>
     <string name="credentials_install" product="nosdcard" msgid="466093273825150847">"התקן מאמצעי אחסון"</string>
     <string name="credentials_install" product="default" msgid="953914549998062317">"‏התקן מכרטיס SD"</string>
-    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"התקן אישורים מאמצעי אחסון"</string>
-    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"‏התקן אישורים מכרטיס SD"</string>
+    <string name="credentials_install_summary" product="nosdcard" msgid="4220422806818210676">"התקנת אישורים מאמצעי אחסון"</string>
+    <string name="credentials_install_summary" product="default" msgid="5737658257407822713">"‏התקנת אישורים מכרטיס SD"</string>
     <string name="credentials_reset" msgid="3239382277144980418">"נקה פרטי כניסה"</string>
     <string name="credentials_reset_summary" msgid="3369361230171260282">"הסר את כל האישורים"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"פרטי כניסה מהימנים"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"‏הצג אישורי CA מהימנים"</string>
     <string name="user_credentials" msgid="3719013347787187083">"פרטי משתמש"</string>
     <string name="user_credentials_summary" msgid="7271228342106080167">"הצגה ועריכה של פרטי כניסה מאוחסנים"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"מתקדם"</string>
+    <string name="advanced_security_title" msgid="2434776238010578865">"אפשרויות מתקדמות"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"סוג אחסון"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"מגובה באמצעות חומרה"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"תוכנה בלבד"</string>
@@ -2187,8 +2183,8 @@
     <string name="credentials_erased" msgid="2907836028586342969">"אחסון האישורים נמחק."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"לא ניתן למחוק את האמצעי לאחסון אישורים."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"אחסון האישורים מופעל."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"‏עליך להגדיר PIN או סיסמה לנעילת המסך כדי שתוכל להשתמש באחסון אישורים."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"אפליקציות עם גישה לנתוני שימוש"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"עליך להגדיר קוד גישה או סיסמה לנעילת המסך כדי שתוכל להשתמש באחסון אישורים."</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>
@@ -2211,7 +2207,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"השבת את האפליקציה של מנהל המכשיר"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"הסר את התקנת האפליקציה"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"בטל את ההפעלה והסר התקנה"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"אפליקציות למנהל המכשיר"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"אפליקציות לניהול המכשיר"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"אין אפליקציה זמינה של מנהל מכשיר"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"אישי"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"עבודה"</string>
@@ -2235,7 +2231,7 @@
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"‏מתחבר לרשת Wi-Fi‏ <xliff:g id="NETWORK_NAME">%s</xliff:g>..."</string>
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"‏מחובר לרשת Wi-Fi ‏<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"הוסף רשת"</string>
-    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"לא מחובר"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"אין חיבור"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"הוסף רשת"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"רענן רשימה"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"דלג"</string>
@@ -2266,7 +2262,7 @@
     <string name="sync_active" msgid="8476943765960863040">"סנכרון פעיל"</string>
     <string name="account_sync_settings_title" msgid="5131314922423053588">"סנכרון"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"הסינכרון נתקל כעת בבעיות. הוא ימשיך תוך זמן קצר."</string>
-    <string name="add_account_label" msgid="7811707265834013767">"הוסף חשבון"</string>
+    <string name="add_account_label" msgid="7811707265834013767">"הוספת חשבון"</string>
     <string name="managed_profile_not_available_label" msgid="852263300911325904">"פרופיל עבודה עדיין אינו זמין"</string>
     <string name="work_mode_label" msgid="5794470908668593961">"מצב עבודה"</string>
     <string name="work_mode_summary" msgid="1620246003886940776">"אפשר לפרופיל עבודה לפעול, כולל אפליקציות, סנכרון ברקע ותכונות קשורות"</string>
@@ -2296,7 +2292,7 @@
     <string name="preference_change_password_title" msgid="8955581790270130056">"שנה סיסמה"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"הגדרות חשבון"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"הסר חשבון"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"הוסף חשבון"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"הוספת חשבון"</string>
     <string name="finish_button_label" msgid="481587707657751116">"סיום"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"להסיר את החשבון?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"הסרת חשבון זה תגרום להסרת כל ההודעות, אנשי הקשר ונתונים נוספים מהטאבלט!"</string>
@@ -2314,10 +2310,10 @@
     <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_pin" msgid="755720788765259382">"‏מספר PIN שגוי"</string>
+    <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"קוד גישה שגוי"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"בודק…"</string>
     <string name="starting_android" msgid="4001324195902252681">"‏מפעיל את Android…"</string>
-    <string name="delete" msgid="4219243412325163003">"מחק"</string>
+    <string name="delete" msgid="4219243412325163003">"מחיקה"</string>
     <string name="misc_files" msgid="6720680815969643497">"קובצי \'שונות\'"</string>
     <string name="misc_files_selected_count" msgid="4647048020823912088">"נבחרו <xliff:g id="NUMBER">%1$d</xliff:g> מתוך <xliff:g id="TOTAL">%2$d</xliff:g>"</string>
     <string name="misc_files_selected_count_bytes" msgid="2876232009069114352">"<xliff:g id="NUMBER">%1$s</xliff:g> מתוך <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
@@ -2326,7 +2322,7 @@
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"שימוש בנתונים באפליקציות"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"שימוש באפליקציות"</string>
-    <string name="data_usage_app_info_label" msgid="3409931235687866706">"מידע על אפליקציות"</string>
+    <string name="data_usage_app_info_label" msgid="3409931235687866706">"פרטי אפליקציות"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"חבילת גלישה"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"הגדרה של הגבלת נתונים"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"מחזור שימוש בנתונים"</string>
@@ -2360,7 +2356,7 @@
     <string name="data_usage_disable_wifi_limit" msgid="1394901415264660888">"‏הגדר מגבלת נתונים של Wi-Fi"</string>
     <string name="data_usage_tab_wifi" msgid="481146038146585749">"Wi-Fi"</string>
     <string name="data_usage_tab_ethernet" msgid="7298064366282319911">"Ethernet"</string>
-    <string name="data_usage_tab_mobile" msgid="454140350007299045">"‏Google לנייד"</string>
+    <string name="data_usage_tab_mobile" msgid="454140350007299045">"רשת סלולרית"</string>
     <string name="data_usage_tab_4g" msgid="1301978716067512235">"4G"</string>
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"ניידים"</string>
@@ -2384,8 +2380,8 @@
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"פעולה זו תחסוך בשימוש בנתונים ובעוצמת סוללה, אך יהיה עליך לסנכרן כל חשבון באופן ידני על מנת לאסוף מידע עדכני. בזמן עדכונים לא תקבל התראות."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"תאריך איפוס של מחזור שימוש"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"תאריך בכל חודש:"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"מערכת"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"הגדר אזהרת שימוש בנתונים"</string>
+    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"הגדר"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"מתי תופיע אזהרת שימוש בנתונים"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"הגדר מגבלת שימוש בנתונים"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"הגבלת שימוש בנתונים"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"כשתגיע למגבלה שהגדרת, הטאבלט יכבה את חבילת הגלישה.\n\nמכיוון שעשויים להיות הבדלים בין השימוש בנתונים שנמדד על ידי הטלפון לבין השימוש שנמדד על ידי הספק, מומלץ להגדיר מגבלה שמרנית."</string>
@@ -2403,10 +2399,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g> : נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>, כפי שנמדד על ידי הטאבלט. ייתכן שספק השירות שלך יחשב את נפח העברת הנתונים בצורה אחרת."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g> : נעשה שימוש בערך ב-<xliff:g id="TOTAL">%1$s</xliff:g>, כפי שנמדד על ידי הטלפון. ייתכן שספק השירות שלך יחשב את נפח העברת הנתונים בצורה אחרת."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"הגבלות רשת"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"רשתות נמדדות מטופלות בדומה לרשתות סלולריות כאשר נתוני הרקע מוגבלים. ייתכן שאפליקציות יציגו אזהרות לפני שימוש ברשתות האלה להורדות בנפח גדול."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"ההתייחסות לרשתות בתשלום דומה לרשתות סלולריות כאשר יש הגבלה על הורדת נתונים ברקע. ייתכן שאפליקציות יציגו אזהרה לפני שהן משתמשות ברשתות אלה להורדת נתונים בנפח גדול."</string>
     <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_wifi_disabled" msgid="727808462375941567">"‏כדי לבחור רשתות לפי שימוש יש להפעיל את ה-Wi‑Fi."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"שיחת חירום"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"חזור לשיחה"</string>
@@ -2435,7 +2431,7 @@
     <string name="vpn_always_on_invalid_reason_no_dns" msgid="2226648961940273294">"‏יש להגדיר שרת DNS ל-VPN בחיבור תמידי"</string>
     <string name="vpn_always_on_invalid_reason_dns" msgid="3551394495620249972">"‏הכתובות של שרת ה-DNS צריכות להיות מספריות עבור VPN בחיבור תמידי"</string>
     <string name="vpn_always_on_invalid_reason_other" msgid="5959352052515258208">"‏המידע שהוזן לא תומך ב VPN בחיבור תמידי"</string>
-    <string name="vpn_cancel" msgid="1979937976123659332">"בטל"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"ביטול"</string>
     <string name="vpn_done" msgid="8678655203910995914">"סגור"</string>
     <string name="vpn_save" msgid="4233484051644764510">"שמור"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"התחבר"</string>
@@ -2453,7 +2449,7 @@
     <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"‏רשת ה-VPN הקיימת תוחלף ולא יהיה לך חיבור אינטרנט עד שחיבור ה-VPN יסתיים בהצלחה"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"‏אתה כבר מחובר לרשת VPN בחיבור תמידי. אם תתחבר לרשת VPN שונה, הרשת הקיימת תוחלף ומצב החיבור התמידי ייכבה."</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"‏אתה כבר מחובר לרשת VPN. אם תתחבר לרשת VPN שונה, הרשת הקיימת תוחלף."</string>
-    <string name="vpn_turn_on" msgid="2363136869284273872">"הפעל"</string>
+    <string name="vpn_turn_on" msgid="2363136869284273872">"הפעלה"</string>
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> לא מצליחה להתחבר"</string>
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"‏אפליקציה זו לא תומכת באפשרות של רשת VPN בחיבור תמידי"</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
@@ -2477,7 +2473,7 @@
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"מערכת"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"משתמש"</string>
     <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"השבת"</string>
-    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"הפעל"</string>
+    <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"הפעלה"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"הסר"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"ניתן לבטוח"</string>
     <string name="trusted_credentials_enable_confirmation" msgid="83215982842660869">"‏להפעיל את אישור ה-CA של המערכת?"</string>
@@ -2533,7 +2529,7 @@
     <string name="user_settings_title" msgid="6151874007858148344">"משתמשים"</string>
     <string name="user_list_title" msgid="7937158411137563543">"משתמשים ופרופילים"</string>
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"הוסף משתמש או פרופיל"</string>
-    <string name="user_add_user_menu" msgid="1675956975014862382">"הוסף משתמש"</string>
+    <string name="user_add_user_menu" msgid="1675956975014862382">"הוספת משתמש"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"פרופיל מוגבל"</string>
     <string name="user_need_lock_message" msgid="5879715064416886811">"לפני שתוכל ליצור פרופיל מוגבל, תצטרך להגדיר נעילת מסך כדי להגן על האפליקציות ועל הנתונים האישיים שלך."</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"הגדר נעילה"</string>
@@ -2541,7 +2537,7 @@
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"לא מוגדר - פרופיל מוגבל"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"לא מוגדר - פרופיל עבודה"</string>
     <string name="user_admin" msgid="993402590002400782">"מנהל מערכת"</string>
-    <string name="user_you" msgid="1639158809315025986">"אתה (<xliff:g id="NAME">%s</xliff:g>)"</string>
+    <string name="user_you" msgid="1639158809315025986">"את/ה (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"כינוי"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"הוספה"</string>
     <string name="user_add_max_count" msgid="5405885348463433157">"אפשר להוסיף עד <xliff:g id="USER_COUNT">%1$d</xliff:g> משתמשים"</string>
@@ -2576,14 +2572,14 @@
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"כל האפליקציות והנתונים יימחקו."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"מוסיף משתמשים חדשים…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"מחק משתמש"</string>
-    <string name="user_delete_button" msgid="5131259553799403201">"מחק"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"מחיקה"</string>
     <string name="user_guest" msgid="8475274842845401871">"אורח"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"הסר אורח"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"להסיר אורח?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"כל האפליקציות והנתונים בפעילות זו באתר יימחקו."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"הסר"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"הפעל שיחות טלפון"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"‏הפעל שיחות טלפון ו-SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"הפעלת שיחות טלפון"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"‏הפעלת שיחות טלפון ו-SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"הסרת משתמש"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"האם להפעיל שיחות טלפון?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"יבוצע שיתוף של היסטוריית השיחות עם משתמש זה."</string>
@@ -2616,7 +2612,7 @@
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"האם להשתמש תמיד ב-<xliff:g id="APP_0">%1$s</xliff:g> במקום ב-<xliff:g id="APP_1">%2$s</xliff:g> בפעולת \'הקש ושלם\'?"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"הגבלות"</string>
     <string name="restriction_menu_reset" msgid="2067644523489568173">"הסר הגבלות"</string>
-    <string name="restriction_menu_change_pin" msgid="740081584044302775">"‏שנה PIN"</string>
+    <string name="restriction_menu_change_pin" msgid="740081584044302775">"שנה קוד גישה"</string>
     <string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג התראות"</string>
     <string name="help_label" msgid="6886837949306318591">"עזרה ומשוב"</string>
     <string name="support_summary" msgid="8276116616493882830">"מאמרי עזרה, תמיכה בטלפון ובצ\'אט"</string>
@@ -2661,8 +2657,8 @@
     <string name="wizard_back" msgid="5567007959434765743">"הקודם"</string>
     <string name="wizard_next" msgid="3606212602795100640">"הבא"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"סיום"</string>
-    <string name="user_image_take_photo" msgid="1280274310152803669">"צלם תמונה"</string>
-    <string name="user_image_choose_photo" msgid="7940990613897477057">"בחר תמונה מתוך \'גלריה\'"</string>
+    <string name="user_image_take_photo" msgid="1280274310152803669">"צילום תמונה"</string>
+    <string name="user_image_choose_photo" msgid="7940990613897477057">"בחירת תמונה מתוך הגלריה"</string>
     <string name="user_image_photo_selector" msgid="5492565707299454873">"בחר תמונה"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
     <string name="sim_setup_wizard_title" msgid="1732682852692274928">"‏כרטיסי SIM"</string>
@@ -2717,7 +2713,7 @@
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"אפליקציות והודעות"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"הרשאות ואפליקציות המוגדרות כברירת מחדל"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"משתמשים וחשבונות"</string>
-    <string name="app_default_dashboard_title" msgid="7342549305933047317">"אפליקציות בברירת מחדל"</string>
+    <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>
@@ -2760,7 +2756,7 @@
     <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"התעלם מאופטימיזציה, נמנום, אפליקציה במצב המתנה"</string>
     <string name="keywords_color_mode" msgid="6362744316886077510">"‏דינמי, RGB, ‏sRGB, צבע, טבעי, רגיל"</string>
     <string name="keywords_color_temperature" msgid="2688947724153266364">"‏טמפרטורת צבע D65 D75 לבן צהוב כחול צבעים חמים צבעים קרים"</string>
-    <string name="keywords_lockscreen" msgid="5746561909668570047">"‏החלק כדי לבטל נעילה, סיסמה, דפוס, PIN"</string>
+    <string name="keywords_lockscreen" msgid="5746561909668570047">"החלק כדי לבטל נעילה, סיסמה, קו ביטול נעילה, קוד גישה"</string>
     <string name="keywords_profile_challenge" msgid="789611397846512845">"אתגר בעבודה, עבודה, פרופיל"</string>
     <string name="keywords_unification" msgid="1922900767659821025">"פרופיל עבודה, פרופיל מנוהל, לאחד, איחוד, עבודה, פרופיל"</string>
     <string name="keywords_gesture" msgid="5696040361482126337">"תנועה"</string>
@@ -2785,8 +2781,10 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"עוצמת קול של הודעות"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"צליל ברירת המחדל להודעות"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"צליל שסיפקה האפליקציה"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"צליל ברירת המחדל להודעות"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"צליל ברירת המחדל להתראה"</string>
-    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"הפעל גם רטט עבור שיחות"</string>
+    <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"הפעלת רטט גם עבור שיחות"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"צלילים אחרים"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"צלילים של לוח חיוג"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"צלילי נעילת מסך"</string>
@@ -2798,7 +2796,7 @@
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"כל האודיו"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"רק אודיו של מדיה"</string>
     <string name="emergency_tone_silent" msgid="1067515631635824291">"מצב שקט"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"התראה"</string>
+    <string name="emergency_tone_alert" msgid="8941852695428130667">"התרעה"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"רטט"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"הפעלת צלילים"</string>
     <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"לא מופעלים כללים אוטומטיים"</string>
@@ -2817,7 +2815,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"רק התראות"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"שקט מוחלט"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"חסום הפרעות חזותיות"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"חסימת הפרעות חזותיות"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"צלילי פרופיל עבודה"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"השתמש בצלילי הפרופיל האישי"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"הצלילים זהים עבור הפרופיל האישי ופרופיל העבודה"</string>
@@ -2833,12 +2831,12 @@
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"רינגטונים"</string>
     <string name="other_sound_category_preference_title" msgid="2521096636124314015">"צלילים אחרים ורטט"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"הודעות"</string>
-    <string name="advanced_section_header" msgid="8833934850242546903">"מתקדם"</string>
+    <string name="advanced_section_header" msgid="8833934850242546903">"אפשרויות מתקדמות"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"הודעות עבודה"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"אור מהבהב"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"במסך הנעילה"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"יוצג כל תוכן ההודעות"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"להסתיר תוכן רגיש"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"תוכן ההודעות יופיע במלואו"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"תוכן רגיש לא יופיע"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"לא יוצגו הודעות בכלל"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"איך להציג הודעות כשהמכשיר נעול?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"הודעות"</string>
@@ -2848,6 +2846,7 @@
     <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="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_blocked" msgid="7938180808339386300">"לעולם אל תציג הודעות"</string>
@@ -2855,10 +2854,10 @@
     <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_min_summary" msgid="8233873580287975662">"נמוך: ללא צליל וללא הפרעה ויזואלית"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"בינוני: ללא צליל"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"גבוה: השמע צליל"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"דחוף: השמע צליל והצג במסך"</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="6585849855452076626">"אפשר צליל"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"אל תשמיע צליל, תפעיל רטט או תציג במהירות הודעות אלו לתצוגה המפורטת במסך הנוכחי."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"אסיסטנט ההודעות"</string>
@@ -2875,7 +2874,7 @@
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> יוכל לקרוא את כל ההודעות, כולל מידע אישי כמו שמות של אנשי קשר והודעות טקסט שתקבל. הוא יוכל גם לבטל הודעות או להפעיל לחצני פעולה שהן כוללות. \n\nכמו כן, הדבר יאפשר לאפליקציה להפעיל או לכבות את התכונה \'נא לא להפריע\' ולשנות הגדרות קשורות."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"אם תכבה ל-<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> את הגישה להודעות, ניתן יהיה לכבות גם את הגישה לתכונה \'נא לא להפריע\'."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"כבה"</string>
-    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"בטל"</string>
+    <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"ביטול"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"‏שירותי מסייע של VR"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"‏אין אפליקציות מותקנות שביקשו הפעלה כשירותי מסייע של VR."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"‏האם לאפשר לשירות VR גישה אל <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
@@ -2894,6 +2893,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"גישה אל \'נא לא להפריע\'"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"אין אפליקציות מותקנות שביקשו גישה אל \'נא לא להפריע\'"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"‏מערכת Android לא מאפשרת להודעות מהאפליקציה הזאת להופיע במסך"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"‏מערכת Android לא מאפשרת להודעות מהקטגוריה הזאת להופיע במסך"</string>
     <string name="notification_channels" msgid="5346841743182627500">"קטגוריות"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"אחר"</string>
     <string name="no_channels" msgid="3077375508177744586">"האפליקציה הזו לא שלחה התראות"</string>
@@ -2931,16 +2932,16 @@
     <string name="notification_show_lights_title" msgid="7671781299688190532">"אור מהבהב"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"רטט"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"צליל"</string>
-    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"מחק"</string>
+    <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"מחיקה"</string>
     <string name="zen_mode_rule_rename_button" msgid="4642843370946599164">"שנה שם"</string>
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"שם הכלל"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"תן שם לכלל"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"שם הכלל כבר נמצא בשימוש"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"הוסף עוד"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"עוד אחד"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"מחק כלל"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"בחירת סוג הכלל"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"האם למחוק את הכלל \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
-    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"מחק"</string>
+    <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"מחיקה"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"סוג הכלל"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"לא ידוע"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"הגדר כלל"</string>
@@ -2974,16 +2975,16 @@
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"הודעות נבחרות"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"מכל אחד"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"רק מאנשי הקשר"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"רק מאנשי קשר המסומנים בכוכב"</string>
-    <string name="zen_mode_from_none" msgid="8219706639954614136">"אף אחת"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"רק מאלו שמסומנים בכוכב"</string>
+    <string name="zen_mode_from_none" msgid="8219706639954614136">"בלי הודעות"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"התראות"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"תזכורות"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"אירועים"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"כל המתקשרים"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"מתקשרים נבחרים"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"מתקשרים חוזרים"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"אם אותו אדם מתקשר בפעם השנייה בפרק זמן של <xliff:g id="MINUTES">%d</xliff:g> דקות, אפשר זאת"</string>
-    <string name="zen_mode_when" msgid="2767193283311106373">"הפעל אוטומטית"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"אם מגיעה שיחה ממישהו בפעם השנייה תוך <xliff:g id="MINUTES">%d</xliff:g> דקות, אפשר להציג התראה"</string>
+    <string name="zen_mode_when" msgid="2767193283311106373">"הפעלה אוטומטית"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"אף פעם"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"בכל לילה"</string>
     <string name="zen_mode_when_weeknights" msgid="8354070633893273783">"לילות בימי חול"</string>
@@ -3022,35 +3023,31 @@
     <string name="screen_pinning_title" msgid="2292573232264116542">"הצמדת מסך"</string>
     <string name="screen_pinning_description" msgid="3360904523688769289">"כשהגדרה זו מופעלת, ניתן להשתמש בהקפאת מסך כדי שהמסך הנוכחי יישאר בתצוגה עד לביטול ההקפאה.\n\nכדי להשתמש בהקפאת מסך:\n\n1. ודא שהקפאת המסך מופעלת.\n\n2. פתח את המסך שברצונך להקפיא.\n\n3. הקש על \'סקירה\'.\n\n4. החלק כלפי מעלה ולאחר מכן הקש על סמל הנעץ."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"בקש קו ביטול נעילה לפני ביטול הצמדה"</string>
-    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"‏בקש PIN לפני ביטול הצמדה"</string>
+    <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"בקש קוד גישה לפני ביטול הצמדה"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"בקש סיסמה לפני ביטול הצמדה"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"נעל מכשיר בזמן ביטול הצמדה"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"נעילת מכשיר בזמן ביטול הצמדה"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"פרופיל העבודה הזה מנוהל על ידי:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"מנוהל על ידי <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(ניסיוני)"</string>
     <string name="display_auto_rotate_title" msgid="7119684966039069439">"סיבוב המכשיר"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"סובב את תוכן המסך"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"הישאר בתצוגה לאורך"</string>
-    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"הישאר בתצוגה לרוחב"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"תוכן המסך יסתובב"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"תצוגה לאורך בלבד"</string>
+    <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"תצוגה לרוחב בלבד"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"הישאר בכיוון המסך הנוכחי"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"הפעלה מאובטחת"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"המשך"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"‏באפשרותך לחזק את ההגנה על מכשיר זה על-ידי דרישת מספר ה-PIN שלך לפני הפעלתו. עד שהמכשיר יופעל, הוא לא לא יוכל לקבל שיחות, הודעות או התראות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"באפשרותך לחזק את ההגנה על מכשיר זה על-ידי דרישה לסמן את קו ביטול הנעילה שלך לפני הפעלתו. עד שהמכשיר יופעל, הוא לא לא יוכל לקבל שיחות, הודעות או התראות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"באפשרותך לחזק את ההגנה על מכשיר זה על-ידי דרישת הסיסמה שלך לפני הפעלתו. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"‏בנוסף לשימוש בטביעת האצבע שלך כדי לבטל את נעילת המכשיר, כאמצעי הגנה נוסף אתה יכול לדרוש את הזנת ה-PIN שלך לפני הפעלת המכשיר. כל עוד המכשיר אינו מופעל, הוא אינו יכול לקבל שיחות, הודעות או תזכורות, כולל התראות.\n\nאפשרות זו עוזרת להגן על נתונים במכשירים שאבדו או נגנבו."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"בנוסף לשימוש בטביעת האצבע שלך כדי לבטל את נעילת המכשיר, כאמצעי הגנה נוסף אתה יכול לדרוש את הזנת קו ביטול הנעילה שלך לפני הפעלת המכשיר. כל עוד המכשיר אינו מופעל, הוא אינו יכול לקבל שיחות, הודעות או תזכורות, כולל התראות.\n\nאפשרות זו עוזרת להגן על נתונים במכשירים שאבדו או נגנבו."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"בנוסף לשימוש בטביעת האצבע שלך כדי לבטל את נעילת המכשיר, כאמצעי הגנה נוסף אתה יכול לדרוש את הזנת הסיסמה שלך לפני הפעלת המכשיר. כל עוד המכשיר אינו מופעל, הוא אינו יכול לקבל שיחות, הודעות או תזכורות, כולל התראות.\n\nאפשרות זו עוזרת להגן על נתונים במכשירים שאבדו או נגנבו."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"כדי להפעיל את המכשיר נדרש קוד אימות"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"דרוש קו ביטול נעילה כדי להפעיל את המכשיר"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"כדי להפעיל את המכשיר נדרשת סיסמה"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"לא, תודה"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"לא, תודה"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"לא, תודה"</string>
-    <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"‏לדרוש מספר PIN?"</string>
-    <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"לדרוש תבנית ביטול נעילה?"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ניתן להגביר את ההגנה על מכשיר זה על-ידי דרישה להזנת קוד גישה לפני הפעלתו. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש קוד גישה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ניתן להגביר את ההגנה על מכשיר זה על-ידי דרישה לסמן את קו ביטול הנעילה שלך לפני הפעלתו. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש קו ביטול נעילה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ניתן להגביר את ההגנה על המכשיר על ידי דרישה להזנת סיסמה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות. \n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש סיסמה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"בנוסף לשימוש בטביעת אצבע כדי לבטל את הנעילה של המכשיר, ניתן להגביר את ההגנה עליו על ידי דרישה להזנת קוד גישה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות.\n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש הזנה של קוד גישה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"בנוסף לשימוש בטביעת אצבע כדי לבטל את הנעילה של המכשיר, ניתן להגביר את ההגנה עליו על ידי דרישה לסמן את קו ביטול הנעילה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות.\n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש סימון של קו ביטול הנעילה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"בנוסף לשימוש בטביעת אצבע כדי לבטל את הנעילה של המכשיר, ניתן להגביר את ההגנה על ידי דרישה להזנת סיסמה לפני שהוא מופעל. עד שהמכשיר יופעל, הוא לא יוכל לקבל שיחות, הודעות או התראות, כולל התראות קוליות.\n\nהדבר יסייע להגן על נתונים במכשירים שאבדו או נגנבו. האם לדרוש הזנת סיסמה כדי להפעיל את המכשיר?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"כן"</string>
+    <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">"‏כשתזין את מספר ה-PIN להפעלת המכשיר הזה, שירותי נגישות כמו <xliff:g id="SERVICE">%1$s</xliff:g> עדיין לא יהיו זמינים."</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="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"שים לב: לאחר הפעלה מחדש של המכשיר, ניתן להפעיל את האפליקציה רק לאחר שתבטל את נעילת הטלפון"</string>
@@ -3113,7 +3110,7 @@
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"קטגוריות: חשיבות נמוכה"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"קטגוריות: כבויות"</string>
     <string name="filter_notif_dnd_channels" msgid="1817930848881696728">"קטגוריות: מתעלמות מההגדרה \'נא לא להפריע\'"</string>
-    <string name="advanced_apps" msgid="4812975097124803873">"מתקדם"</string>
+    <string name="advanced_apps" msgid="4812975097124803873">"אפשרויות מתקדמות"</string>
     <string name="configure_apps" msgid="6685680790825882528">"הגדרת אפליקציות"</string>
     <string name="unknown_app" msgid="5275921288718717656">"אפליקציה לא מוכרת"</string>
     <string name="app_permissions" msgid="4148222031991883874">"הרשאות לאפליקציות"</string>
@@ -3137,7 +3134,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"לא זוהתה"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"ברירת מחדל"</string>
     <string name="default_for_work" msgid="9152194239366247932">"ברירת מחדל לעבודה"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"קלט אסיסטנט וקלט קולי"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"‏קלט Assistant וקלט קולי"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"אפליקציית אסיסטנט"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"האם להפוך את <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> לאסיסטנט שלך?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"האסיסטנט יוכל לקרוא מידע על אפליקציות שבהן נעשה שימוש במערכת שלך, כולל מידע המופיע במסך או שניתן לגשת אליו באפליקציות."</string>
@@ -3189,7 +3186,7 @@
     <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"‏מנהל ה-IT שלך ביקש דוח על באג כדי לסייע בפתרון בעיות במכשיר זה. ייתכן שאפליקציות ונתונים ישותפו. פעילות המכשיר עשויה להאט באופן זמני."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"‏הדוח על באג זה משותף כעת עם מנהל ה-IT שלך. למידע נוסף, צור איתו קשר."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"שתף"</string>
-    <string name="decline_remote_bugreport_action" msgid="518720235407565134">"דחה"</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>
     <string name="usb_use_power_only" msgid="6426550616883919530">"לספק חשמל"</string>
@@ -3210,9 +3207,9 @@
     <string name="background_check_pref" msgid="7550258400138010979">"בדיקה ברקע"</string>
     <string name="background_check_title" msgid="4534254315824525593">"גישה מלאה ברקע"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"שימוש בטקסט המופיע במסך"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"התר לאפליקציית האסיסטנט לגשת אל תוכן במסך, כמו טקסט"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"אפליקציית האסיסטנט תוכל לגשת לתוכן במסך, למשל לטקסט"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"שימוש בצילום מסך"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"התר לאפליקציית האסיסטנט לגשת אל צילום של המסך"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"אפליקציית האסיסטנט תוכל לגשת לצילום של המסך"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"הבהוב מסך"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"שולי המסך יהבהבו כאשר אפליקציית אסיסטנט תיגש לטקסט מהמסך או מצילום מסך"</string>
     <string name="assist_footer" msgid="1982791172085896864">"אפליקציות אסיסטנט יכולות לעזור לך בהתבסס על מידע המופיע במסך שאתה מציג. כדי לספק סיוע משולב, אפליקציות מסוימות תומכות בשירותי מפעיל אפליקציות ובקלט קולי."</string>
@@ -3260,14 +3257,14 @@
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"הרשאה להצגת האפליקציה למעלה"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"הגדרה זו מתירה לאפליקציה להופיע מעל אפליקציות אחרות שנמצאות בשימוש. הפעולה הזאת עשויה להפריע לשימוש שלך באפליקציות האלה או לשנות את האופן שבו הן מוצגות או מתנהגות."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"‏שירות מסייע של מציאות מדומה VR להאזנה סטריאופונית"</string>
-    <string name="keywords_system_alert_window" msgid="5049498015597864850">"מערכת התראה חלון תיבת דו-שיח להציג מעל אפליקציות אחרות"</string>
+    <string name="keywords_system_alert_window" msgid="5049498015597864850">"חלון ההתרעה יוצג מעל אפליקציות אחרות"</string>
     <string name="overlay_settings" msgid="6930854109449524280">"תצוגה מעל אפליקציות אחרות"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"<xliff:g id="COUNT_0">%1$d</xliff:g> מתוך <xliff:g id="COUNT_1">%2$d</xliff:g> אפליקציות מורשות להופיע מעל אפליקציות אחרות"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"אפליקציות עם הרשאה"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"כן"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"לא"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"התקנת אפליקציות לא מוכרות"</string>
-    <string name="keywords_install_other_apps" msgid="761078076051006558">"להתקין אפליקציות מקורות לא מוכרים"</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>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%1$d</xliff:g> מתוך <xliff:g id="COUNT_1">%2$d</xliff:g> אפליקציות מורשות לשנות את הגדרות המערכת"</string>
@@ -3280,9 +3277,9 @@
     <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_trusted" msgid="6857780460845250885">"כן"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"לא"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"אפשר התקנת אפליקציות"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"מורשה"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"לא מורשה"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"לחיצה כפולה על לחצן ההפעלה"</string>
@@ -3304,7 +3301,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"יום שלישי 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"יום שלישי 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"יום שלישי 18:03"</string>
-    <string name="disconnected" msgid="4836600637485526329">"לא מחובר"</string>
+    <string name="disconnected" msgid="4836600637485526329">"אין חיבור"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> מהנתונים בשימוש"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="two">כבויות עבור <xliff:g id="COUNT">%d</xliff:g> אפליקציות</item>
@@ -3327,7 +3324,7 @@
     <string name="location_on_summary" msgid="5127631544018313587">"פועל / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"כבוי"</string>
     <string name="backup_disabled" msgid="485189128759595412">"הגיבוי מושבת"</string>
-    <string name="about_summary" msgid="924181828102801010">"‏עודכן ל-Android ‏<xliff:g id="VERSION">%1$s</xliff:g>"</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>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"לא ניתן לבצע שיחות יוצאות"</string>
@@ -3340,7 +3337,7 @@
     <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"מנהל המכשיר יכול לפקח על אפליקציות ונתונים המשויכים למשתמש זה ולנהל אותם, כולל הגדרות, הרשאות, גישה ארגונית, פעילות הרשת ומידע על מיקום המכשיר."</string>
     <string name="admin_device_owner_message" msgid="6232893638259790789">"מנהל המכשיר יכול לפקח על אפליקציות ונתונים המשויכים למכשיר זה ולנהל אותם, כולל הגדרות, הרשאות, גישה ארגונית, פעילות הרשת ומידע על מיקום המכשיר."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"כבה"</string>
-    <string name="condition_turn_on" msgid="9089876276117874591">"הפעל"</string>
+    <string name="condition_turn_on" msgid="9089876276117874591">"הפעלה"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"הצג"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"הסתר"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"נקודה לשיתוף אינטרנט פועלת"</string>
@@ -3389,7 +3386,7 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"ייתכן שחישוב השימוש בנתונים אצל הספק יהיה שונה מזה שבמכשיר"</string>
     <string name="data_used_template" msgid="3245919669966296505">"נעשה שימוש ב-<xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"הגדר אזהרת שימוש בנתונים"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"מתי תופיע אזהרת שימוש בנתונים"</string>
     <string name="data_warning" msgid="209133958008062117">"אזהרה לגבי שימוש בנתונים"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"הגדרה של הגבלת נתונים"</string>
     <string name="data_limit" msgid="1885406964934590552">"מגבלת נתונים"</string>
@@ -3455,7 +3452,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"ללא"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"אובייקט הדירוג חסר."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"אובייקט הדירוג אינו מכיל את המפתח הזה."</string>
-    <string name="special_access" msgid="3458780842491881155">"גישה לאפליקציה מיוחדת"</string>
+    <string name="special_access" msgid="3458780842491881155">"גישה מיוחדת"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="two"><xliff:g id="COUNT">%d</xliff:g> אפליקציות יכולות להשתמש בנתונים בלתי מוגבלים</item>
       <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> אפליקציות יכולות להשתמש בנתונים בלתי מוגבלים</item>
@@ -3476,7 +3473,8 @@
     <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_connected_summary" msgid="8733997010923307915">"מחובר אל"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"משבצות מפתח להגדרות מהירות"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"אנחנו כאן לשירותך"</string>
@@ -3502,7 +3500,7 @@
     <string name="support_disclaimer_title" msgid="4825302018208770031">"שליחת פרטי מערכת"</string>
     <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"אל תציג שוב"</string>
     <string name="support_account_request_prefix" msgid="6387847874661861650">"מבקש בשם"</string>
-    <string name="support_account_picker_add_account" msgid="5076277544846506214">"הוסף חשבון"</string>
+    <string name="support_account_picker_add_account" msgid="5076277544846506214">"הוספת חשבון"</string>
     <string name="support_system_information_title" msgid="3439905790018934773">"נתוני מערכת"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"הגדרות של פרופיל עבודה"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"חיפוש אנשי קשר"</string>
@@ -3545,7 +3543,7 @@
     <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>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"כדי לפתוח את המצלמה במהירות צריך פשוט להקיש פעמיים על לחצן ההפעלה. זה פועל בכל מסך."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"מעבר בין מצלמות"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"הקשה כפולה לבדיקת הטלפון"</string>
@@ -3555,13 +3553,13 @@
     <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="8696432220086951466">"כדי לבדוק במהירות את ההודעות שלך, הרם את הטלפון."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"כדי לבדוק במהירות את ההודעות שלך, הרם את הטאבלט."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"כדי לבדוק במהירות את ההודעות שלך, הרם את המכשיר."</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>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"כדי לבדוק הודעות מהירות יש להרים את הטלפון."</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"כדי לבדוק הודעות במהירות יש להרים את הטאבלט."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"כדי לבדוק הודעות במהירות יש להרים את המכשיר."</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>
     <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>
@@ -3685,7 +3683,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"‏(WebView מושבתת אצל <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"שירות מילוי אוטומטי"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"‏אוטומטי, אוטומטית, מילוי, מילוי אוטומטי, autofill"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"להפוך את <xliff:g id="APP_NAME_0">%1$s</xliff:g> לאפליקציית המילוי האוטומטי? <xliff:g id="APP_NAME_1">%1$s</xliff:g> תוכל לקרוא את המסך ולמלא שדות באפליקציות אחרות."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"‏&lt;b&gt;ודא שאתה סומך על האפליקציה הזו&lt;/b&gt;‏ ‏&lt;br/&gt; &lt;br/&gt;‏ ‏&lt;xliff:g id=app_name example=Google Autofill&gt;‏%1$s‏&lt;/xliff:g&gt; ניגשת למידע המופיע במסך כדי לזהות אילו שדות אפשר למלא באופן אוטומטי."</string>
     <string name="device_theme" msgid="4571803018917608588">"עיצוב המכשיר"</string>
     <string name="default_theme" msgid="7085644992078579076">"ברירת מחדל"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"מנהל אחסון: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 43ee2c4..f1437c6 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"なし"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"なし"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 64ec7a2..f7d084f 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"アカウント"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置情報"</string>
     <string name="account_settings_title" msgid="626177544686329806">"アカウント"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"セキュリティと現在地情報"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"暗号化と認証情報"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"スマートフォンの暗号化"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"スマートフォンの暗号化"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ロック画面の設定"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"プライバシー"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"管理者により無効にされています"</string>
     <string name="security_status_title" msgid="5848766673665944640">"セキュリティ ステータス"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"指紋の管理"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"指紋の用途"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"高品質の公共ネットワークが利用可能なときに通知する"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi を自動的に ON にする"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ホーム ネットワークなどの高品質の保存済みネットワークの検出時に Wi‑Fi を ON にする"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi のスキャンが OFF になっているため利用できません"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"サブネット マスク"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 アドレス"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"保存済みネットワーク"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP設定"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"このユーザーは Wi‑Fi 詳細設定を利用できません"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"OFF"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"スマートフォンのホルダー装着時やスリープ時の動作を管理するには、スクリーン セーバーを ON にします。"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"開始時間"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"現在のスクリーン セーバー"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"今すぐ起動"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"指を離してスリープ状態から復帰"</string>
-    <string name="doze_title" msgid="5389406335828323273">"通知の着信画面"</string>
+    <string name="doze_title" msgid="2259176504273878294">"アンビエント表示"</string>
     <string name="doze_summary" msgid="3846219936142814032">"通知を受信したときにスリープ状態から復帰"</string>
     <string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"テキストのサイズを変更します"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"システム"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>の内容を見る"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"その他のファイルには、アプリが保存した共有ファイル、インターネットや Bluetooth 経由でダウンロードしたファイル、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_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_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g>のセットアップ"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"外部ストレージとして使用"</string>
@@ -1379,7 +1376,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"位置情報モード"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"GPS、Wi‑Fi、Bluetooth、モバイル ネットワークで現在地を特定します"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Wi‑Fi、Bluetooth、モバイル ネットワークで現在地を特定します"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPSで現在地を特定する"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"GPS で現在地を特定します"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"スキャン"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fiのスキャン"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"位置情報の精度を向上させるため、システムのアプリやサービスがいつでもWi‑Fiネットワークを検出できるようにします"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"（未使用）"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"キーボード ショートカット ヘルパー"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"使用可能なショートカットを表示"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"デフォルト"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"マウス/トラックパッド"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ポインタの速度"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ゲーム用コントローラ"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"バイブレーションの使用"</string>
@@ -1775,10 +1772,10 @@
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"トリプルタップで拡大"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"ボタンで拡大"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"ボタンとトリプルタップで拡大"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"画面を拡大する"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"画面を拡大します"</string>
     <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 回タップし、3 回目のタップで指を押し続けます。\n"<ul><li>"ドラッグで画面上を移動"</li>\n<li>"指を放してズームアウト"</li></ul>\n\n"キーボードやナビゲーション バーでは拡大できません。"</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 回タップし、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>
@@ -1912,13 +1909,13 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"使用していないときはアプリをバックグラウンドで実行できます"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"使用していないときはアプリのバックグラウンド アクティビティが制限されます"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"バックグラウンドでのアプリの実行は許可されません"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"フル充電からの画面の電池使用状況"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"フル充電以降の画面の電池使用状況"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"画面消費"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"モバイル ネットワークのスキャン"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g>前"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"フル充電（<xliff:g id="TIME">%1$s</xliff:g>前）からのアプリの電池使用状況"</string>
-    <string name="screen_usage_summary" msgid="6687403051423153550">"フル充電からの画面がオンだった時間"</string>
-    <string name="device_usage_list_summary" msgid="5623036661468763251">"フル充電からの端末の電池使用状況"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"フル充電（<xliff:g id="TIME">^1</xliff:g>前）以降のアプリの電池使用状況"</string>
+    <string name="screen_usage_summary" msgid="6687403051423153550">"フル充電以降の画面がオンの時間"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"フル充電以降の端末の電池使用状況"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"電池使用時間"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"リセット後の電池使用量"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池使用時間: <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"カメラ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"セルスタンバイ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"モバイル ネットワーク スタンバイ"</string>
     <string name="power_phone" msgid="5392641106474567277">"通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"アイドル状態"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"アイドル状態"</string>
@@ -2007,17 +2004,17 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"電池使用量は消費電力の概算であり、電池を消費するすべてのソースが含まれているわけではありません。「その他」は、算出された概算消費電力と実際に確認された電池消費量との差です。"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"過剰算出された消費電力"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s、使用しました"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<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_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_detail_foreground" msgid="3350401514602032183">"使用中の場合"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"バックグラウンドの場合"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"電池使用量"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"アプリ使用量全体の <xliff:g id="PERCENT">%1$s</xliff:g>（<xliff:g id="POWER">%2$d</xliff:g> mAh）"</string>
-    <string name="battery_detail_info_title" msgid="8227822131405620369">"フル充電からの電池の使用状況"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"フル充電以降の電池の使用状況"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"電池の使用状況の管理"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"予測される残り時間"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"フル充電まで"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"音声入出力の設定"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"音声検索"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Androidキーボード"</string>
-    <string name="voice_category" msgid="1430370497125803904">"音声"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"音声入力の設定"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"音声入力"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"音声入力サービス"</string>
@@ -2542,7 +2538,7 @@
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"通話とSMSをONにしますか？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話とSMSの履歴がこのユーザーと共有されます。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急情報"</string>
-    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> さんの情報と連絡先"</string>
+    <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>の情報と連絡先"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"アプリとコンテンツの許可"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"制限のあるアプリ"</string>
     <string name="apps_with_restrictions_settings_button" msgid="3841347287916635821">"アプリの設定を展開"</string>
@@ -2552,10 +2548,10 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"タップ＆ペイ"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"仕組み"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"店舗でスマートフォンを使用して決済"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"支払いに使用する既定のアプリ"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"お支払いのデフォルトのアプリ"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"未設定"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <string name="nfc_payment_use_default" msgid="3234730182120288495">"既定を使用"</string>
+    <string name="nfc_payment_use_default" msgid="3234730182120288495">"デフォルトのアプリを使用"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"常時"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"別の決済アプリが起動されている場合を除く"</string>
     <string name="nfc_payment_pay_with" msgid="7524904024378144072">"タップ＆ペイ端末で使用するアプリ:"</string>
@@ -2735,6 +2731,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知の音量"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"デフォルトの通知音"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"アプリの通知音"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"デフォルトの通知音"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"デフォルトのアラーム音"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"着信時もバイブレーションON"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"その他の音"</string>
@@ -2796,6 +2794,7 @@
     <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="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_blocked" msgid="7938180808339386300">"通知を表示しない"</string>
@@ -2803,10 +2802,10 @@
     <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_min_summary" msgid="8233873580287975662">"低: 音声や画面表示を使用しない"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"中: 音声を使用しない"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"高: 音声で知らせる"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"緊急: 音声とポップアップで知らせる"</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="6585849855452076626">"音の許可"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"音やバイブレーションで知らせず、現在の画面に通知を数秒間表示することもしません。"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知アシスタント"</string>
@@ -2840,6 +2839,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"マナーモードへのアクセス"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"マナーモードへのアクセスをリクエストしたインストール済みアプリはありません"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android により、このアプリの通知はこの端末には表示されません"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android により、この通知のカテゴリはこの端末には表示されません"</string>
     <string name="notification_channels" msgid="5346841743182627500">"カテゴリ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"その他"</string>
     <string name="no_channels" msgid="3077375508177744586">"このアプリの通知はありません"</string>
@@ -2958,7 +2959,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ON"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"OFF"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"画面の固定"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"この設定をオンにして画面固定を使用すると、固定を解除するまで現在の画面が常に表示されるようになります。\n\n画面固定を使用するには:\n\n1. 画面固定がオンになっていることを確認します。\n\n2. 固定する画面を開きます。\n\n3. [最近] をタップします。\n\n4. 上にスワイプして固定アイコンをタップします。"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"この設定を ON にして画面固定を使用すると、固定を解除するまで現在の画面が常に表示されるようになります。\n\n画面固定を使用するには:\n\n1. 画面固定が ON になっていることを確認します。\n\n2. 固定する画面を開きます。\n\n3. [最近] をタップします。\n\n4. 上にスワイプして固定アイコンをタップします。"</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"画面固定の解除前にロック解除パターンを要求"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"画面固定の解除前にPINを要求"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"画面固定の解除前にパスワードを要求"</string>
@@ -2973,18 +2974,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"現在の向きを維持する"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"起動時の保護"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"次へ"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"この端末の起動前にPINを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"この端末の起動前にパターンを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"この端末の起動前にパスワードを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"端末のロック解除に指紋を使うだけでなく、起動時にPINを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"端末のロック解除に指紋を使うだけでなく、起動時にパターンを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"端末のロック解除に指紋を使うだけでなく、起動時にパスワードを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"端末を起動するにはPINが必須とする"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"端末を起動するにはパターンが必須とする"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"端末を起動するにはパスワードが必須とする"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"必須としない"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"必須としない"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"必須としない"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"端末のロック解除に指紋を使うだけでなく、起動時に PIN を入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動に PIN を必要としますか？"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"端末の起動時にパターンを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパターンを必要としますか？"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"この端末の起動時にパスワードを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパスワードを必要としますか？"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"端末のロック解除に指紋を使うだけでなく、起動時に PIN を入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動に PIN を必要としますか？"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"端末のロック解除に指紋を使うだけでなく、起動時にパターンを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパターンを必要としますか？"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"端末のロック解除に指紋を使うだけでなく、起動時にパスワードを入力することでこの端末の保護を強化できます。端末が起動するまで、通話、メッセージ、アラームなどの通知を受信することはできません。\n\nこれにより、端末を紛失したり盗まれたりしても端末上のデータを保護することができます。この端末の起動にパスワードを必要としますか？"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"はい"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"いいえ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PINが必要ですか？"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"パターンが必要ですか？"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"パスワードが必要ですか？"</string>
@@ -3107,7 +3104,7 @@
     <string name="high_power_desc" msgid="6283926163708585760">"電池の最適化を適用しません。電池の消耗が速くなる可能性があります。"</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"アプリにバックグラウンドでの常時実行を許可しますか？"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> にバックグラウンドでの常時実行を許可すると、電池消費量が増加する場合があります。\n\nこの設定は、[設定] &gt; [アプリと通知] から後で変更できます。"</string>
-    <string name="battery_summary" msgid="8044042095190688654">"前回のフル充電から <xliff:g id="PERCENTAGE">%1$s</xliff:g> 使用しています"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"前回のフル充電以降 <xliff:g id="PERCENTAGE">%1$s</xliff:g> 使用しています"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"電源管理"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"前回のフル充電から電池を使用していません"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"アプリの設定"</string>
@@ -3194,7 +3191,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"権限のあるアプリ"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"可"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"不可"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"不明なアプリをインストールする"</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>
@@ -3208,9 +3205,9 @@
     <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_trusted" msgid="6857780460845250885">"信頼する"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"信頼しない"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"アプリのインストールを許可する"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"許可"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"許可しない"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"この提供元のアプリを許可"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"2回ひねる動作でカメラアプリを開く"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"手首を2回ひねる動作でカメラアプリを開きます"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"電源ボタンを2回押してカメラを起動"</string>
@@ -3225,9 +3222,9 @@
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"一郎さん、こんにちは。"</string>
-    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"お茶でも飲みながら最近あった話などしませんか？"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"いいですね。そう遠くないところにいい店があるんですよ。"</string>
-    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"それはいい。"</string>
+    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"一緒にコーヒーでもどうですか？"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"いいですね。近くにいい店がありますよ。"</string>
+    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"ではそうしましょう！"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"火 午後6:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"火 午後6:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"火 午後6:02"</string>
@@ -3345,7 +3342,7 @@
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"電池 %1$s で自動的に ON にする"</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="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>
@@ -3396,9 +3393,10 @@
     <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_connected_summary" msgid="8733997010923307915">"接続先"</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="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 時間体制）"</string>
     <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"サポートのご案内（年中無休 24 時間体制）"</string>
@@ -3462,17 +3460,17 @@
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"カメラをすばやく起動するには、電源ボタンを 2 回押します。どの画面からでも操作できます。"</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"カメラの切り替え"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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="2521630136233865893">"通知をすばやく確認するには、画面をダブルタップします。"</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="8696432220086951466">"通知をすばやく確認するには、スマートフォンを持ち上げます。"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"通知をすばやく確認するには、タブレットを持ち上げます。"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"通知をすばやく確認するには、端末を持ち上げます。"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"指紋認証センサーをスワイプして通知を表示"</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>
@@ -3492,7 +3490,7 @@
     <string name="instant_apps_account" msgid="1433620209791992528">"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>
+    <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>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"自動的に個人データを同期"</string>
@@ -3585,7 +3583,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"（<xliff:g id="USER">%s</xliff:g> では無効）"</string>
     <string name="autofill_app" msgid="7338387238377914374">"自動入力サービス"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"自動, 入力, 自動入力"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> を自動入力アプリにしますか？<xliff:g id="APP_NAME_1">%1$s</xliff:g> による画面の読み取りと、他のアプリのフィールドへの入力が許可されます。"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;このアプリが信頼できることを確認してください&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; は画面上の内容に基づいて、入力可能な情報を判別します。"</string>
     <string name="device_theme" msgid="4571803018917608588">"端末のテーマ"</string>
     <string name="default_theme" msgid="7085644992078579076">"デフォルト"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ストレージ マネージャ: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index baf89fd..13e21c2 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"არცერთი"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"არც ერთი"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index 8f3d300..2595b09 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ანგარიშები"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"მდებარეობა"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ანგარიშები"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"უსაფრთხოება და მდებარეობა"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"დაშიფვრა და ავტორიზაციის მონაცემები"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ტელეფონი დაშიფრულია"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ტელეფონი დაშიფრულია"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ჩაკეტილი ეკრანის პარამეტრები"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"დააყენე ჩემი მდებარეობის, ეკრანის განბლოკვისა და ავტორიზაციის მონაცემთა საცავის პარამეტრები"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"კონფიდენციალურობა"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"გათიშულია ადმინისტრატორის მიერ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"უსაფრთხოების სტატუსი"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"ანაბეჭდების მართვა"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ანაბეჭდების გამოყენება"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"მიუწვდომელია, რადგან Wi‑Fi სკანირება გამორთულია"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Wi-Fi ქსელების ფილტრი"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"არ გამოიყენო Wi‑Fi ქსელი, თუ მას არ აქვს კარგი ინტერნეტ კავშირი"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"მხოლოდ იმ ქსელების გამოყენება, რომლებსაც კარგი ინტერნეტ-კავშირი გააჩნია"</string>
@@ -733,7 +733,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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ქვექსელის ნიღაბი"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 მისამართები"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"დამახსოვრ. ქსელები"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP პარამეტრები"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"გაფართოებული Wi‑Fi პარამეტრები ამ მომხმარებლისთვის მიუწვდომელია"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"გამორთული"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"დოკ-სადგურთან მიერთების და/ან ძილის რეჟიმზე გადასვლის დროს ტელეფონის ქცევის სამართავად, ჩართეთ ეკრანმზოგი."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"გაშვების დრო"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"ამჟამინდელი ეკრანმზოგი"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"დაწყება ახლავე"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"პარამეტრები"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ავტომატური სიკაშკაშე"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"გაღვიძება აწევისას"</string>
-    <string name="doze_title" msgid="5389406335828323273">"შემომავალი შეტყობინების ეკრანი"</string>
+    <string name="doze_title" msgid="2259176504273878294">"გარემოს ეკრანი"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ეკრანის გამოღვიძება შეტყობინებების მიღებისას"</string>
     <string name="title_font_size" msgid="4405544325522105222">"შრიფტის ზომა"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ტექსტის გადიდება ან დაპატარავება"</string>
@@ -1422,7 +1419,7 @@
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"ინფორმაცია უსაფრთხოების შესახებ"</string>
     <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="settings_safetylegal_activity_loading" msgid="8059022597639516348">"იტვირთება…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"აირჩიეთ პაროლი"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"აირჩიეთ გრაფიკული გასაღები"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"თქვენი PIN-ის არჩევა"</string>
@@ -1489,7 +1486,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"მოწყობილობის იდენტური ეკრანის დაბლოკვის მეთოდი"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"აპების მართვა"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"დაყენებული აპების მართვა და წაშლა"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"აპის შესახებ"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"აპის მონაცემები"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"აპების მართვა, სწრაფი გაშვებისთვის მალსახმობების დაყენება"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"აპების პარამეტრები"</string>
     <string name="install_applications" msgid="4872012136210802181">"უცნობი წყაროები"</string>
@@ -1498,7 +1495,7 @@
     <string name="install_all_warning" product="default" msgid="1952257127370115988">"თქვენი ტელეფონი და პირადი მონაცემები უცნობი აპების შემოტევების წინაშე მეტად დაუცველია. აპების ამ წყაროდან ინსტალაციის შემთხვევაში, თქვენ თანახმა ხართ, პასუხისმგებელი იყოთ ამ აპების გამოყენების შედეგად ტელეფონისთვის მიყენებულ ზიანსა და მონაცემების დაკარგვაზე."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"დამატებითი პარამეტრები"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"მეტი პარამეტრების ვარიანტების ჩართვა"</string>
-    <string name="application_info_label" msgid="5736524913065714880">"აპლიკაციის შესახებ"</string>
+    <string name="application_info_label" msgid="5736524913065714880">"აპის მონაცემები"</string>
     <string name="storage_label" msgid="8700867073480107253">"საცავი"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"გახსნა ნაგულისხმევად"</string>
     <string name="auto_launch_label_generic" msgid="3230569852551968694">"ნაგულისხმევი"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(არ ყოფილა გამოყენებული)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"კლავიატურის მალსახმობების დამხმარე"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ხელმისაწვდომი მალსახმობების ჩვენება"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ნაგულისხმევი"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"თაგუნა/ტრეკპედი"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"მანიშნებლის სიჩქარე"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"თამაშის მეთვალყურე"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"ვიბრატორის გამოყენება"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ეკრანის მოხმარება ბოლო სრული დატენვიდან"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ეკრანის მოხმარება"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"მობილური ქსელის სკანირება"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g>-ის წინ"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"აპების მიერ მოხმარება ბოლო დატენვიდან (<xliff:g id="TIME">%1$s</xliff:g>-ის წინ)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>-ის წინ"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"აპების მიერ მოხმარება ბოლო დატენვიდან (<xliff:g id="TIME">^1</xliff:g>-ის წინ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"დროის ხანგრძლივობა სრული დატენვიდან, რომლის განმავლობაშიც ეკრანი ჩართული იყო"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"მოწყობილობის მოხმარება ბოლო სრული დატენვიდან"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ბატარეის ხარჯი დამტენის გამოერთების შემდეგ"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"კამერა"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"ქსელთან კავშირი"</string>
+    <string name="power_cell" msgid="3392999761958982492">"მობილური ქსელის მოლოდინის რეჟიმი"</string>
     <string name="power_phone" msgid="5392641106474567277">"ხმოვანი ზარები"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"მოცდის რეჟიმი"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"მოცდის რეჟიმი"</string>
@@ -1979,7 +1976,7 @@
     <string name="usage_type_computed_power" msgid="5862792259009981479">"გამოთვლილი გამოყენება"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"დაფიქსირებული გამოყენება"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"ძალით შეჩერება"</string>
-    <string name="battery_action_app_details" msgid="7861051816778419018">"აპის შესახებ"</string>
+    <string name="battery_action_app_details" msgid="7861051816778419018">"აპის მონაცემები"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"აპის პარამეტრები"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"ეკრანის პარამეტრები"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Wi‑Fi პარამეტრები"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ბატარეის გამოყენება ენერგიის გამოყენების საშუალო მაჩვენებელია და არ შეიცავს ბატარეის მოხმარების ყველა წყაროს. სხვადასხვა ასახავს სხვაობას ბატარეის გამოთვლილ გამოყენებასა და ბატარეაზე რეალურად დაფიქსირებულ გამოყენებას შორის."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ზედმეტად ჩათვლილი ელკვების გამოყენება"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"გამოიყენება %1$s-ს განმავლობაში"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"გამოიყენება <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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ხმოვანი შეყვანისა და გამოტანის პარამეტრები"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ხმოვანი ძიება"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android კლავიატურა"</string>
-    <string name="voice_category" msgid="1430370497125803904">"მეტყველება"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"ხმოვანი მონაცემების შეტანის პარამეტრები"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ხმოვანი შეყვანა"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"ხმის შეყვანის სერვისები"</string>
@@ -2146,7 +2142,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">"ავტორიზაციის მონაცემების საცავის გამოყენებამდე, საჭიროა, რომ დააყენოთ ეკრანის დასაბლოკი PIN ან პაროლი."</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>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"ნაგულისხმევის გამოყენება"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"ყოველთვის"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"გარდა იმ შემთხვევისა, როცა გადახდის სხვა აპია გახსნილი"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"შეხებით გადახდა ტერმინალიდან, გადახდა:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"შეხებით გადახდის ტერმინალზე გამოიყენე:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"ტერმინალთან გადახდა"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"დააყენეთ გადახდის აპი. შემდეგ უბრალოდ მიადეთ თქვენი ტელეფონის უკანა მხარე ნებისმიერ ტერმინალს, რომელსაც უკონტაქტო სიმბოლო აქვს."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"გასაგებია"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"შეტყობინების ხმა"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ტელეფონის ზარი"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"შეტყობინებების ნაგულისხმევი ხმა"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"აპის მიერ უზრუნველყოფილი ხმა"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"შეტყობინებების ნაგულისხმევი ხმა"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"მაღვიძარას ნაგულისხმევი ხმა"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ზარებზე ასევე ვიბრირება"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"სხვა ხმები"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"შეტყობინებების ჩვენების აღკვეთა"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"დაბალი: ხმოვანი ან ვიზუალური შეფერხების გარეშე"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"საშუალო: ხმის გარეშე"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"მაღალი: ხმის გამოცემა"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"გადაუდებელი: ხმის გამოცემა და ეკრანზე გამოჩენა"</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="6585849855452076626">"ხმის გამოყენების დაშვება"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"შეტყობინებებისთვის ხმისა თუ ვიბრაციის გათიშვა და მიმდინარე ეკრანზე ანთების აკრძალვა."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"შეტყობინებათა ასისტენტი"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"„არ შემაწუხოთ“ წვდომა"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"დაუინსტალირებელმა აპებმა მოითხოვა „არ შემაწუხოთ“ წვდომა"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"აპები იტვირთება..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ბლოკავს ამ აპის შეტყობინებების მოწყობილობაზე გამოჩენას"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ბლოკავს შეტყობინებების ამ კატეგორიის მოწყობილობაზე გამოჩენას"</string>
     <string name="notification_channels" msgid="5346841743182627500">"კატეგორიები"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"სხვა"</string>
     <string name="no_channels" msgid="3077375508177744586">"ამ აპს შეტყობინებები არ გამოუქვეყნებია"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ამჟამინდელ ორიენტაციაზე დარჩენა"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"უსაფრთხო დაწყება"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"გაგრძელება"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"ამ მოწყობილობის დაცვა დამატებით შეგიძლიათ, დაწყებამდე PIN-ის მოთხოვნით. მოწყობილობის დაწყებამდე ზარების, შეტყობინებების და შეხსენებების, ასევე მაღვიძარების მიღებას ვერ მოახერხებს. \n\nეს ტელეფონის დაკარგვის შემთხვევაში მონაცემთა დაცვას ემსახურება."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"ამ მოწყობილობის დაცვა დამატებით შეგიძლიათ, დაწყებამდე ნიმუშის მოთხოვნით. მოწყობილობის დაწყებამდე ზარების, შეტყობინებების და შეხსენებების, ასევე მაღვიძარების მიღებას ვერ მოახერხებს. \n\nეს ტელეფონის დაკარგვის შემთხვევაში მონაცემთა დაცვას ემსახურება."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"ამ მოწყობილობის დაცვა დამატებით შეგიძლიათ, დაწყებამდე პაროლის მოთხოვნით. მოწყობილობის დაწყებამდე ზარების, შეტყობინებების და შეხსენებების, ასევე მაღვიძარების მიღებას ვერ მოახერხებს. \n\nეს ტელეფონის დაკარგვის შემთხვევაში მონაცემთა დაცვას ემსახურება."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"თქვენი მოწყობილობის განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, შეგიძლიათ მოწყობილობის დამატებით დაცვა დაწყებამდე თქვენი PIN-კოდის მოთხოვნით. მოწყობილობის დაწყებამდე ზარების, შეტყობინებებისა და შეხსენებების, ასევე მაღვიძარების მიღება ვერ მოხერხდება.\n\nეს დაკარგული ან მოპარული მოწყობილობების მონაცემების დაცვაში გეხმარებათ."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"თქვენი მოწყობილობის განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, შეგიძლიათ მოწყობილობის დამატებით დაცვა დაწყებამდე თქვენი ნიმუშის მოთხოვნით. მოწყობილობის დაწყებამდე ზარების, შეტყობინებებისა და შეხსენებების, ასევე მაღვიძარების მიღება ვერ მოხერხდება.\n\nეს დაკარგული ან მოპარული მოწყობილობების მონაცემების დაცვაში გეხმარებათ."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"თქვენი მოწყობილობის განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, შეგიძლიათ მოწყობილობის დამატებით დაცვა დაწყებამდე თქვენი პაროლის მოთხოვნით. მოწყობილობის დაწყებამდე ზარების, შეტყობინებებისა და შეხსენებების, ასევე მაღვიძარების მიღება ვერ მოხერხდება.\n\nეს დაკარგული ან მოპარული მოწყობილობების მონაცემების დაცვაში გეხმარებათ."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"მოწყობილობის დასაწყებად PIN-ის მოთხოვნა"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"მოწყობილობის შაბლონის მოთხოვნა"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"მოწყობილობის დასაწყებად პაროლის მოთხოვნა"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"არა, გმადლობთ"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"არა, გმადლობთ"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"არა, გმადლობთ"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად PIN-კოდის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები). \n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად PIN-კოდის შეყვანის მოთხოვნის გააქტიურება?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად ნიმუშის დახატვის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები). \n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად ნიმუშის დახატვის მოთხოვნის გააქტიურება?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები). \n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურება?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად PIN-კოდის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად PIN-კოდის შეყვანის მოთხოვნის გააქტიურება?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად ნიმუშის დახატვის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად ნიმუშის დახატვის მოთხოვნის გააქტიურება?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"განსაბლოკად თითის ანაბეჭდის გამოყენებასთან ერთად, ამ მოწყობილობის დაცვის გაძლიერება შეგიძლიათ მის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურებით. მოწყობილობის გაშვებამდე ის ვერ მიიღებს ზარებს, შეტყობინებებს და შეხსენებებს (მათ შორის, არ იმუშავებს მაღვიძარები).\n\nეს მოწყობილობის დაკარგვის ან მოპარვის შემთხვევაში მონაცემების დაცვას ემსახურება. გსურთ თქვენი მოწყობილობის გასაშვებად პაროლის შეყვანის მოთხოვნის გააქტიურება?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"დიახ"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"არა"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"მოთხოვნილი იქნეს PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"მოთხოვნილი იქნეს ნიმუში?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"მოთხოვნილი იქნეს პაროლი?"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"დიახ"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"არა"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"აპების ინსტალაციის დაშვება"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"დაშვებულია"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"დაუშვებელია"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"კამერისთვის ჩართვის ღილაკზე ორჯერ დაჭერა"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"დაკავშირებულია"</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>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(გათიშულია მომხმარებლისთვის: <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ავტომატური შევსების სერვისი"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ავტომატური, შევსება, ავტოშევსება"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"გსურთ, <xliff:g id="APP_NAME_0">%1$s</xliff:g> ავტომატური შევსების ნაგულისხმევი აპი გახდეს? <xliff:g id="APP_NAME_1">%1$s</xliff:g> თქვენს ეკრანზე არსებული ინფორმაციის წაკითხვას და სხვა აპებში ველების შევსებას შეძლებს."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;დარწმუნდით, რომ ენდობით ამ აპს&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google-ის ავტომატური შევსება&gt;%1$s&lt;/xliff:g&gt; იყენებს თქვენს ეკრანზე არსებულ კონტენტს, რათა გაარკვიოს, რა შეიძლება შეივსოს ავტომატურად."</string>
     <string name="device_theme" msgid="4571803018917608588">"მოწყობილობის თემა"</string>
     <string name="default_theme" msgid="7085644992078579076">"ნაგულისხმევი"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"მეხსიერების მენეჯერი: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index ded4c29..62df25e 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ешқандай"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ешқандай"</item>
     <item msgid="6189918678874123056">"PAP (кілтсөз арқылы растау) протоколы"</item>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index e4ed8ae..8c5acfb 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Есептік жазбалар"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Орын"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Есептік жазбалар"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Қауіпсіздік және орын"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлау және тіркелу деректері"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Телефон шифрланған"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон шифрланған"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Құлып экранының параметрлері"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Менің аймағым, экран бекіту, SIM картасын бекіту, растау дерекқорын бекітуді орнату"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Менің аймағым, экран бекітпесі, растау деректері жадының бекітпесін реттеу"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Құпиялылық"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Әкімші өшірген"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Қауіпсіздік күйі"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Саусақ таңбасын бас-у"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Саусақ таңбасын пайд-у"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi сканерлеу функциясы өшірулі болғандықтан қолжетімді емес"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Қосалқы желі маскасы"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 мекенжайлары"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Сақталған желілер"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP параметрлері"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi-Fi кеңейтілген параметрлері осы пайдаланушы үшін қолжетімді емес"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Өшірулі"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Телефон қондырылған және/немесе ұйықтаған кездегі процесті бақылау үшін экранды сақтау режимін қосыңыз."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Іске қосу кезінде"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Ағымдағы экран сақтау режимі"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Қазір бастау"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Параметрлер"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Aвтоматтық жарықтық"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ояту үшін көтеру"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Кіріс хабарландыруы экраны"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Айналаны көрсету"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Хабарландырулар келгенде, экранды ұйқы режимінен шығару"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Шрифт өлшемі"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Мәтінді үлкейтеді немесе кішірейтеді"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ешқашан қолданылмаған)"</string>
@@ -1676,7 +1674,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Қатты пернетақта параметрлері"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Енгізу үшін бос орын пернесін екі рет басу \".\""</string>
     <string name="show_password" msgid="4837897357002495384">"Құпия сөздерді көрсету"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"Таңбалар терілген кезде қысқа уақыт көрсетіледі"</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_quick_settings" msgid="246728645150092058">"Параметрлер"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"Тіл"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Пернелер тіркесімдері көмекшісі"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Қолжетімді перне тіркесімдерін көрсету"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Әдепкі"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Тінтуір/сенсорлы тақта"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Меңзер жылдамдығы"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Ойын бақылаушы"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Діріл қолдану"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Толық зарядталғаннан кейін экранның зарядты тұтынуы"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Экран жарығына жұмсалатын заряд шығыны"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобильдік желіні сканерлеу"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> бұрын"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Толық зарядталғаннан кейін (<xliff:g id="TIME">%1$s</xliff:g> бұрын) қолданбалардың тұтынуы"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> бұрын"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Толық зарядтан кейін (<xliff:g id="TIME">^1</xliff:g> бұрын) қолданба тұтынуы"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Толық зарядталғаннан кейін экран қосулы болған уақыт мөлшері"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Толық зарядталғаннан кейін құрылғының пайдаланылуы"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Ажыратылғаннан бері батарея қолданысы"</string>
@@ -1936,7 +1933,7 @@
     <string name="awake" msgid="387122265874485088">"Құрылғыны ояту уақыты"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi уақытында"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi уақытында"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Батарея зарядын кеңейтілген пайдалану"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Батарея зарядын пайдалану туралы"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Тарих егжей-тегжейі"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Батарея зарядының тұтынылуы"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Қолдану деректері"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Желімен байланыс"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Мобильдік желі күту режимінде"</string>
     <string name="power_phone" msgid="5392641106474567277">"Дыбыс қоңыраулары"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшет бос"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Күту режимі"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Батареяны пайдалану болжалды қуатты пайдалану болып табылады және батареяны пайдаланатын әрбір көзді қамтымайды. Өзге — есептелген болжалды қуатты пайдалану мен батареяда бақыланған нақты пайдалану арасындағы айырмашылық."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Мөлшерінен жоғары есептелген қуатты қолдану"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> Ампер/сағ"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s пайдаланылды"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Пайдаланылу уақыты: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$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_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_detail_foreground" msgid="3350401514602032183">"Белсенді пайдаланылатын кезде"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Дауыс кірісі мен шығысының параметрлері"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Дауыс іздеу"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android пернетақтасы"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Сөйлеу"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Дауыспен енгізу параметрлері"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Дауыспен енгізу"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Дауыспен енгізу қызметтері"</string>
@@ -2196,7 +2192,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Қосылмаған"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Желі қосу"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Тізімді жаңалау"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"Аттап өту"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Өткізіп жіберу"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Келесі"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Артқа"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Желі деректері"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Хабарландырудың дыбыс деңгейі"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Телефон әуені"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Әдепкі хабарландыру сигналы"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Қолданбамен берілген дыбыс"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Әдепкі хабарландыру дыбысы"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Әдепкі дабыл сигналы"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Қоңырау кезіндегі діріл"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Басқа дыбыстар"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Хабарландыруларды ешқашан көрсетпеу"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Төмен: дыбыссыз немесе визуалдық кедергісіз"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Орташа: дыбыссыз"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Жоғары: дыбыстық сигнал беру"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Шұғыл: дыбыстық сигнал беру және экранға шығару"</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="6585849855452076626">"Дыбысқа рұқсат ету"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Дыбыс шығармау, дірілдетпеу немесе осы хабарландыруларды ағымдағы экрандағы көріністе көрсетпеу."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Хабарландыру көмекшісі"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Мазаламау режиміне кіру"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнатылған қолданбалардың ешбірі Мазаламау режиміне кіруге рұқсат сұрамады"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Қолданбаларды жүктеу…"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android қолданба хабарландыруларының құрылғыда шығуын бөгейді."</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android хабарландырулардың осы санатының құрылғыда шығуын бөгейді"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Санаттар"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Басқа"</string>
     <string name="no_channels" msgid="3077375508177744586">"Бұл қолданба ешқандай хабарландыруды жарияламады"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ағымдағы бағдарда қалу"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Қорғалған іске қосу"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Жалғастыру"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Іске қосылуы алдында PIN кодын талап ету арқылы осы құрылғыны қосымша қорғауға болады. Іске қосылғанша құрылғы қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде, дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Іске қосылуы алдында өрнекті талап ету арқылы осы құрылғыны қосымша қорғауға болады. Іске қосылғанша құрылғы қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Іске қосылуы алдында құпия сөзді талап ету арқылы осы құрылғыны қосымша қорғауға болады. Іске қосылғанша құрылғы қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде, дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында PIN кодын талап ету арқылы осы құрылғыны қосымша қорғауға болады. Іске қосылғанша құрылғы қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл — жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында өрнекті талап ету арқылы осы құрылғыны қосымша қорғауға болады. Іске қосылғанша құрылғы қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл — жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосылардың алдында құпия сөзді талап ету арқылы осы құрылғыны қосымша қорғауға болады. Іске қосылғанша құрылғы қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл — жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Құрылғыны іске қосу үшін PIN кодын талап ету"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Құрылғыны іске қосу үшін өрнекті талап ету"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Құрылғыны іске қосу үшін құпия сөзді талап ету"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Жоқ, рақмет"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Жоқ, рақмет"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Жоқ, рақмет"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Құрылғыны іске қосардың алдында PIN кодын талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін PIN кодын талап ету керек пе?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Құрылғыны іске қосу алдында өрнек енгізуді талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін өрнекті талап ету керек пе?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Бұл құрылғыны іске қосу алдында құпиясөз талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды. \n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін құпиясөз сұрау керек пе?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында PIN кодын талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін PIN кодын талап ету керек пе?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында өрнекті енгізуді талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін өрнекті талап ету керек пе?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Құрылғы құлпын ашу үшін саусақ ізін пайдаланумен бірге, іске қосардың алдында өрнек енгізуді талап ету арқылы оның қауіпсіздігін күшейтуге болады. Ол іске қосылмайынша, қоңырауларды, хабарларды немесе хабарландыруларды, соның ішінде дабылдарды қабылдай алмайды.\n\nБұл жоғалған немесе ұрланған құрылғылардағы деректерді қорғауға көмектеседі. Құрылғыны іске қосу үшін құпиясөз талап ету керек пе?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Иә"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Жоқ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN коды қажет пе?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Өрнек қажет пе?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Құпия сөз қажет пе?"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"Иә"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Жоқ"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Қолданбаны орнатуға рұқсат беру"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Рұқсат етілген"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Рұқсат етілмеген"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера үшін қуат түймес. екі рет басыңыз"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Қосылған:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Әзірлеуші блоктарының жылдам параметрлері"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Көмектесуге әрқашан дайынбыз"</string>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Планшет жады"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Телефон жады"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> жалпы жадтан қолданылған"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"Жалпы <xliff:g id="TOTAL">%1$s</xliff:g> жадтан пайдаланылған"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"пайдаланылған"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Қолданбаны деректерін өшіру"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Бұл лездік қолданбаны өшіргіңіз келе ме?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> деген пайдаланушы үшін өшірілген)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Автотолтыру қызметі"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"авто, толтыру, автотолтыру"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> қолданбасын автолтыру қолданбасы етесіз бе? <xliff:g id="APP_NAME_1">%1$s</xliff:g> қолданбасы экрандағы мазмұнды оқып, басқа қолданбалардағы жолдарды толтыра алатын болады."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Осы қолданбаға сенетініңізге көз жеткізіңіз&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Автотолтыру&gt;%1$s&lt;/xliff:g&gt; экранда көрсетілгенді нені автоматты түрде толтыруға болатынын анықтау үшін пайдаланады."</string>
     <string name="device_theme" msgid="4571803018917608588">"Құрылғы тақырыбы"</string>
     <string name="default_theme" msgid="7085644992078579076">"Әдепкі"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Жад менеджері: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index 2cd6de4..26ea3dd 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"គ្មាន"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"គ្មាន"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -421,7 +423,7 @@
     <item msgid="758587126802411846">"ពណ៌ខ្មៅ​លើ​ពណ៌ស"</item>
     <item msgid="1495307195241623402">"ពណ៌លឿង​​លើ​​ពណ៌​ខ្មៅ"</item>
     <item msgid="6039700130994371612">"ពណ៌លឿង​លើ​ពណ៌ខៀវ"</item>
-    <item msgid="7169235156349580064">"តាម​តម្រូវ​ការ"</item>
+    <item msgid="7169235156349580064">"តាម​បំណង"</item>
   </string-array>
   <string-array name="vpn_types_long">
     <item msgid="2732002039459078847">"PPTP VPN"</item>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 30f96c6..69aa885 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -157,7 +157,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="date_and_time" msgid="9062980487860757694">"កាលបរិច្ឆេទ &amp; ម៉ោង"</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) -->
     <skip />
@@ -275,7 +275,7 @@
     <string name="radio_controls_title" msgid="3447085191369779032">"ច្រើន​ទៀត"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ឥត​ខ្សែ &amp; បណ្ដាញ"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"គ្រប់គ្រង​វ៉ាយហ្វាយ, ប៊្លូធូស, របៀប​ពេល​ជិះ​យន្ត​ហោះ, បណ្ដាញ​ចល័ត &amp; VPNs"</string>
-    <string name="cellular_data_title" msgid="6835451574385496662">"ទិន្នន័យ​ចល័ត"</string>
+    <string name="cellular_data_title" msgid="6835451574385496662">"ទិន្នន័យទូរសព្ទ​ចល័ត"</string>
     <string name="calls_title" msgid="3544471959217176768">"ហៅ"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"សារ SMS"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"អនុញ្ញាតឲ្យប្រើ​ទិន្នន័យ​តាមរយៈបណ្តាញទូរសព្ទចល័ត"</string>
@@ -294,10 +294,10 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"កាល​បរិច្ឆេទ​ &amp; ពេលវេលា"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"កំណត់​កាលបរិច្ឆេទ និង​ពេលវេលា"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"កំណត់​កាលបរិច្ឆេទ ពេលវេលា តំបន់​ពេលវេលា &amp; ទ្រង់ទ្រាយ"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"កាលបរិច្ឆេទ &amp; ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"កាលបរិច្ឆេទ និង ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ប្រើ​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ប្រើ​ពេលវេលា​បាន​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
-    <string name="zone_auto" msgid="334783869352026648">"តំបន់​ពេលវេលា​ស្វ័យ​ប្រវត្តិ"</string>
+    <string name="zone_auto" msgid="334783869352026648">"តំបន់​ម៉ោង​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ប្រើ​តំបន់ម៉ោងដែល​​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ប្រើ​តំបន់​ម៉ោងដែល​ផ្ដល់​ដោយ​បណ្ដាញ"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"ប្រព័ន្ធ 24 ម៉ោង"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"គណនី"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ទី​តាំង​"</string>
     <string name="account_settings_title" msgid="626177544686329806">"គណនី"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"សុវត្ថិភាព និងទីកន្លែង"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ការ​អ៊ិនគ្រីប និងលិខិត​សម្គាល់"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"បានអ៊ិនគ្រីបទូរសព្ទ"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"បានអ៊ិនគ្រីបទូរសព្ទ"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ចំណូលចិត្ត​អេក្រង់​ចាក់​សោ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"កំណត់​ទីតាំង​របស់​ខ្ញុំ ដោះ​សោ​អេក្រង់ ចាក់​សោ​ស៊ីម​កាត ចាក់​សោ​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់​ទីតាំង​ខ្ញុំ, ការ​ដោះ​សោ​អេក្រង់, សោ​ឧបករណ៍​ផ្ទុក​ព័ត៌មាន​សម្ងាត់"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ឯកជនភាព"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"បិទ​ដោយ​អ្នក​គ្រប់គ្រង"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ស្ថានភាព​សុវត្ថិភាព"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"គ្រប់គ្រងស្នាមម្រាមដៃ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ប្រើស្នាមម្រាមដៃសម្រាប់"</string>
@@ -364,7 +363,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"បញ្ចូល​ស្នាមម្រាមដៃ"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"លក្ខណៈពិសេសេការពារឧបករណ៍នឹងមិនត្រូវធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចបង្ការអ្នកផ្សេងពីការប្រើថេប្លេតនេះឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"លក្ខណៈពិសេសេការពារឧបករណ៍នឹងមិនត្រូវធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចបង្ការអ្នកផ្សេងពីការប្រើឧបករណ៍នេះឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"លក្ខណៈពិសេសេការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចបង្ការអ្នកផ្សេងពីការប្រើទូរស័ព្ទនេះឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យដំណើរការទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃពីការប្រើទូរសព្ទនេះបានឡើយ ប្រសិនបើវាបាត់បង់ ត្រូវបានគេលួច ឬលុបចោល។"</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃក្នុងការប្រើថេប្លេតនេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃពីការប្រើឧបករណ៍នេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"លក្ខណៈពិសេសការពារឧបករណ៍នឹងមិនត្រូវបានធ្វើឲ្យសកម្មទេ។ អ្នកនឹងមិនអាចរារាំងអ្នកដទៃពីការប្រើទូរស័ព្ទនេះនៅពេលវាបាត់បង់ ឬត្រូវបានគេលួចនោះទេ។"</string>
@@ -441,12 +440,12 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"ការពារឧបករណ៍របស់អ្នក"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"ប្រើស្នាមម្រាមដៃ"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"ដោះសោដោយប្រើស្នាមម្រាមដៃរបស់អ្នក"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"ជ្រើស​ការ​ចាក់សោ​អេក្រង់"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"ជ្រើស​រើសការ​ចាក់សោ​អេក្រង់"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"ជ្រើសការចាក់សោការងារ"</string>
     <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"ការពារថេប្លេតរបស់អ្នក"</string>
     <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"ការពារឧបករណ៍របស់អ្នក"</string>
     <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"ការពារទូរស័ព្ទរបស់អ្នក"</string>
-    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ដើម្បីទទួលបានសុវត្ថិភាពបន្ថែម សូមដំឡើងការចាក់សោអេក្រង់បម្រុង។"</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"ដើម្បីទទួលបានសុវត្ថិភាពបន្ថែម សូមរៀបចំការចាក់សោអេក្រង់បម្រុង។"</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>
@@ -650,7 +649,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ចងចាំ​ការ​កំណត់"</string>
     <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_no_devices_found" msgid="1382012407154143453">"រក​មិន​ឃើញ​ឧបករណ៍​ដែល​នៅ​ជិត។"</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>
@@ -667,14 +666,14 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ចង់បិទ Wi-Fi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</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_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 Beam"</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_off_summary" msgid="4663095428454779138">"បិទ"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"មិន​អាច​ប្រើ​បាន ព្រោះ​​​បាន​បិទ NFC"</string>
-    <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
+    <string name="android_beam_label" msgid="6257036050366775040">"Android បញ្ជូន"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"នៅ​ពេល​ដែល​មុខងារ​នេះ​បើក អ្នក​អាច​បញ្ជូន​មាតិកា​កម្មវិធី​ទៅ​ឧបករណ៍​ដែល​អាច​ប្រើ NFC ផ្សេង​ទៀត​ដោយ​ដាក់​ឧបករណ៍​ផ្ទប់​គ្នា។ ឧទាហរណ៍៖ អ្នក​អាច​បញ្ជូន​គេហទំព័រ, វីដេអូ YouTube, ទំនាក់ទំនង និង​មាតិកា​ជា​ច្រើន​ទៀត។\n\nគ្រាន់​តែ​ដាក់​ឧបករណ៍ផ្ទប់​គ្នា (តាម​ធម្មតា​ខ្នង​ទល់​ខ្នង) បន្ទាប់​មក​ប៉ះ​អេក្រង់​របស់​អ្នក​ជា​ការ​ស្រេច។ កម្មវិធី​នេះ​នឹង​កំណត់​របស់​ដែល​ត្រូវ​បញ្ជូន។"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"វ៉ាយហ្វាយ"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"បើក​វ៉ាយហ្វាយ"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"មិនអាចប្រើបានទេ ដោយសារការស្កេន Wi‑Fi ត្រូវបានបិទ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"ជៀសវាង​ការ​តភ្ជាប់​ដែល​ខ្សោយ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"កុំ​ប្រើ​បណ្ដាញ​វ៉ាយហ្វាយ លុះ​ត្រា​វា​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ប្រើ​តែ​បណ្ដាញ​ដែល​មាន​ការ​តភ្ជាប់​អ៊ីនធឺណិត​ល្អ"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"កំណត់រចនាសម្ព័ន្ធ 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"របាំងបណ្តាញរង"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"អាសយដ្ឋាន IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"បណ្ដាញ​បាន​រក្សាទុក"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"ការ​កំណត់ IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"ការកំណត់កម្រិតខ្ពស់នៃ Wi‑Fi មិនអាចប្រើបានសម្រាប់អ្នកប្រើនេះទេ"</string>
@@ -847,7 +845,7 @@
     <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_tether_checkbox_text" msgid="1847167643625779136">"Wi-Fi ហតស្ប៉ត​ចល័ត"</string>
     <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"ហតស្ប៉ត​វ៉ាយហ្វាយ"</string>
     <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"ប្រើការតភ្ជាប់ទិន្នន័យចល័តដើម្បីផ្ដល់បណ្ដាញ Wi-Fi"</string>
     <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"មិនកំពុងចែករំលែកការតភ្ជាប់អ៊ីនធឺណិតរបស់ថេប្លេតនេះតាមរយៈហតស្ប៉តទេ"</string>
@@ -856,7 +854,7 @@
     <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>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"រៀបចំ Wi-Fi ហតស្ប៉ត"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"រៀបចំ​ហតស្ប៉តវ៉ាយហ្វាយ"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"ហតស្ប៉ត AndroidAP WPA2 PSK"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ហតស្ប៉ត <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g>"</string>
@@ -904,7 +902,7 @@
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"កម្រិត​សំឡេង"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"បែប​ផែន​តន្ត្រី"</string>
-    <string name="ring_volume_title" msgid="5592466070832128777">"កម្រិត​សំឡេង​រោទ៍"</string>
+    <string name="ring_volume_title" msgid="5592466070832128777">"កម្រិត​សំឡេងទូរសព្ទ​រោទ៍"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ញ័រ​ពេល​ស្ងាត់"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"សំឡេង​ជូន​ដំណឹង​លំនាំដើម"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"សំឡេង​រោទ៍"</string>
@@ -1007,7 +1005,7 @@
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"ផ្ទាល់ខ្លួន"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"ប្ដូរផ្ទាំងរូបភាព"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"កំណត់អេក្រង់របស់អ្នកជាលក្ខណៈផ្ទាល់ខ្លួន"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ជ្រើស​ផ្ទាំង​រូបភាព​ពី"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ជ្រើសរើស​ផ្ទាំង​រូបភាព​ពី"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"ធាតុរក្សាអេក្រង់"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"ខណៈពេលកំពុងសាក ឬដកចេញ"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"ទាំង​ពីរ"</string>
@@ -1017,16 +1015,15 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"បិទ"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ដើម្បីគ្រប់គ្រងអ្វីដែលកើតឡើង នៅពេលទូរស័ព្ទត្រូវបានដោត និង/ឬកំពុងដេក សូមបើកធាតុរក្សាអេក្រង់។"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ពេលចាប់ផ្តើម"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"ធាតុ​រក្សា​អេក្រង់​បច្ចុប្បន្ន"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ចាប់ផ្ដើម​ឥឡូវ"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ការ​កំណត់"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ពន្លឺ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"លើក​ដៃ​ដើម្បី​ឲ្យ​ភ្ញាក់"</string>
-    <string name="doze_title" msgid="5389406335828323273">"អេក្រង់នៃការជូនដំណឹង​ចូល"</string>
+    <string name="doze_title" msgid="2259176504273878294">"មុខងារដាស់អេក្រង់"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ដាស់អេក្រង់នៅពេលដែលអ្នកទទួលបានការជូនដំណឹង"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ទំហំពុម្ពអក្សរ"</string>
-    <string name="short_summary_font_size" msgid="6819778801232989076">"ធ្វើឲ្យអត្ថបទធំជាងមុន ឬតូចជាងមុន"</string>
+    <string name="short_summary_font_size" msgid="6819778801232989076">"ធ្វើឲ្យអក្សរធំជាងមុន ឬតូចជាងមុន"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"កំណត់​ការ​ចាក់សោ​ស៊ីម​កាត"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"ចាក់សោ​ស៊ីម​កាត"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"បិទ"</string>
@@ -1034,9 +1031,9 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"ចាក់សោ​ស៊ីម​កាត"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"ចាក់​សោ​ស៊ីម​កាត"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ទាមទារ​កូដ PIN ដើម្បី​ប្រើ​កុំព្យូទ័រ​បន្ទះ"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ទាមទារ​កូដ PIN ដើម្បី​ប្រើ​ទូរស័ព្ទ"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ទាមទារ​កូដ PIN ដើម្បី​ប្រើ​ទូរសព្ទ"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ទាមទារ​កូដ PIN ដើម្បី​ប្រើ​កុំព្យូទ័រ​បន្ទះ"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ទាមទារ​​​កូដ PIN ដើម្បី​ប្រើ​ទូរស័ព្ទ"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ទាមទារ​​​កូដ PIN ដើម្បី​ប្រើ​ទូរសព្ទ"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"ប្ដូរ​កូដ PIN ស៊ីម​កាត"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"កូដ​ PIN ស៊ីម​កាត"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"ចាក់​សោ​ស៊ីម​កាត"</string>
@@ -1163,7 +1160,7 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"បំភ្លេច"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"ដំឡើង"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"រុករក"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"បង្កើតទំហំផ្ទុក"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"បង្កើនទំហំផ្ទុក"</string>
     <string name="storage_menu_manage" msgid="5914482953856430780">"គ្រប់គ្រងទំហំផ្ទុក"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"ការ​តភ្ជាប់​កុំព្យូទ័រ​តាម​យូអេសប៊ី"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"តភ្ជាប់​ជា"</string>
@@ -1400,7 +1397,7 @@
     <string name="location_access_summary" msgid="69031404093194341">"ឲ្យ​កម្មវិធី​​សួ​រ​រក​សិទ្ធិ​របស់​អ្នក​ក្នុង​ការ​ប្រើ​ព័ត៌មាន​ទីតាំង​របស់​អ្នក"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"ប្រភព​ទីតាំង"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"អំពី​កុំព្យូទ័រ​បន្ទះ"</string>
-    <string name="about_settings" product="default" msgid="1743378368185371685">"អំពី​ទូរស័ព្ទ"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"អំពី​ទូរសព្ទ"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"អំពីឧបករណ៍ត្រាប់តាម"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"មើល​ព័ត៌មាន​ផ្លូវច្បាប់, ស្ថានភាព, កំណែ​កម្មវិធី"</string>
     <string name="legal_information" msgid="5769301644270604095">"ព័ត៌មាន​ផ្លូវ​ច្បាប់"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"មិន​អាច​ដំឡើង​បច្ចុប្បន្នភាព​ប្រព័ន្ធ​លើ​មេឌៀ​ខាង​ក្រៅ​បាន​ទេ។"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"កម្មវិធីអ្នកគ្រប់គ្រង​ឧបករណ៍​មិនអាច​ដំឡើង​នៅលើ​ឧបករណ៍មេឌៀផ្នែក​ខាងក្រៅ​បានទេ"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"បង្ខំ​ឲ្យ​ឈប់?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"បើ​អ្នក​បង្ខំ​ឲ្យ​កម្មវិធី​ឈប់ វា​អាច​​ដំណើរ​មិន​ត្រឹមត្រូវ។"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"បើ​អ្នក​បង្ខំ​ឲ្យ​កម្មវិធី​ឈប់ វា​អាច​​ដំណើរការ​មិន​ត្រឹមត្រូវ។"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"មិន​អាច​ផ្លាស់ទី​កម្មវិធី។ <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"ទីតាំង​ដំឡើង​ដែល​ពេញចិត្ត"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(មិន​ដែល​ប្រើ)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"ជំនួយផ្លូវកាត់ក្តារចុច"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"បង្ហាញផ្លូវកាត់ដែលអាចប្រើបាន"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"លំនាំដើម"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"កណ្ដុរ/ក្ដារអូស"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ល្បឿន​ព្រួញ"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"កម្មវិធី​ពិនិត្យ​ល្បែង"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"ប្រើ​កម្មវិធី​ធ្វើ​ឲ្យ​ញ័រ"</string>
@@ -1717,7 +1714,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"កែ​ពាក្យ"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"កែសម្រួល​"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"លុប"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"អ្នកមិនមានពាក្យក្នុងវចនានុក្រមអ្នកប្រើទេ។ ដើម្បីបន្ថែមពាក្យ សូមប៉ះប៊ូតុងបន្ថែម (+)។"</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"អ្នកមិនមានពាក្យក្នុងវចនានុក្រមអ្នកប្រើប្រាស់ទេ។ ដើម្បីបញ្ចូលពាក្យ សូមប៉ះប៊ូតុងបញ្ចូល (+)។"</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"សម្រាប់​ភាសា​ទាំងអស់"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"ភាសា​ផ្សេង​ទៀត…"</string>
     <string name="testing" msgid="6584352735303604146">"សាកល្បង"</string>
@@ -1768,7 +1765,7 @@
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"សេវាកម្ម​ដែល​បាន​ទាញយក"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"ពិសោធន៍"</string>
     <string name="talkback_title" msgid="7912059827205988080">"កម្មវិធីអានអេក្រង់"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"កម្មវិធីអានអេក្រង់បង្កើតឡើងជាចម្បងសម្រាប់មនុស្សពិកាភ្នែក និងអ្នកខ្សោយភ្នែក"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"កម្មវិធីអានអេក្រង់បង្កើតឡើងជាចម្បងសម្រាប់មនុស្សពិការភ្នែក និងអ្នកខ្សោយភ្នែក"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"ចុចធាតុ​នៅលើ​អេក្រង់​របស់អ្នក​ដើម្បី​ស្ដាប់​ធាតុ​ទាំង​នោះ​បញ្ចេញសំឡេង​ឮៗ"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"ចំណងជើង"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"ការពង្រីក"</string>
@@ -1792,7 +1789,7 @@
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"ព្រួញកណ្តុរធំ"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"សំឡេងម៉ូណូ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"រួមផ្សំប៉ុស្តិ៍ចូលគ្នាពេលកំពុងចាក់សំឡេង"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ប៉ះ &amp; សង្កត់​ឲ្យ​យូរ"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ប៉ះ និង សង្កត់​ឲ្យ​យូរ"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"​បញ្ច្រាស​ពណ៌"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"អាចប៉ះពាល់ដល់ប្រតិបត្តិការ"</string>
     <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ចុចបន្ទាប់ពីទ្រនិចឈប់ផ្លាស់ទី"</string>
@@ -1828,7 +1825,7 @@
     <string name="captioning_preview_title" msgid="1234015253497016890">"មើល​ជាមុន"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"ជម្រើស​ស្តង់​ដារ​"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ភាសា"</string>
-    <string name="captioning_text_size" msgid="6737002449104466028">"ទំហំ​អត្ថបទ"</string>
+    <string name="captioning_text_size" msgid="6737002449104466028">"ទំហំ​អក្សរ"</string>
     <string name="captioning_preset" msgid="8939737196538429044">"រចនាប័ទ្ម​ចំណងជើង"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"ជម្រើស​តាម​តម្រូវ​ការ"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"ពណ៌​ផ្ទៃ​ខាងក្រោយ"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ការប្រើប្រាស់អេក្រង់​ចាប់តាំងពី​សាកថ្មពេញ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ការប្រើប្រាស់​អេក្រង់"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ការស្កេន​បណ្ដាញ​ទូរសព្ទ​ចល័ត"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> មុន"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"ការប្រើប្រាស់​កម្មវិធី​គិតចាប់តាំងពី​សាកថ្មពេញ (<xliff:g id="TIME">%1$s</xliff:g> មុន)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> មុន"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"ការប្រើប្រាស់​កម្មវិធី​គិតចាប់តាំងពី​សាកថ្មពេញ (<xliff:g id="TIME">^1</xliff:g> មុន)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"អេក្រង់រយៈពេលបាន​បើក​ចាប់តាំងពីសាកថ្មពេញ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ការប្រើប្រាស់ឧបករណ៍​ចាប់តាំងពី​សាកថ្មពេញ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ថ្ម​ដែល​បាន​ប្រើ​តាំង​ពី​លែង​បញ្ចូល"</string>
@@ -1928,7 +1925,7 @@
     <string name="battery_stats_gps_on_label" msgid="1193657533641951256">"បើក GPS"</string>
     <string name="battery_stats_camera_on_label" msgid="4935637383628414968">"បានបើកកាមេរ៉ា"</string>
     <string name="battery_stats_flashlight_on_label" msgid="4319637669889411307">"បានបើកពិល"</string>
-    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"វ៉ាយហ្វាយ"</string>
+    <string name="battery_stats_wifi_running_label" msgid="1845839195549226252">"Wi-Fi"</string>
     <string name="battery_stats_wake_lock_label" msgid="1908942681902324095">"ភ្ញាក់"</string>
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"សញ្ញា​បណ្ដាញ​ចល័ត"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"កាមេរ៉ា"</string>
     <string name="power_wifi" msgid="1135085252964054957">"វ៉ាយហ្វាយ"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ប៊្លូធូស"</string>
-    <string name="power_cell" msgid="6596471490976003056">"រង់ចាំ​ដោយ​សកម្ម"</string>
+    <string name="power_cell" msgid="3392999761958982492">"បណ្ដាញ​ទូរសព្ទ​ចល័ត​គ្មាន​ដំណើរការ"</string>
     <string name="power_phone" msgid="5392641106474567277">"ការ​ហៅ​ជា​សំឡេង"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"កុំព្យូទ័រ​បន្ទះ​ទំនេរ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ទូរស័ព្ទ​ទំនេរ"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ការ​ប្រើ​ថ្ម​គឺជា​ការ​ប្រើ​ថាមពល​ប្រហាក់ប្រហែល និង​មិន​រួម​បញ្ចូល​​គ្រប់​ប្រភព​នៃ​ការ​ប្រើ​ថ្ម។​​ ផ្សេងៗ​គឺជា​ភាព​ខុសគ្នា​រវាង​ការ​ប្រើ​ថ្ម​ប្រហាក់ប្រហែល​ដែល​បាន​គណនា​ និង​ការ​ប្រើ​ជាក់ស្ដែង​បាន​ពិនិត្យមើល​លើ​ថ្ម។"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ការ​ប្រើ​ប្រាស់​ថាមពល​លើស​"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"បានប្រើ​អស់​រយៈពេល %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"បានប្រើ​អស់​រយៈពេល <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_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_detail_foreground" msgid="3350401514602032183">"ពេល​កំពុងប្រើប្រាស់​"</string>
@@ -2063,7 +2060,7 @@
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ស្វប ZRam"</string>
     <string name="mem_use_free_type" msgid="717708548454880840">"ទំនេរ"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"សរុប"</string>
-    <string name="menu_duration_3h" msgid="4714866438374738385">"៣ ម៉ោង"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 ម៉ោង"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"៦ ម៉ោង"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"១២ ម៉ោង"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"១ ថ្ងៃ"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"កំណត់​ការ​បញ្ចូល​​ &amp; បញ្ចេញ​សំឡេង"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ស្វែងរក​តាម​​សំឡេង"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"ក្ដារ​ចុច Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"និយាយ"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"កំណត់​ការ​បញ្ចូល​សំឡេង"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ការ​បញ្ចូល​សំឡេង"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"សេវាកម្ម​បញ្ចូល​សំឡេង"</string>
@@ -2145,7 +2141,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"បាន​លុប​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់។"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"មិន​អាច​លុប​ការ​ផ្ទុក​​​ព័ត៌មាន​សម្ងាត់។"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"បាន​បើក​ការ​ផ្ទុក​ព័ត៌មាន​សម្ងាត់។"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"អ្នក​ត្រូវ​តែ​កំណត់​ពាក្យសម្ងាត់ ឬ​កូដ​ PIN ចាក់​សោ​អេក្រង់ មុន​នឹង​អ្នក​អាច​ប្រើ​ការ​ផ្ទុក​​​ព័ត៌មាន​សម្ងាត់។"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"អ្នក​ត្រូវ​​កំណត់​ពាក្យសម្ងាត់ ឬ​កូដ​ PIN ចាក់​សោ​អេក្រង់ មុន​នឹង​អ្នក​អាច​ប្រើ​ការ​ផ្ទុក​​​ព័ត៌មាន​សម្គាល់ខ្លួន។"</string>
     <string name="usage_access_title" msgid="332333405495457839">"កម្មវិធី​មាន​សិទ្ធិ​ប្រើប្រាស់"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"សំឡេង​ពេលអាសន្ន"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"កំណត់​ឥរិយាបថ​ពេល​ហៅ​ពេល​មាន​អាសន្ន"</string>
@@ -2154,7 +2150,7 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"ទិន្នន័យ​ផ្ទាល់ខ្លួន"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"បម្រុង​ទុក​ទិន្នន័យ​របស់​ខ្ញុំ"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"បម្រុង​ទុក​ទិន្នន័យ​កម្មវិធី, ពាក្យ​សម្ងាត់​វ៉ាយហ្វាយ និង​ការ​កំណត់​ផ្សេងៗ​ទៅ​ម៉ាស៊ីន​មេ Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"បម្រុង​ទុក​គណនី"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"គណនីបម្រុង​ទុក"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"រួម​បញ្ចូល​ទិន្នន័យ​កម្មវិធី"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ស្ដារ​ឡើង​វិញ​ស្វ័យ​ប្រវត្តិ"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"ពេល​ដំឡើង​កម្មវិធី​ឡើងវិញ ស្ដារ​ការ​កំណត់​បម្រុងទុក និង​ទិន្នន័យ"</string>
@@ -2285,7 +2281,7 @@
     <string name="data_usage_accounting" msgid="7170028915873577387">"ការ​គណនា​​ទិន្នន័យ​របស់​ក្រុមហ៊ុន​ផ្ដល់សេវាទូរស័ព្ទ​អាច​ខុស​គ្នា​ពី​ឧបករណ៍​របស់​អ្នក។"</string>
     <string name="data_usage_app" msgid="4970478397515423303">"ការ​ប្រើ​ប្រាស់​កម្មវិធី"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"ព័ត៌មាន​កម្មវិធី"</string>
-    <string name="data_usage_cellular_data" msgid="9168928285122125137">"ទិន្នន័យ​ចល័ត"</string>
+    <string name="data_usage_cellular_data" msgid="9168928285122125137">"ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
     <string name="data_usage_data_limit" msgid="1193930999713192703">"កំណត់​ដែន​ទិន្នន័យ"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"ខួប​​ប្រើ​ទិន្នន័យ"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"ការ​ប្រើ​កម្មវិធី"</string>
@@ -2342,7 +2338,7 @@
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"វា​នឹង​សន្សំ​ការ​ប្រើ​ទិន្នន័យ និង​ថ្ម ប៉ុន្តែ​អ្នក​ត្រូវ​តែ​ធ្វើ​សម​កាល​កម្ម​គណនី​នីមួយៗ​ដោយ​ខ្លួនឯង ដើម្បី​ប្រមូល​​ព័ត៌មាន​ថ្មីៗ។ អ្នក​នឹង​មិន​ទទួល​ការ​ជូន​ដំណឹង​ពេល​មាន​បច្ចុប្បន្នភាព​​ទេ។"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"កាលបរិច្ឆេទ​កំណត់​ខួប​​ប្រើ​ឡើង​វិញ"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"កាលបរិច្ឆេទ​នៃ​ខែ​នីមួយៗ៖"</string>
-    <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"ការ​កំណត់"</string>
+    <string name="data_usage_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>
@@ -2530,12 +2526,12 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"លុប​ភ្ញៀវ?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"កម្មវិធី និង​ទិន្នន័យ​ទាំងអស់​ក្នុង​សម័យ​​នេះ​នឹង​ត្រូវ​បាន​លុប។"</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"លុបចេញ"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"បើកការហៅទូរស័ព្ទ"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"បើកការហៅទូរស័ព្ទ &amp; សារ SMS"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"បើកការហៅទូរសព្ទ"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"បើកការហៅទូរសព្ទ និងសារ SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"លុប​អ្នកប្រើ"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"បើកការហៅទូរស័ព្ទ?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"ប្រវត្តិ​ហៅ​នឹង​ត្រូវ​បាន​ចែករំលែក​ជា​មួយ​អ្នក​ប្រើ​នេះ។"</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"បើកការហៅទូរស័ព្ទ &amp; សារ SMS?"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"បើកការហៅទូរសព្ទ និងសារ SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"ប្រវត្តិ​ហៅ និង​សារ SMS នឹង​ត្រូវ​បាន​ចែករំលែក​ជា​មួយ​អ្នកប្រើ​នេះ។"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"ព័ត៌មានបន្ទាន់"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"ព័ត៌មាន និង​ទំនាក់​ទំនង​សម្រាប់ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
@@ -2545,7 +2541,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ការកំណត់​នេះ​ប៉ះពាល់​ដល់​អ្នក​ប្រើ​ទាំងអស់​លើ​កុំព្យូទ័រ​បន្ទះ​នេះ។"</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ការ​កំណត់​នេះ​ប៉ះពាល់​ដល់​អ្នក​ប្រើ​ទាំងអស់​លើ​ទូរស័ព្ទ​នេះ។"</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ប្ដូរ​ភាសា"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ចុច &amp; បង់​ប្រាក់"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ចុច និង​ បង់​ប្រាក់"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"របៀប​ដែល​វា​​ដំណើរការ"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"បង់ប្រាក់ដោយប្រើទូរស័ព្ទរបស់អ្នកនៅក្នុងហាង"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"លំនាំដើមការបង់ប្រាក់"</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"ប្រើលំនាំដើម"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"ជានិច្ច"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"លើកលែងតែកម្មវិធីបង់ប្រាក់ផ្សេងទៀតបើក"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"នៅឯស្ថានីយ៍ ប៉ះ និងបង់ប្រាក់ ត្រូវបង់ប្រាក់ដោយ៖"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"នៅឯស្ថានីយ ប៉ះ និងបង់ប្រាក់ ត្រូវបង់ប្រាក់ដោយ៖"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"បង់ប្រាក់នៅកន្លែងដែលមានឧបករណ៍គិតប្រាក់"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"ដំឡើងកម្មវិធីបង់ប្រាក់ ហើយបន្ទាប់មកដាក់ផ្នែកខាងក្រោយនៃទូរស័ព្ទរបស់អ្នកទៅស្ថានីយ៍ណាមួយដែលមាននិមិត្តសញ្ញាគ្មានទំនាក់ទំនង (contactless symbol)។"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"យល់ហើយ"</string>
@@ -2588,7 +2584,7 @@
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"បាន​ធ្វើ​ឲ្យ​របៀប 4G LTE ល្អ​ប្រសើរ​"</string>
     <string name="enhanced_4g_lte_mode_summary" msgid="1376589643017218924">"ប្រើ​​ទិន្នន័យ LTE ​ដើម្បី​បង្កើន​សំឡេង​ និង​ទំនាក់ទំនង (បាន​ផ្ដល់​អនុសាសន៍​)"</string>
     <string name="preferred_network_type_title" msgid="3431041717309776341">"ប្រភេទ​បណ្ដាញ​​ដែល​​ពេញចិត្ត"</string>
-    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (បាន​ផ្ដល់​អនុសាសន៍)"</string>
+    <string name="preferred_network_type_summary" msgid="6564884693884755019">"LTE (បាន​ណែនាំ)"</string>
     <string name="work_sim_title" msgid="4843322164662606891">"ស៊ីម​ការងារ"</string>
     <string name="user_restrictions_title" msgid="5794473784343434273">"កម្មវិធី &amp; កា​រ​ចូល​ប្រើ​មាតិកា"</string>
     <string name="user_rename" msgid="8523499513614655279">"ប្ដូរ​ឈ្មោះ"</string>
@@ -2603,7 +2599,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"អនុញ្ញាត​ឲ្យ​ប្ដូរ​ទិន្នន័យ នៅ​ពេល​ប៉ះ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> នេះ និង​ឧបករណ៍ NFC ផ្សេងទៀត"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​កុំព្យូទ័រ​បន្ទះ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ឲ្យ​ប្ដូរ​ទិន្នន័យ​ពេល​ទូរស័ព្ទ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"អនុញ្ញាតការ​ប្ដូរ​ទិន្នន័យ​ពេល​ទូរសព្ទ​ប៉ះ​ឧបករណ៍​ផ្សេង"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"ទី​តាំង​"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ឲ្យ​កម្មវិធី​ប្រើ​ព័ត៌មាន​ទីតាំង​របស់​អ្នក"</string>
     <string name="wizard_back" msgid="5567007959434765743">"ថយក្រោយ"</string>
@@ -2678,7 +2674,7 @@
     <string name="keywords_display_auto_brightness" msgid="3325150824507953765">"អេក្រង់ព្រិល, ប៉ះអេក្រង់, ថ្ម"</string>
     <string name="keywords_display_night_display" msgid="7630169927425425754">"កំណត់ឲ្យអេក្រង់ងងឹត, យប់, ស្រមោលពណ៌"</string>
     <string name="keywords_display_wallpaper" msgid="7362076351860131776">"ផ្ទៃខាងក្រោយ, ធ្វើលក្ខណៈផ្ទាល់ខ្លួន, កំណត់ការបង្ហាញផ្ទាល់ខ្លួន"</string>
-    <string name="keywords_display_font_size" msgid="3404655440064726124">"ទំហំ​អត្ថបទ"</string>
+    <string name="keywords_display_font_size" msgid="3404655440064726124">"ទំហំ​អក្សរ"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"គម្រោង, ខាស"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"ទំហំ, ថាស, ថាសរឹង, ការប្រើឧបករណ៍"</string>
     <string name="keywords_battery" msgid="1173830745699768388">"ការប្រើថាមពល, គិតថ្លៃ"</string>
@@ -2731,7 +2727,9 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"កម្រិត​សំឡេង​ការ​ជូន​ដំណឹង"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"សំឡេង​រោទ៍​ទូរស័ព្ទ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"សំឡេង​ជូន​ដំណឹង​លំនាំដើម"</string>
-    <string name="alarm_ringtone_title" msgid="6344025478514311386">"សំឡេងម៉ោងរោទិ៍លំនាំដើម"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"សំឡេង​ដែល​ផ្តល់​ជូន​សម្រាប់​កម្មវិធី"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"សំឡេង​ជូន​ដំណឹង​លំនាំដើម"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"សំឡេងម៉ោងរោទ៍លំនាំដើម"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ញ័រ​សម្រាប់​ការ​ហៅ​ដែរ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"សំឡេង​ផ្សេង​ទៀត"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"សំឡេង​បន្ទះ​លេខ"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"កុំ​បង្ហាញ​ការ​ជូនដំណឹង"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"ទាប៖ មិនមានការរំខានជាសំឡេង ឬរូបភាពទេ"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"មធ្យម៖ គ្មានសំឡេង"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ខ្ពស់៖ បញ្ចេញសំឡេង"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"បន្ទាន់៖ បញ្ចេញសំឡេង និងលោតលើអេក្រង់"</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="6585849855452076626">"អនុញ្ញាតឲ្យមានសំឡេង"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"កុំបន្លឺសំឡេង ញ័រ ឬលោតបង្ហាញការជូនដំណឹងទាំងនេះទៅក្នុងការបង្ហាញនៃអេក្រង់បច្ចុប្បន្ន។"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ជំនួយការជូនដំណឹង"</string>
@@ -2833,9 +2832,11 @@
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"អនុញ្ញាតឲ្យកម្មវិធីនេះបង្កើតវិនដូរូបភាពក្នុងរូបភាព ខណៈពេលដែលកម្មវិធីកំពុងបើក ឬបន្ទាប់ពីអ្នកចាកចេញពីវា (ឧទាហរណ៍ ដើម្បីបន្តមើលវីដេអូ)។ វិនដូនេះបង្ហាញនៅលើកម្មវិធីផ្សេងទៀតដែលអ្នកកំពុង​ប្រើប្រាស់។"</string>
     <string name="picture_in_picture_on" msgid="6103704909710176555">"បាទ/ចាស"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"ទេ"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"ចូលដំណើរមុខងារកុំរំខាន"</string>
+    <string name="manage_zen_access_title" msgid="2611116122628520522">"ចូលដំណើរការមុខងារកុំរំខាន"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"គ្មានកម្មវិធីបានដំឡើងណាមួយបានស្នើការចូលដំណើរការមុខងារកុំរំខានទេ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ការជូនដំណឹងរបស់កម្មវិធីនេះមិនឲ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ប្រព័ន្ធប្រតិបត្តិការ Android កំពុងទប់ស្កាត់ប្រភេទនៃការជូនដំណឹងនេះមិនឲ្យបង្ហាញនៅលើឧបករណ៍នេះទេ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ប្រភេទ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ផ្សេងៗ"</string>
     <string name="no_channels" msgid="3077375508177744586">"កម្មវិធី​នេះ​មិន​បាន​បង្ហោះ​ការជូនដំណឹង​ណាមួយ​ឡើយ"</string>
@@ -2876,7 +2877,7 @@
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"ឈ្មោះច្បាប់បានប្រើរួចហើយ"</string>
     <string name="zen_mode_add_rule" msgid="7459154136384467057">"បញ្ចូល​ទំនាក់ទំនងជា​ច្រើន​ទៀត"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"លុបច្បាប់"</string>
-    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"ជ្រើសប្រភេទក្បួន"</string>
+    <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"ជ្រើសរើសប្រភេទច្បាប់"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"លុបច្បាប់ \"<xliff:g id="RULE">%1$s</xliff:g>\"?"</string>
     <string name="zen_mode_delete_rule_button" msgid="4248741120307752294">"លុប"</string>
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"ប្រភេទច្បាប់"</string>
@@ -2919,7 +2920,7 @@
     <string name="zen_mode_events" msgid="7914446030988618264">"ព្រឹត្តិការណ៍"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"អ្នកហៅទូរស័ព្ទទាំងអស់"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"អ្នកហៅចូលបានជ្រើស"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"អ្នកហៅចូលសារជាថ្មី"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"អ្នកហៅចូលសាជាថ្មី"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ប្រសិនបើមនុស្សតែមួយហៅចូលមកលើកទីពីរនៅក្នុងរយៈពេល <xliff:g id="MINUTES">%d</xliff:g> នាទី អនុញ្ញាតចំពោះការហៅចូលនេះ។"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"បើកដោយស្វ័យ​ប្រវត្តិ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"កុំ"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"បើក"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"បិទ"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"ភ្ជាប់​អេក្រង់"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"នៅពេលបើកការកំណត់នេះ អ្នកអាចប្រើការខ្ទាស់អេក្រង់បានដើម្បីរក្សាទិដ្ឋភាពអេក្រង់បច្ចុប្បន្នរហូតដល់អ្នកលែងខ្ទាស់វា។\n\nដើម្បីប្រើការខ្ទាស់អេក្រង់៖\n\n1. ត្រូវប្រាកដថាមុខងារខ្ទាស់អេក្រង់ត្រូវបានបើក។\n\n2. បើកអេក្រង់ដែលអ្នកចង់ខ្ទាស់។\n\n3. ប៉ះដើម្បីមើលទាំងមូល។\n\n4. អូសឡើងលើ បន្ទាប់មកប៉ះរូបតំណាងខ្ទាស់។"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"នៅពេលបើកការកំណត់នេះ អ្នកអាចប្រើការភ្ជាប់អេក្រង់បានដើម្បីរក្សាទិដ្ឋភាពអេក្រង់បច្ចុប្បន្នរហូតដល់អ្នកលែងភ្ជាប់វា។\n\nដើម្បីប្រើការភ្ជាប់អេក្រង់៖\n\n1. ត្រូវប្រាកដថាមុខងារភ្ជាប់អេក្រង់ត្រូវបានបើក។\n\n2. បើកអេក្រង់ដែលអ្នកចង់ភ្ជាប់។\n\n3. ប៉ះដើម្បីមើលទាំងមូល។\n\n4. អូសឡើងលើ បន្ទាប់មកប៉ះរូបម្ជុល។"</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"សួរ​រក​លំនាំ​ដោះ​សោ​មុន​ពេល​ផ្ដាច់"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"សួរ​រក​កូដ PIN មុន​ពេល​ផ្ដាច់"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"សួរ​រក​ពាក្យ​សម្ងាត់​មុន​ពេល​ផ្ដាច់"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ស្ថិត​នៅ​ក្នុង​​ទិស​ដៅ​​បច្ចុប្បន្ន"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"សុវត្ថិភាពពេលចាប់ផ្តើម"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"បន្ត"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"អ្នក​អាច​ការពារ​ឧបករណ៍​នេះ​បន្ថែម​ទៀត​ដោយ​ទាមទារ​​កូដ PIN ​​របស់​អ្នក​មុន​ពេល​​ចាប់ផ្ដើម។ ប្រសិនបើ​​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅ, សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា សំឡេងរោទ៍​បានទេ។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​គេ​លួច។"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"អ្នក​អាច​ការពារ​ឧបករណ៍​នេះ​បន្ថែម​ទៀត​ដោយ​ទាមទារ​​លំនាំ​​របស់​អ្នក​មុន​ពេល​​ចាប់ផ្ដើម។ ប្រសិនបើ​​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅ, សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា សំឡេងរោទ៍​បានទេ។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​គេ​លួច។"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"អ្នក​អាច​ការពារ​ឧបករណ៍​នេះ​បន្ថែម​ទៀត​ដោយ​ទាមទារ​​ពាក្យ​សម្ងាត់​​របស់​អ្នក​មុន​ពេល​​ចាប់ផ្ដើម។ ប្រសិនបើ​​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅ, សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា សំឡេងរោទ៍​បានទេ។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​គេ​លួច។"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"ក្រៅពីលើការប្រើស្នាមម្រាមដៃដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារ​ឧបករណ៍​នេះ​បន្ថែម​ទៀត​ដោយ​ទាមទារ​​កូដ PIN ​​របស់​អ្នក​មុន​ពេល​​ចាប់ផ្ដើម។ ប្រសិនបើ​​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅ, សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា សំឡេងរោទ៍​បានទេ។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​គេ​លួច។"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"ក្រៅពីលើការប្រើស្នាមម្រាមដៃដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារ​ឧបករណ៍​នេះ​បន្ថែម​ទៀត​ដោយ​ទាមទារ​​លំនាំ​​របស់​អ្នក​មុន​ពេល​​ចាប់ផ្ដើម។ ប្រសិនបើ​​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅ, សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា សំឡេងរោទ៍​បានទេ។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​គេ​លួច។"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"ក្រៅពីលើការប្រើស្នាមម្រាមដៃដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារ​ឧបករណ៍​នេះ​បន្ថែម​ទៀត​ដោយ​ទាមទារ​​ពាក្យសម្ងាត់​​របស់​អ្នក​មុន​ពេល​​ចាប់ផ្ដើម។ ប្រសិនបើ​​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅ, សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា សំឡេងរោទ៍​បានទេ។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​គេ​លួច។"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"ទាមទារ​កូដ PIN ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"ទាមទារ​លំនាំ​ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"ទាមទារ​ពាក្យ​សម្ងាត់​ដើម្បី​ចាប់ផ្ដើម​ឧបករណ៍"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"ទេ អរគុណ"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"ទេ អរគុណ"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"ទេ អរគុណ"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំណត់​ឲ្យ​ប្រើ​កូដ PIN មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។ \n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ កំណត់​ឲ្យ​ប្រើកូដ PIN ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំណត់​ឲ្យ​ប្រើ​លំនាំ​របស់អ្នក​មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។ \n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ កំណង់​ឲ្យ​ប្រើលំនាំ​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"អ្នកអាច​ការពារឧបករណ៍​នេះ​បន្ថែម ដោយតម្រូវឲ្យប្រើពាក្យសម្ងាត់របស់អ្នកមុនពេលដែលវាចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។ \n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ តម្រូវ​ឲ្យ​ប្រើ​ពាក្យសម្ងាត់​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ក្រៅពីប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំនត់​ឲ្យ​ប្រើកូដ PIN មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។\n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ កំណត់​ឲ្យ​ប្រើកូដ PIN ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ក្រៅពីប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំណត់​ឲ្យ​ប្រើ​លំនាំ​មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។\n\nវាជួយការពារទិន្នន័យនៅលើឧបករណ៍​ដែល​បាត់ ឬ​ត្រូវគេលួច។ កំណត់​ឲ្យ​មាន​ប្រើលំនាំ​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ក្រៅពីប្រើម្រាមដៃរបស់អ្នកដើម្បីដោះសោឧបករណ៍របស់អ្នក អ្នក​អាច​ការពារឧបករណ៍នេះ​បន្ថែម ដោយ​កំណត់​ឲ្យ​ប្រើ​ពាក្យ​សម្ងាត់​មុន​ពេល​ដែល​វា​ចាប់ផ្តើម។ ប្រសិនបើ​ឧបករណ៍​មិនទាន់​ចាប់ផ្ដើមទេ វា​មិន​អាច​ទទួល​ការ​​ហៅទូរសព្ទ សារ ឬ​ការ​ជូនដំណឹងក៏ដូចជា ម៉ោងរោទ៍​បានទេ។ \n\nវា​ជួយ​ការពារ​ទិន្នន័យ​នៅ​ពេល​ឧបករណ៍​បាត់ ឬ​ត្រូវគេ​លួច។ កំណត់​ឲ្យ​ប្រើ​ពាក្យសម្ងាត់​ដើម្បីចាប់ផ្តើមឧបករណ៍របស់អ្នក&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"បាទ/ចាស"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"ទេ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ទាមទារ​កូដ PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ទាមទារ​លំនាំ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ទាមទារ​ពាក្យ​សម្ងាត់​?"</string>
@@ -3044,7 +3041,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"កម្រិតខ្ពស់"</string>
     <string name="configure_apps" msgid="6685680790825882528">"កំណត់រចនាសម្ព័ន្ធកម្មវិធី"</string>
     <string name="unknown_app" msgid="5275921288718717656">"កម្មវិធីមិនស្គាល់"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"សិទ្ធិ​កម្មវិធី"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"ការអនុញ្ញាតកម្មវិធី"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"កម្មវិធីកំពុងប្រើ <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"ប៉ះដើម្បីដាស់"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"ប៉ះកន្លែងណាមួយនៅលើអេក្រង់ពីរដងដើម្បីដាស់ឧបករណ៍ឲ្យភ្ញាក់"</string>
@@ -3072,7 +3069,7 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"ជ្រើសការបញ្ចូលសំឡេង"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"កម្មវិធីរុករក"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"គ្មានកម្មវិធីលំនាំដើមទេ"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"កម្មវិធីទូរស័ព្ទ"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"កម្មវិធីទូរសព្ទ"</string>
     <string name="default_app" msgid="6864503001385843060">"(លំនាំដើម)"</string>
     <string name="system_app" msgid="9068313769550747372">"(ប្រព័ន្ធ)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(លំនាំដើមប្រព័ន្ធ)"</string>
@@ -3093,7 +3090,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ការបង្កើនប្រសិទ្ធភាពថ្ម"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"ការជូនដំណឹង​អំពី​ការប្រើប្រាស់"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"ការ​ដាស់តឿន​លើ​ការ​ប្រើប្រាស់"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"បង្ហាញ​​កម្មវិធី​ទាំងអស់"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"លាក់កម្មវិធី​បន្ថែម​ទៀត"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"មិនបានបង្កើនប្រសិទ្ធភាព"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"បាទ/ចាស"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"ទេ"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"អនុញ្ញាត​ការដំឡើង​កម្មវិធី"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"បាន​អនុញ្ញាត"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"មិន​អនុញ្ញាត​ទេ"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ចុចប៊ូតុងថាមពលពីរដងដើម្បីបើកកាមេរ៉ា"</string>
@@ -3289,7 +3286,7 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"ដើម្បី​អនុវត្ត​ការ​ផ្លាស់ប្តូរ telephony monitor សូម​ចាប់ផ្តើម​ឧបករណ៍​ឡើងវិញ"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"ការអាប់ដេតប្រព័ន្ធដោយស្វ័យប្រវត្តិ"</string>
     <string name="usage" msgid="2977875522080448986">"ការប្រើប្រាស់"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"ការប្រើប្រាស់​ទិន្នន័យ​ចល័ត"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"ការប្រើប្រាស់​ទិន្នន័យ​ទូរសព្ទចល័ត"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"ការប្រើប្រាស់ទិន្នន័យ Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"ការប្រើប្រាស់ទិន្នន័យអ៊ីសឺរណិត"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3307,7 +3304,7 @@
       <item quantity="other">ការដាក់កំហិត <xliff:g id="COUNT">%1$d</xliff:g></item>
       <item quantity="one">ការដាក់កំហិត 1</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"ការគណនាទិន្នន័យរបស់ក្រុមហ៊ុនផ្តល់សេវាទូរស័ព្ទអាចនឹងខុសគ្នាពីការគណនាទិន្នន័យរបស់ឧបករណ៍"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"ការគណនាទិន្នន័យរបស់ក្រុមហ៊ុនបម្រើសេវាទូរសព្ទអាចនឹងខុសគ្នាពីការគណនាទិន្នន័យរបស់ឧបករណ៍"</string>
     <string name="data_used_template" msgid="3245919669966296505">"បានប្រើ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"កំណត់ការព្រមានពីការប្រើប្រាស់ទិន្នន័យ"</string>
     <string name="data_warning" msgid="209133958008062117">"ការព្រមានពីការប្រើទិន្នន័យ"</string>
@@ -3321,7 +3318,7 @@
       <item quantity="one">អនុញ្ញាតឲ្យកម្មវិធី 1 ប្រើទិន្នន័យគ្មានកំណត់ នៅពេលកម្មវិធីសន្សំសំចៃទិន្នន័យបានបើក</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"កម្មវិធីសន្សំសំចៃទិន្នន័យ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ការប្រើទិន្នន័យដែលមិនហាមឃាត់"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ការប្រើទិន្នន័យដែលគ្មានការកំហិត"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"ទិន្នន័យផ្ទៃខាងក្រោយបានបិទ"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"បើក"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"បិទ"</string>
@@ -3390,9 +3387,10 @@
     <string name="developer_smallest_width" msgid="7516950434587313360">"ទទឹងតូចបំផុត"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"មិនមានកម្មវិធីដែលដំឡើងហើយបានស្នើសុំការចូលដំណើរការសេវាកម្ម SMS ពិសេសទេ"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"សេវាកម្ម SMS ពិសេសអាចនឹងគិតថ្លៃ ហើយបន្ថែមតម្លៃនោះទៅក្នុងវិក្កយបត្រក្រុមហ៊ុនផ្តល់សេវាទូរស័ព្ទរបស់អ្នក។ ប្រសិនបើដំណើរការសិទ្ធិអនុញ្ញាតសម្រាប់កម្មវិធីណាមួយ នោះអ្នកនឹងអាចផ្ញើសេវាកម្ម SMS ពិសេសដោយប្រើកម្មវិធីនោះ។"</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"ការចូលដំណើរការសេវាកម្ម SMS ពិសេស"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"ចូលដំណើរការសេវាកម្ម SMS ពិសេស"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"មិនអាចឲ្យឧបករណ៍ផ្សេងមើលឃើញទេ"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"បាន​តភ្ជាប់​ទៅ​"</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>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ទំហំផ្ទុកក្នុងថេប្លេត"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ទំហំផ្ទុក​ក្នុង​ទូរសព្ទ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"បានប្រើអស់នៃទំហំសរុប <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"បានប្រើនៃ <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"បាន​ប្រើប្រាស់"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"ជម្រះកម្មវិធី"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"តើ​អ្នកចង់​ដក​កម្មវិធី​ប្រើភ្លាមៗ​នេះចេញ​មែន​ទេ?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(បានបិទ​សម្រាប់​អ្នក​ប្រើ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"សេវាកម្មបំពេញដោយស្វ័យប្រវត្តិ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ស្វ័យ​ប្រវត្តិ បំពេញ បំពេញ​ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"កំណត់​ឲ្យ <xliff:g id="APP_NAME_0">%1$s</xliff:g> ជា​កម្មវិធី​បំពេញ​ស្វ័យប្រវត្តិ​របស់​អ្នក? <xliff:g id="APP_NAME_1">%1$s</xliff:g> នឹង​អាចអាន​អេក្រង់​របស់អ្នក និង​បំពេញ​ព័ត៌មាន​ក្នុង​កម្មវិធី​ផ្សេង​ទៀត។"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ត្រូវ​ប្រាកដថា​អ្នក​ជឿជាក់​លើ​កម្មវិធី​នេះ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google បំពេញស្វ័យប្រវត្តិ&gt;%1$s&lt;/xliff:g&gt; ប្រើប្រាស់​អ្វី​ដែល​មាននៅ​លើ​អេក្រង់​របស់អ្នក ដើម្បី​កំណត់​អ្វីដែល​អាចបំពេញ​ដោយ​ស្វ័យប្រវត្តិ។"</string>
     <string name="device_theme" msgid="4571803018917608588">"រចនាប័ទ្ម​ឧបករណ៍"</string>
     <string name="default_theme" msgid="7085644992078579076">"លំ​នាំ​ដើម"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"កម្មវិធី​គ្រប់គ្រង​ទំហំផ្ទុក៖ <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 57c7d2b..bcd6f00 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ಯಾವುದೂ ಅಲ್ಲ"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"ಸಿಮ್"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ಯಾವುದೂ ಇಲ್ಲ"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -238,15 +240,15 @@
     <item msgid="4498124044785815005">"ಸಿಸ್ಟಂ ನಿರ್ಧರಿಸಲಿ"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="6358963769537892925">"ಸ್ಥಾನ"</item>
+    <item msgid="6358963769537892925">"ಸ್ಥಳ"</item>
     <item msgid="255608127647030286">"ವೈಯಕ್ತಿಕ"</item>
     <item msgid="4588829735729884491">"ಸಂದೇಶ ಕಳುಹಿಸುವಿಕೆ"</item>
     <item msgid="886742181977884584">"ಮಾಧ್ಯಮ"</item>
     <item msgid="7924928667052300589">"ಸಾಧನ"</item>
   </string-array>
   <string-array name="app_ops_summaries">
-    <item msgid="4979188868761515915">"ಒರಟು ಸ್ಥಾನ"</item>
-    <item msgid="5789673140227507995">"ಉತ್ಕೃಷ್ಟ ಸ್ಥಾನ"</item>
+    <item msgid="4979188868761515915">"ಒರಟು ಸ್ಥಳ"</item>
+    <item msgid="5789673140227507995">"ಉತ್ಕೃಷ್ಟ ಸ್ಥಳ"</item>
     <item msgid="1061584358377390581">"GPS"</item>
     <item msgid="5387405117297558954">"ಕಂಪನ"</item>
     <item msgid="3434165993711230924">"ಓದುವ ಸಂಪರ್ಕಗಳು"</item>
@@ -286,8 +288,8 @@
     <item msgid="785049718065337473">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="6700305533746877052">"ಬ್ಲೂಟೂತ್ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="2029227495214047094">"ಎಚ್ಚರವಹಿಸಿ"</item>
-    <item msgid="26109888160231211">"ಪರಿವೀಕ್ಷಣೆ ಸ್ಥಾನ"</item>
-    <item msgid="5753382310468855812">"ಪರಿವೀಕ್ಷಣೆಯ ಹೆಚ್ಚಿನ ಸಾಮರ್ಥ್ಯದ ಸ್ಥಾನ"</item>
+    <item msgid="26109888160231211">"ಪರಿವೀಕ್ಷಣೆ ಸ್ಥಳ"</item>
+    <item msgid="5753382310468855812">"ಪರಿವೀಕ್ಷಣೆಯ ಹೆಚ್ಚಿನ ಸಾಮರ್ಥ್ಯದ ಸ್ಥಳ"</item>
     <item msgid="3356591542543137332">"ಬಳಕೆ ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆಯಿರಿ"</item>
     <item msgid="3073734345226842233">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
     <item msgid="2111767435887685265">"ಟೋಸ್ಟ್ ತೋರಿಸಿ"</item>
@@ -312,9 +314,9 @@
     <item msgid="2629748510881309577">"ಪ್ರವೇಶಿಸುವಿಕೆ ವಾಲ್ಯೂಮ್‌"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="6602854600289714121">"ಸ್ಥಾನ"</item>
-    <item msgid="8677040780775113033">"ಸ್ಥಾನ"</item>
-    <item msgid="1660743989948992916">"ಸ್ಥಾನ"</item>
+    <item msgid="6602854600289714121">"ಸ್ಥಳ"</item>
+    <item msgid="8677040780775113033">"ಸ್ಥಳ"</item>
+    <item msgid="1660743989948992916">"ಸ್ಥಳ"</item>
     <item msgid="8791172739860195290">"ವೈಬ್ರೇಟ್‌"</item>
     <item msgid="383413555642128046">"ಓದುವ ಸಂಪರ್ಕಗಳು"</item>
     <item msgid="3654594895269697313">"ಸಂಪರ್ಕಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ"</item>
@@ -322,9 +324,9 @@
     <item msgid="6248591205254641116">"ಕರೆಯ ಲಾಗ್‌ ಮಾರ್ಪಡಿಸಿ"</item>
     <item msgid="6093344633066170692">"ಕ್ಯಾಲೆಂಡರ್ ಓದಿ"</item>
     <item msgid="1334886368750347692">"ಕ್ಯಾಲೆಂಡರ್ ಮಾರ್ಪಡಿಸಿ"</item>
-    <item msgid="1638204101698708656">"ಸ್ಥಾನ"</item>
+    <item msgid="1638204101698708656">"ಸ್ಥಳ"</item>
     <item msgid="2154671955760380322">"ಪೋಸ್ಟ್‌ ಅಧಿಸೂಚನೆ"</item>
-    <item msgid="4282477730595931828">"ಸ್ಥಾನ"</item>
+    <item msgid="4282477730595931828">"ಸ್ಥಳ"</item>
     <item msgid="4891423912898525905">"ಫೋನ್‌ ಕರೆ"</item>
     <item msgid="2623604824935968113">"SMS/MMS ಓದಿ"</item>
     <item msgid="4420177125221176306">"SMS/MMS ಬರೆಯಿರಿ"</item>
@@ -353,8 +355,8 @@
     <item msgid="9103719301075748925">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="7025966722295861512">"ಬ್ಲೂಟೂತ್‌‌ ವಾಲ್ಯೂಮ್"</item>
     <item msgid="4665183401128289653">"ಎಚ್ಚರದಿಂದಿರಿಸಿ"</item>
-    <item msgid="8584357129746649222">"ಸ್ಥಾನ"</item>
-    <item msgid="7669257279311110599">"ಸ್ಥಾನ"</item>
+    <item msgid="8584357129746649222">"ಸ್ಥಳ"</item>
+    <item msgid="7669257279311110599">"ಸ್ಥಳ"</item>
     <item msgid="3459320345690097795">"ಬಳಕೆ ಅಂಕಿಅಂಶಗಳನ್ನು ಪಡೆದುಕೊಳ್ಳಿ"</item>
     <item msgid="1312534577834048535">"ಮೈಕ್ರೋಫೋನ್ ಮ್ಯೂಟ್/ಅನ್‌ಮ್ಯೂಟ್ ಮಾಡಿ"</item>
     <item msgid="427580389823724225">"ಟೋಸ್ಟ್ ತೋರಿಸಿ"</item>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 5382ac2..e8d2259 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -19,8 +19,8 @@
     <string name="yes" msgid="4676390750360727396">"ಹೌದು"</string>
     <string name="no" msgid="6731231425810196216">"ಇಲ್ಲ"</string>
     <string name="create" msgid="3578857613172647409">"ರಚಿಸು"</string>
-    <string name="allow" msgid="3349662621170855910">"ಅನುಮತಿಸು"</string>
-    <string name="deny" msgid="6947806159746484865">"ನಿರಾಕರಿಸು"</string>
+    <string name="allow" msgid="3349662621170855910">"ಅನುಮತಿಸಿ"</string>
+    <string name="deny" msgid="6947806159746484865">"ನಿರಾಕರಿಸಿ"</string>
     <string name="dlg_close" msgid="7471087791340790015">"ಮುಚ್ಚು"</string>
     <string name="dlg_switch" msgid="6243971420240639064">"ಸ್ವಿಚ್"</string>
     <string name="device_info_default" msgid="7847265875578739287">"ಅಪರಿಚಿತ"</string>
@@ -74,11 +74,11 @@
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
     <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"USB ಸಂಗ್ರಹಣೆ ಅಳವಡಿಕೆ ತೆಗೆಯಿರಿ"</string>
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"SD ಕಾರ್ಡ್ ಅನ್‌ಮೌಂಟ್‌ ಮಾಡಿ"</string>
-    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸು"</string>
-    <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD ಕಾರ್ಡ್‌ ಅನ್ನು ಅಳಿಸು"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಿ"</string>
+    <string name="sdcard_format" product="default" msgid="6713185532039187532">"SD ಕಾರ್ಡ್‌ ಅನ್ನು ಅಳಿಸಿ"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"ಪೂರ್ವವೀಕ್ಷಿಸಿ, ಪುಟ <xliff:g id="NUM_PAGES">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="CURRENT_PAGE">%1$d</xliff:g>"</string>
-    <string name="font_size_summary" msgid="1690992332887488183">"ಪರದೆಯ ಮೇಲೆ ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ."</string>
+    <string name="font_size_summary" msgid="1690992332887488183">"ಪರದೆಯ ಮೇಲೆ ಪಠ್ಯದ ಗಾತ್ರವನ್ನು ಹಿಗ್ಗಿಸಿ ಅಥವಾ ಕುಗ್ಗಿಸಿ."</string>
     <string name="font_size_make_smaller_desc" msgid="7919995133365371569">"ಚಿಕ್ಕದಾಗಿಸು"</string>
     <string name="font_size_make_larger_desc" msgid="4316986572233686061">"ದೊಡ್ಡದಾಗಿಸು"</string>
     <!-- no translation found for font_size_preview_text (4818424565068376732) -->
@@ -284,7 +284,7 @@
     <string name="roaming_enable" msgid="3737380951525303961">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಡೇಟಾ ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಪಡಿಸು"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"ರೋಮಿಂಗ್‌ನಲ್ಲಿರುವಾಗ ಡೇಟಾ ಸೇವೆಗಳಿಗೆ ಸಂಪರ್ಕಪಡಿಸಿ"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"ಡೇಟಾ ರೋಮಿಂಗ್ ಆಫ್‌ ಮಾಡಿದ ಸ್ಥಿತಿಯಲ್ಲಿ ನೀವು ನಿಮ್ಮ ಮುಖಪುಟ‌ ನೆಟ್‌ವರ್ಕ್‌ ಅನ್ನು ಇರಿಸಿರುವ ಕಾರಣ ನೀವು ಡೇಟಾ ಸಂಪರ್ಕ ಕಲ್ಪಿಸುವಿಕೆಯನ್ನು ಕಳೆದುಕೊಂಡಿರುವಿರಿ."</string>
-    <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"ಇದನ್ನು ಆನ್ ಮಾಡು"</string>
+    <string name="roaming_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>
@@ -327,22 +327,21 @@
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"ಲಾಕ್‌ ಪರದೆಯಲ್ಲಿ ಪ್ರೊಫೈಲ್‌ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸು"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"ಪ್ರೊಫೈಲ್‌‌ ಮಾಹಿತಿ"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ಖಾತೆಗಳು"</string>
-    <string name="location_settings_title" msgid="1369675479310751735">"ಸ್ಥಾನ"</string>
+    <string name="location_settings_title" msgid="1369675479310751735">"ಸ್ಥಳ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ಖಾತೆಗಳು"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"ಭದ್ರತೆ ಮತ್ತು ಸ್ಥಳ"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ಎನ್‌ಕ್ರಿಪ್ಶನ್ ಮತ್ತು ರುಜುವಾತುಗಳು"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"ಲಾಕ್ ಪರದೆ ಆದ್ಯತೆಗಳು"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ನನ್ನ ಸ್ಥಾನ, ಪರದೆ ಅನ್‌ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ಫೋನ್ ಎನ್‌ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"ಲಾಕ್ ಸ್ಕ್ರೀನ್‌ ಆದ್ಯತೆಗಳು"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"ನನ್ನ ಸ್ಥಳ, ಪರದೆ ಅನ್‌ಲಾಕ್, ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ನನ್ನ ಸ್ಥಳ, ಪರದೆ ಅನ್‌ಲಾಕ್, ರುಜುವಾತು ಸಂಗ್ರಹಣೆ ಲಾಕ್ ಅನ್ನು ಹೊಂದಿಸಿ"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ಗೌಪ್ಯತೆ"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ನಿರ್ವಾಹಕರು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ್ದಾರೆ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ಭದ್ರತೆ ಸ್ಥಿತಿ"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"ಬೆರಳಚ್ಚು ನಿರ್ವ."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ಬೆರಳಚ್ಚು ಬಳಸಿ"</string>
@@ -527,7 +526,7 @@
     <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"ನೀವು ಈ ಪ್ರಯತ್ನದಲ್ಲಿ ಕೆಲಸದ ಪಿನ್‌ ಅನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
     <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"ನೀವು ಈ ಪ್ರಯತ್ನದಲ್ಲಿ ಕೆಲಸದ ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ತಪ್ಪಾಗಿ ನಮೂದಿಸಿದರೆ, ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
     <string name="lock_profile_wipe_content" msgid="2150455386921347628">"ಹಲವಾರು ತಪ್ಪಾದ ಪ್ರಯತ್ನಗಳು. ನಿಮ್ಮ ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಮತ್ತು ಸಂಬಂಧಿಸಿದ ಡೇಟಾವನ್ನು ಈ ಸಾಧನದಿಂದ ತೆಗೆದುಹಾಕಲಾಗುತ್ತದೆ."</string>
-    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ವಜಾಗೊಳಿಸು"</string>
+    <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"ವಜಾಗೊಳಿಸಿ"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"ಕನಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಕ್ಯಾರೆಕ್ಟರ್‌ಗಳನ್ನು ಹೊಂದಿರಬೇಕು"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"ಪಿನ್ ಕನಿಷ್ಠ <xliff:g id="COUNT">%d</xliff:g> ಅಂಕಿಗಳನ್ನು ಹೊಂದಿರಬೇಕು"</string>
     <string name="lockpassword_continue_label" msgid="4602203784934526940">"ಮುಂದುವರಿಸು"</string>
@@ -584,7 +583,7 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ಸಕ್ರಿಯ ವಿಶ್ವಾಸಾರ್ಹ ಏಜೆಂಟ್‌ಗಳು</item>
     </plurals>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ಬ್ಲೂಟೂತ್‌‌"</string>
-    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ಬ್ಲೂಟೂತ್‌‌ ಅನ್ನು ಆನ್ ಮಾಡು"</string>
+    <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ಬ್ಲೂಟೂತ್‌‌ ಅನ್ನು ಆನ್‌ ಮಾಡಿ"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_settings_title" msgid="1908745291161353016">"ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_settings_summary" msgid="2091062709530570462">"ಸಂಪರ್ಕಗಳನ್ನು ನಿರ್ವಹಿಸಿ, ಸಾಧನದ ಹೆಸರು &amp; ಅನ್ವೇಷಣೆಯಾಗುವಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -627,7 +626,7 @@
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"ಸುಧಾರಿತ"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"ಸುಧಾರಿತ ಬ್ಲೂಟೂತ್‌‌"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"ಬ್ಲೂಟೂತ್‌‌ ಆನ್‌ ಮಾಡಿದಾಗ, ನಿಮ್ಮ ಸಾಧನವು ಇತರ ಸಮೀಪದ ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಗಳ ಜೊತೆಗೆ ಸಂವಹನ ಮಾಡಬಹುದು."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಲು, ಸಿಸ್ಟಮ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಈಗಲೂ ಬ್ಲೂಟೂತ್‌ ಸಾಧನಗಳನ್ನು ಪತ್ತೆ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ಸ್ಕ್ಯಾನ್‌ ಮಾಡುವಿಕೆ ಸೆಟ್ಟಿಂಗ್‌ಗಳು<xliff:g id="LINK_END_1">LINK_END</xliff:g> ನಲ್ಲಿ ಬದಲಾಯಿಸಬಹುದು."</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_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>
@@ -640,7 +639,7 @@
     <string name="bluetooth_device_advanced_online_mode_summary" msgid="1204424107263248336">"ಬ್ಲೂಟೂತ್‌‌ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಪಡಿಸಿ"</string>
     <string name="bluetooth_device_advanced_profile_header_title" msgid="102745381968579605">"ಇದಕ್ಕೆ ಬಳಸಿ"</string>
     <string name="bluetooth_device_advanced_rename_device" msgid="5148578059584955791">"ಮರುಹೆಸರಿಸು"</string>
-    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"ಒಳಬರುವ ಫೈಲ್‌ ವರ್ಗಾವಣೆಗಳನ್ನು ಅನುಮತಿಸು"</string>
+    <string name="bluetooth_device_advanced_enable_opp_title" msgid="8222550640371627365">"ಒಳಬರುವ ಫೈಲ್‌ ವರ್ಗಾವಣೆಗಳನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶಕ್ಕಾಗಿ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string>
     <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"ಸಾಧನದ ಜೊತೆಗೆ ಸ್ಥಳೀಯ ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ"</string>
     <string name="bluetooth_dock_settings" msgid="3218335822716052885">"ಡಾಕ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
@@ -656,7 +655,7 @@
     <string name="wifi_display_status_in_use" msgid="8556830875615434792">"ಬಳಕೆಯಲ್ಲಿದೆ"</string>
     <string name="wifi_display_status_not_available" msgid="5714978725794210102">"ಲಭ್ಯವಿಲ್ಲ"</string>
     <string name="wifi_display_details" msgid="7791118209992162698">"ಪ್ರದರ್ಶನ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
-    <string name="wifi_display_options_title" msgid="5740656401635054838">"ವೈರ್‌ಲೆಸ್ ಪ್ರದರ್ಶನ ಆಯ್ಕೆಗಳು"</string>
+    <string name="wifi_display_options_title" msgid="5740656401635054838">"ವೈರ್‌ಲೆಸ್ ಡಿಸ್‌ಪ್ಲೇ ಆಯ್ಕೆಗಳು"</string>
     <string name="wifi_display_options_forget" msgid="9119048225398894580">"ಮರೆತುಬಿಡಿ"</string>
     <string name="wifi_display_options_done" msgid="5703116500357822557">"ಮುಗಿದಿದೆ"</string>
     <string name="wifi_display_options_name" msgid="4756080222307467898">"ಹೆಸರು"</string>
@@ -667,7 +666,7 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"ವೈ-ಫೈ ಆಫ್ ಮಾಡಲು <xliff:g id="REQUESTER">%s</xliff:g> ಬಯಸುತ್ತದೆ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</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_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>
@@ -675,7 +674,7 @@
     <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>
-    <string name="android_beam_explained" msgid="1810540319385192758">"ಈ ವೈಶಿಷ್ಟ್ಯವು ಆನ್‌ ಆಗಿರುವಾಗ, ಸಾಧನಗಳನ್ನು ಒಟ್ಟಾಗಿ ಹತ್ತಿರದಲ್ಲಿ ಹಿಡಿಯುವ ಮೂಲಕ ಮತ್ತೊಂದು NFC-ಸಾಮರ್ಥ್ಯದ ಸಾಧನಕ್ಕೆ ಅಪ್ಲಿಕೇಶನ್ ವಿಷಯವನ್ನು ಬೀಮ್ ಮಾಡಬಹುದು. ಉದಾಹರಣೆಗೆ, ಬ್ರೌಸರ್ ಪುಟಗಳು, YouTube ವೀಡಿಯೊಗಳು, ಸಂಪರ್ಕಗಳು ಮತ್ತು ಇನ್ನೂ ಹಲವನ್ನು ನೀವು ಬೀಮ್ ಮಾಡಬಹುದು.\n\nಕೇವಲ ಸಾಧನಗಳನ್ನು ಒಟ್ಟಾಗಿ ತನ್ನಿ (ಸಾಮಾನ್ಯವಾಗಿ ಹಿಮ್ಮುಖವಾಗಿ) ನಂತರ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ. ಯಾವುದನ್ನು ಬೀಮ್ ಮಾಡಲಾಗುತ್ತದೆ ಎಂಬುದನ್ನು ಅಪ್ಲಿಕೇಶನ್ ನಿರ್ಧರಿಸುತ್ತದೆ."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"ಈ ವೈಶಿಷ್ಟ್ಯವು ಆನ್‌ ಆಗಿರುವಾಗ, ಸಾಧನಗಳನ್ನು ಒಂದಕ್ಕೊಂದು ಹತ್ತಿರ ತರುವ ಮೂಲಕ ಮತ್ತೊಂದು NFC-ಸಾಮರ್ಥ್ಯದ ಸಾಧನಕ್ಕೆ ಅಪ್ಲಿಕೇಶನ್ ವಿಷಯವನ್ನು ಬೀಮ್ ಮಾಡಬಹುದು. ಉದಾಹರಣೆಗೆ, ವೆಬ್‌ ಪುಟಗಳು, YouTube ವೀಡಿಯೊಗಳು, ಜನರ ಸಂಪರ್ಕಗಳು ಮತ್ತು ಇನ್ನೂ ಹಲವನ್ನು ನೀವು ಬೀಮ್ ಮಾಡಬಹುದು.\n\n ಸಾಧನಗಳನ್ನು ಹತ್ತಿರ ತನ್ನಿ ಸಾಕು (ಹಿಮ್ಮುಖವಾಗಿ), ನಂತರ ನಿಮ್ಮ ಪರದೆಯನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ. ಯಾವುದನ್ನು ಬೀಮ್ ಮಾಡಬೇಕು ಎಂಬುದನ್ನು ಅಪ್ಲಿಕೇಶನ್ ನಿರ್ಧರಿಸುತ್ತದೆ."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi ಆನ್‌ ಮಾಡಿ"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -692,13 +691,14 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"ಅಧಿಕ-ಗುಣಮಟ್ಟದ ಸಾರ್ವಜನಿಕ ನೆಟ್‌ವರ್ಕ್ ಲಭ್ಯವಿರುವಾಗ ಸೂಚನೆ ನೀಡಿ"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"ವೈ-ಫೈ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಮಾಡಿ"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"ಉಳಿಸಿರುವ ಅಧಿಕ-ಗುಣಮಟ್ಟದ ನೆಟ್‌ವರ್ಕ್‌ಗಳ ಸಮೀಪದಲ್ಲಿರುವಾಗ, ಉದಾಹರಣೆಗೆ ನಿಮ್ಮ ಮನೆಯ ನೆಟ್‌ವರ್ಕ್‌ನಲ್ಲಿ ವೈ-ಫೈ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್ ಆಫ್ ಆಗಿರುವ ಕಾರಣ ಇದು ಲಭ್ಯವಿಲ್ಲ"</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="wifi_install_credentials" msgid="3551143317298272860">"ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸ್ಥಾಪಿಸು"</string>
-    <string name="wifi_scan_notify_text" msgid="5593805423071186757">"ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಲು, ಸಿಸ್ಟಮ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಇನ್ನೂ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ಕ್ಯಾನ್ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು <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" msgid="5593805423071186757">"ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಲು, ಸಿಸ್ಟಂ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಸೇವೆಗಳು ಇನ್ನೂ ವೈ-ಫೈ ನೆಟ್‌ವರ್ಕ್‌ಗಳಿಗೆ ಸ್ಕ್ಯಾನ್ ಮಾಡಬಹುದು. ನೀವು ಇದನ್ನು <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">"ಸ್ಥಳದ ನಿಖರತೆಯನ್ನು ಸುಧಾರಿಸಲು <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>ಸ್ಕ್ಯಾನಿಂಗ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳಲ್ಲಿ<xliff:g id="LINK_END_1">LINK_END</xliff:g> ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್ ಆನ್ ಮಾಡಿ."</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"ಮತ್ತೊಮ್ಮೆ ತೋರಿಸಬೇಡ"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"ಸ್ಲೀಪ್‌ ಮೋಡ್‌ನಲ್ಲಿ Wi‑Fi ಆನ್‌ ಇರಿಸು"</string>
@@ -775,7 +775,7 @@
     <string name="wifi_unchanged" msgid="3410422020930397102">"(ಬದಲಾವಣೆಯಾಗದ)"</string>
     <string name="wifi_unspecified" msgid="4917316464723064807">"ದಯವಿಟ್ಟು ಆಯ್ಕೆಮಾಡಿ"</string>
     <string name="wifi_multiple_cert_added" msgid="3240743501460165224">"(ಬಹು ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ)"</string>
-    <string name="wifi_use_system_certs" msgid="5270879895056893783">"ಸಿಸ್ಟಮ್ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಬಳಸಿ"</string>
+    <string name="wifi_use_system_certs" msgid="5270879895056893783">"ಸಿಸ್ಟಂ ಪ್ರಮಾಣಪತ್ರಗಳನ್ನು ಬಳಸಿ"</string>
     <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>
@@ -785,8 +785,8 @@
     <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ನಿಮ್ಮ ನೆಟ್‌ವರ್ಕ್‌ ಪಾಸ್‌ವರ್ಡ್‌ ನಮೂದಿಸಿ"</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>
-    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ನಿರಾಕರಿಸು"</string>
+    <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ಅನುಮತಿಸಿ"</string>
+    <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"ನಿರಾಕರಿಸಿ"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"ಸಂಪರ್ಕಪಡಿಸಲು ಸೈನ್‌ ಇನ್‌ ಮಾಡುವುದೇ?"</string>
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"ನೀವು ನೆಟ್‌ವರ್ಕ್‌ಗೆ ಸಂಪರ್ಕಿಸುವ ಮೊದಲು ಆನ್‌ಲೈನ್‌ನಲ್ಲಿ ಸೈನ್‌ ಇನ್‌ ಮಾಡಲು ನಿಮಗೆ <xliff:g id="APP_NAME">%1$s</xliff:g> ಅಗತ್ಯವಿರುತ್ತದೆ."</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"ಸಂಪರ್ಕಿಸಿ"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"ವೈ-ಫೈ ಕಾನ್ಫಿಗರ್‌ ಮಾಡಿ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC ವಿಳಾಸ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ವಿಳಾಸ"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ಸಬ್‌ನೆಟ್‌ ಮಾಸ್ಕ್‌"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ವಿಳಾಸಗಳು"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"ಉಳಿಸಿದ ನೆಟ್‌ವರ್ಕ್‌"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"ಈ ಬಳಕೆದಾರರಿಗೆ ವೈ ಫೈ ಸುಧಾರಿತ ಸೆಟ್ಟಿಂಗ್‌ಗಳು ಲಭ್ಯವಿಲ್ಲ"</string>
@@ -919,9 +917,9 @@
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ಡಯಲ್ ಪ್ಯಾಡ್ ಸ್ಪರ್ಶಿಸುವ ಟೋನ್‌ಗಳು"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"ಧ್ವನಿಗಳನ್ನು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"ಪರದೆಯ ಲಾಕ್ ಶಬ್ದ"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ಕಂಪಿಸು"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ವೈಬ್ರೇಟ್‌ ಆಗು"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"ಗದ್ದಲ ನಿವಾರಣೆ"</string>
-    <string name="volume_media_description" msgid="7949355934788807863">"ಸಂಗೀತ, ವೀಡಿಯೊ, ಆಟಗಳು, &amp; ಇತರ ಮಾಧ್ಯಮ"</string>
+    <string name="volume_media_description" msgid="7949355934788807863">"ಸಂಗೀತ, ವೀಡಿಯೊ, ಗೇಮ್‌ಗಳು, &amp; ಇತರ ಮಾಧ್ಯಮ"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"ರಿಂಗ್‌ಟೋನ್‌‌ &amp; ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="volume_notification_description" msgid="5810902320215328321">"ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="volume_alarm_description" msgid="8322615148532654841">"ಅಲಾರಮ್‌ಗಳು"</string>
@@ -962,8 +960,8 @@
     <string name="brightness" msgid="8480105032417444275">"ಪ್ರಖರತೆಯ ಮಟ್ಟ"</string>
     <string name="brightness_title" msgid="5746272622112982836">"ಪ್ರಖರತೆ"</string>
     <string name="brightness_summary" msgid="838917350127550703">"ಪರದೆಯ ಪ್ರಖರತೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"ಹೊಂದಾಣಿಕೆಯ ಪ್ರಖರತೆ"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"ಲಭ್ಯವಿರುವ ಬೆಳಕಿನ ಪ್ರಖರತೆಯ ಮಟ್ಟವನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡು"</string>
+    <string name="auto_brightness_title" msgid="6341042882350279391">"ಅಡಾಪ್ಟಿವ್‌ ಪ್ರಖರತೆ"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"ಲಭ್ಯವಿರುವ ಬೆಳಕಿನ ಪ್ರಖರತೆಯ ಮಟ್ಟವನ್ನು ಆಪ್ಟಿಮೈಸ್ ಮಾಡಿ"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"ಆಫ್"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"ಆದ್ಯತೆಯ ಹೊಳಪಿನ ಮಟ್ಟವನ್ನು ಅತಿ ಕಡಿಮೆ ಎಂದು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"ಆದ್ಯತೆಯ ಹೊಳಪಿನ ಮಟ್ಟವನ್ನು ಕಡಿಮೆ ಎಂದು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ಆಫ್"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ಫೋನ್‌ ಡಾಕ್‌ ಆದಾಗ ಮತ್ತು/ಅಥವಾ ನಿದ್ದೆ ಮೋಡ್‌ನಲ್ಲಿರುವಾಗ ಏನಾಗುತ್ತದೆ ಎಂಬುದನ್ನು ನಿಯಂತ್ರಿಸಲು ಸ್ಕ್ರೀನ್ ಸೇವರ್ ಆನ್‌ ಮಾಡಿ."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ಯಾವಾಗ ಪ್ರಾರಂಭಿಸಬೇಕು"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"ಪ್ರಸ್ತುತ ಸ್ಕ್ರೀನ್ ಸೇವರ್"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ಈಗ ಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ಸ್ವಯಂಚಾಲಿತ ಪ್ರಖರತೆ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ಎಬ್ಬಿಸಲು ಎತ್ತಿರಿ"</string>
-    <string name="doze_title" msgid="5389406335828323273">"ಒಳಬರುವ ಅಧಿಸೂಚನೆ ಪರದೆ"</string>
+    <string name="doze_title" msgid="2259176504273878294">"ಆವರಿಸಿದ ಪರದೆ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ಅಧಿಸೂಚನೆಗಳನ್ನು ನೀವು ಸ್ವೀಕರಿಸಿದಾಗ ಪರದೆಯನ್ನು ಎಚ್ಚರಗೊಳಿಸಿ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ಫಾಂಟ್ ಗಾತ್ರ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ಪಠ್ಯವನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದು ಮಾಡಿ"</string>
@@ -1132,8 +1129,8 @@
     <string name="sd_mount" product="default" msgid="5940523765187704135">"SD ಕಾರ್ಡ್‌ ಅನ್ನು ಅಳವಡಿಸಿ"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
-    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸು"</string>
-    <string name="sd_format" product="default" msgid="2576054280507119870">"SD ಕಾರ್ಡ್‌ ಅಳಿಸು"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಿ"</string>
+    <string name="sd_format" product="default" msgid="2576054280507119870">"SD ಕಾರ್ಡ್‌ ಅಳಿಸಿ"</string>
     <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"ಆಂತರಿಕ USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ ಸಂಗೀತ ಮತ್ತು ಫೋಟೋದಂಥ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"SD ಕಾರ್ಡ್‌ನಲ್ಲಿರುವ ಸಂಗೀತ ಮತ್ತು ಫೋಟೋಗಳಂತಹ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"ಸಂಗ್ರಹಿಸಿದ ಡೇಟಾವನ್ನು ತೆರುವುಗೊಳಿಸುವುದೇ?"</string>
@@ -1215,7 +1212,7 @@
     <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"ಅದನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದಕ್ಕೆ <xliff:g id="NAME_0">^1</xliff:g> ಗೆ ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವ ಅಗತ್ಯವಿದೆ. \n\nಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಿದ ನಂತರ, ಈ ಸಾಧನದಲ್ಲಿ ಮಾತ್ರ <xliff:g id="NAME_1">^1</xliff:g> ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ. \n\n"<b>"ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡುವುದು <xliff:g id="NAME_2">^1</xliff:g> ದಲ್ಲಿ ಪ್ರಸ್ತುತ ಸಂಗ್ರಹಿಸಲಾಗಿರುವ ಎಲ್ಲಾ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ."</b>" ಡೇಟಾವನ್ನು ನಷ್ಟವಾಗುವುದನ್ನು ತಪ್ಪಿಸಲು, ಅದನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಲು ಪರಿಗಣಿಸಿ."</string>
     <string name="storage_wizard_format_confirm_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">"ಅಳಿಸು &amp; ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡು"</string>
+    <string name="storage_wizard_format_confirm_next" msgid="2774557300531702572">"ಅಳಿಸಿ &amp; ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡು"</string>
     <string name="storage_wizard_format_progress_title" msgid="6487352396450582292">"<xliff:g id="NAME">^1</xliff:g> ಅನ್ನು ಫಾರ್ಮ್ಯಾಟ್ ಮಾಡಲಾಗುತ್ತಿದೆ…"</string>
     <string name="storage_wizard_format_progress_body" msgid="4445041233802828430">"<xliff:g id="NAME">^1</xliff:g> ಫಾರ್ಮ್ಯಾಟ್ ಆಗುತ್ತಿರುವಾಗ ಅದನ್ನು ಹೊರತೆಗೆಯಬೇಡಿ."</string>
     <string name="storage_wizard_migrate_title" msgid="1363078147938160407">"ಡೇಟಾವನ್ನು ಹೊಸ ಸಂಗ್ರಹಣೆಗೆ ಸರಿಸಿ"</string>
@@ -1267,7 +1264,7 @@
     <string name="bearer" msgid="594270280031923558">"ಬೇರರ್"</string>
     <string name="mvno_type" msgid="2543253857818336421">"MVNO ಪ್ರಕಾರ"</string>
     <string name="mvno_match_data" msgid="4560671695220540466">"MVNO ಮೌಲ್ಯ"</string>
-    <string name="menu_delete" msgid="6981294422841124659">"APN ಅಳಿಸು"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"APN ಅಳಿಸಿ"</string>
     <string name="menu_new" msgid="3014205883303921729">"ಹೊಸ APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"ಉಳಿಸು"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"ತ್ಯಜಿಸು"</string>
@@ -1280,14 +1277,14 @@
     <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_network_title" msgid="4557113742173895074">"ನೆಟ್‌ವರ್ಕ್‌ ಸೆಟ್ಟಿಂಗ್‌ ಮರುಹೊಂದಿಕೆ"</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>
     <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="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>
@@ -1301,14 +1298,14 @@
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"ಸಂಗೀತ"</li>\n<li>"ಫೋಟೋಗಳು"</li>\n<li>"ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾ"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಇತರ ಬಳಕೆದಾರರ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"USB ಸಂಗ್ರಹಣೆಯನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"ಸಂಗೀತ, ಚಿತ್ರಗಳು, ಮತ್ತು ಬಳಕೆದಾರರ ಇತರೆ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು, "<b>"SD ಕಾರ್ಡ್‌ ಅನ್ನು"</b>" ಅಳಿಸಬೇಕಾಗುತ್ತದೆ."</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸು"</string>
-    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ಕಾರ್ಡ್‌ ಅಳಿಸು"</string>
-    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ಆಂತರಿಕ USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ ಸಂಗೀತ ಅಥವಾ ಫೋಟೋಗಳಂಥ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸು"</string>
-    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ಸಂಗೀತ ಫೋಟೋಗಳನ್ನು ಒಳಗೊಂಡಂತೆ SD ಕಾರ್ಡ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸು"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"USB ಸಂಗ್ರಹಣೆಯನ್ನು ಅಳಿಸಿ"</string>
+    <string name="erase_external_storage" product="default" msgid="1397239046334307625">"SD ಕಾರ್ಡ್‌ ಅಳಿಸಿ"</string>
+    <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"ಆಂತರಿಕ USB ಸಂಗ್ರಹಣೆಯಲ್ಲಿರುವ ಸಂಗೀತ ಅಥವಾ ಫೋಟೋಗಳಂಥ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
+    <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"ಸಂಗೀತ ಫೋಟೋಗಳನ್ನು ಒಳಗೊಂಡಂತೆ SD ಕಾರ್ಡ್‌ನಲ್ಲಿರುವ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿ"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"ಟ್ಯಾಬ್ಲೆಟ್ ಅನ್ನು ಮರುಹೊಂದಿಸು"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"ಫೋನ್‌ ಮರುಹೊಂದಿಸು"</string>
     <string name="master_clear_final_desc" msgid="7318683914280403086">"ನಿಮ್ಮ ಎಲ್ಲ ವೈಯಕ್ತಿಕ ಮಾಹಿತಿ ಮತ್ತು ಡೌನ್‌ಲೋಡ್ ಮಾಡಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಅಳಿಸಬೇಕೇ? ನೀವು ಈ ಕ್ರಿಯೆಯನ್ನು ರದ್ದುಗೊಳಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
-    <string name="master_clear_final_button_text" msgid="5390908019019242910">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸು"</string>
+    <string name="master_clear_final_button_text" msgid="5390908019019242910">"ಎಲ್ಲವನ್ನೂ ಅಳಿಸಿ"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"ಸಿಸ್ಟಂ ತೆರವುಗೊಳಿಸುವ ಸೇವೆಯು ಲಭ್ಯವಿಲ್ಲದಿರುವ ಕಾರಣ ಮರುಹೊಂದಿಸುವಿಕೆಯನ್ನು ನಿರ್ವಹಿಸಲಾಗಲಿಲ್ಲ."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"ಮರುಹೊಂದಿಸುವುದೇ?"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"ಈ ಬಳಕೆದಾರರಿಗೆ ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಕೆ ಲಭ್ಯವಿಲ್ಲ"</string>
@@ -1363,13 +1360,13 @@
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> ಯಾವುದೇ ತಿಳಿದಿರುವ ಪೂರೈಕೆಯ ವೆಬ್‌ಸೈಟ್‌ಗಳನ್ನು ಹೊಂದಿಲ್ಲ"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"ದಯವಿಟ್ಟು ಸಿಮ್‌ ಕಾರ್ಡ್‌ ಅನ್ನು ಸೇರಿಸಿ ಮತ್ತು ಮರುಪ್ರಾರಂಭಿಸಿ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ದಯವಿಟ್ಟು ಇಂಟರ್ನೆಟ್‌ಗೆ ಸಂಪರ್ಕಪಡಿಸಿ"</string>
-    <string name="location_title" msgid="1029961368397484576">"ನನ್ನ ಸ್ಥಾನ"</string>
+    <string name="location_title" msgid="1029961368397484576">"ನನ್ನ ಸ್ಥಳ"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್‌ನ ಸ್ಥಳ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"ಮೋಡ್"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"ಅಧಿಕ ನಿಖರತೆ"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ಬ್ಯಾಟರಿ ಉಳಿತಾಯ"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"ಸಾಧನ ಮಾತ್ರ"</string>
-    <string name="location_mode_location_off_title" msgid="2829713015012529465">"ಸ್ಥಾನ ಆಫ್‌"</string>
+    <string name="location_mode_location_off_title" msgid="2829713015012529465">"ಸ್ಥಳ ಆಫ್‌"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"ಅಪ್ಲಿಕೇಶನ್‌ ಹಂತದ ಅನುಮತಿಗಳು"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"ಇತ್ತೀಚಿನ ಸ್ಥಳ ವಿನಂತಿಗಳು"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"ಇತ್ತೀಚೆಗೆ ಯಾವುದೇ ಅಪ್ಲಿಕೇಶನ್‌‌ಗಳು ಸ್ಥಳವನ್ನು ವಿನಂತಿಸಿಲ್ಲ"</string>
@@ -1380,13 +1377,13 @@
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS, ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್ ಅಥವಾ ಮತ್ತು ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು ವೈ-ಫೈ, ಬ್ಲೂಟೂತ್ ಅಥವಾ ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ​​ಬಳಸಿ"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ಸ್ಥಳವನ್ನು ನಿರ್ಧರಿಸಲು GPS ಬಳಸಿ"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ಸ್ಕ್ಯಾನ್ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ಸ್ಕ್ಯಾನ್ ಮಾಡುವಿಕೆ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ವೈ-ಫೈ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ವೈ-ಫೈ  ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಮ್ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ವೈ-ಫೈ  ನೆಟ್‌ವರ್ಕ್‌ಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ಬ್ಲೂಟೂತ್ ಸ್ಕ್ಯಾನಿಂಗ್"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಮ್ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
-    <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಥಾನ"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"ನಿಮ್ಮ ಸ್ಥಾನವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಾನ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"ಯಾವುದೇ ಸಮಯದಲ್ಲಿ ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಪತ್ತೆಹಚ್ಚಲು ಸಿಸ್ಟಂ ಸೇವೆಗಳು ಮತ್ತು ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗೆ ಅನುಮತಿಸುವುದರ ಮೂಲಕ ಸ್ಥಳ ಸುಧಾರಣೆ ಮಾಡಿ."</string>
+    <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi &amp; ಮೊಬೈಲ್‌ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಥಳ"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಅತಿ ವೇಗವಾಗಿ ಅಂದಾಜು ಮಾಡಲು Google ನ ಸ್ಥಳ ಸೇವೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಬಳಸಿ. ಅನಾಮಧೇಯ ಸ್ಥಳದ ಡೇಟಾವನ್ನು ಸಂಗ್ರಹಿಸಲಾಗುವುದು ಮತ್ತು Google ಗೆ ಕಳುಹಿಸಲಾಗುವುದು."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Wi‑Fi ಮೂಲಕ ನಿರ್ಧರಿಸಲಾಗಿರುವ ಸ್ಥಳ"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS ಉಪಗ್ರಹಗಳು"</string>
     <string name="location_street_level" product="tablet" msgid="1669562198260860802">"ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಗುರುತಿಸುವ ಸಲುವಾಗಿ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌‌ನಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು GPS ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
@@ -1394,11 +1391,11 @@
     <string name="assisted_gps" msgid="4649317129586736885">"ಸಹಾಯಕ GPS ಬಳಸು"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"GPS ಗೆ ನೆರವಾಗಲು ಸರ್ವರ್‌ ಅನ್ನು ಬಳಸಿ (ನೆಟ್‌ವರ್ಕ್‌ ಬಳಕೆಯನ್ನು ಕಡಿಮೆ ಮಾಡಲು ಗುರುತು ತೆಗೆಯಿರಿ)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"GPS ಗೆ ನೆರವಾಗಲು ಸರ್ವರ್‌ ಬಳಸಿ (GPS ಕೆಲಸ ನಿರ್ವಹಣೆಯನ್ನು ಸುಧಾರಿಸಲು ಗುರುತು ತೆಗೆಯಿರಿ)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"ಸ್ಥಾನ &amp; Google ಹುಡುಕಾಟ"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"ಸ್ಥಳ &amp; Google ಹುಡುಕಾಟ"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"ಹುಡುಕಾಟ ಫಲಿತಾಂಶಗಳು ಮತ್ತು ಇತರೆ ಸೇವೆಗಳನ್ನು ಸುಧಾರಿಸುವುದಕ್ಕಾಗಿ ನಿಮ್ಮ ಸ್ಥಾನವನ್ನು ಬಳಸಲು Google ಗೆ ಅವಕಾಶ ಮಾಡಿಕೊಡಿ"</string>
     <string name="location_access_title" msgid="7064108942964081243">"ನನ್ನ ಸ್ಥಳಕ್ಕೆ ಪ್ರವೇಶ"</string>
     <string name="location_access_summary" msgid="69031404093194341">"ನಿಮ್ಮ ಅನುಮತಿಯನ್ನು ಕೇಳುವ ಅಪ್ಲಿಕೇಶನ್‌‌ಗೆ ನಿಮ್ಮ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
-    <string name="location_sources_heading" msgid="1278732419851088319">"ಸ್ಥಾನ ಮೂಲಗಳು"</string>
+    <string name="location_sources_heading" msgid="1278732419851088319">"ಸ್ಥಳ ಮೂಲಗಳು"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"ಟ್ಯಾಬ್ಲೆಟ್ ಕುರಿತು"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"ಫೋನ್ ಕುರಿತು"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"ಅನುಸರಿಸುವ ಸಾಧನದ ಕುರಿತು"</string>
@@ -1431,7 +1428,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"ನಿಮ್ಮ ಪಿನ್‌ ಅನ್ನು ದೃಢೀಕರಿಸಿ"</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_choose_lock_generic_header" msgid="3811438094903786145">"ಅನ್‌ಲಾಕ್ ಆಯ್ಕೆ"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"ಪಿನ್‌ ಅನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"ನಮೂನೆಯನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ"</string>
@@ -1469,7 +1466,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ಪ್ಯಾಟರ್ನ್ ಅನ್ನು ಚಿತ್ರಿಸಬೇಕು"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"ಪ್ಯಾಟರ್ನ್ ಕಾಣಿಸುವಂತೆ ಮಾಡು"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"ಪ್ರೊಫೈಲ್ ಪ್ಯಾಟರ್ನ್ ಕಾಣಿಸುವಂತೆ ಮಾಡಿ"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ಕಂಪಿಸು"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ವೈಬ್ರೇಟ್‌ ಆಗು"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"ಪವರ್ ಬಟನ್ ಲಾಕ್ ಆಗು"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> ಮೂಲಕ ಅನ್‌ಲಾಕ್ ಮಾಡಿದ ಸ್ಥಿತಿಯನ್ನು ಹೊರತುಪಡಿಸಿ"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"ಅನ್‌ಲಾಕ್ ನಮೂನೆಯನ್ನು ಹೊಂದಿಸಿ"</string>
@@ -1505,7 +1502,7 @@
     <string name="screen_compatibility_label" msgid="663250687205465394">"ಪರದೆಯ ಹೊಂದಾಣಿಕೆ"</string>
     <string name="permissions_label" msgid="2605296874922726203">"ಅನುಮತಿಗಳು"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"ಸಂಗ್ರಹ"</string>
-    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ಸಂಗ್ರಹ ಅಳಿಸು"</string>
+    <string name="clear_cache_btn_text" msgid="5756314834291116325">"ಸಂಗ್ರಹ ಅಳಿಸಿ"</string>
     <string name="cache_size_label" msgid="7505481393108282913">"ಸಂಗ್ರಹ"</string>
     <plurals name="uri_permissions_text" formatted="false" msgid="3983110543017963732">
       <item quantity="one">%d ಐಟಂಗಳು</item>
@@ -1525,12 +1522,12 @@
     <string name="install_text" msgid="884360662922471113">"ಸ್ಥಾಪಿಸು"</string>
     <string name="disable_text" msgid="6544054052049395202">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು"</string>
     <string name="enable_text" msgid="9217362512327828987">"ಸಕ್ರಿಯಗೊಳಿಸು"</string>
-    <string name="clear_user_data_text" msgid="5597622864770098388">"ಡೇಟಾ ಅಳಿಸು"</string>
+    <string name="clear_user_data_text" msgid="5597622864770098388">"ಡೇಟಾ ಅಳಿಸಿ"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"ನವೀಕರಣಗಳನ್ನು ಅಸ್ಥಾಪಿಸಿ"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"ಕೆಲವು ಕ್ರಮಗಳಿಗಾಗಿ ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಡಿಫಾಲ್ಟ್ ಆಗಿ ಪ್ರಾರಂಭಿಸಲು ನೀವು ಆಯ್ಕೆ ಮಾಡಿರುವಿರಿ."</string>
     <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅನುಮತಿಸಲು ನೀವು ವಿಜೆಟ್‌ಗಳನ್ನು ರಚಿಸಲು ಮತ್ತು ಅವುಗಳ ಡೇಟಾವನ್ನು ಪ್ರವೇಶಿಸಲು ಆಯ್ಕೆಮಾಡಿಕೊಂಡಿರುವಿರಿ."</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ."</string>
-    <string name="clear_activities" msgid="7408923511535174430">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಅಳಿಸು"</string>
+    <string name="clear_activities" msgid="7408923511535174430">"ಡೀಫಾಲ್ಟ್‌ಗಳನ್ನು ಅಳಿಸಿ"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ನಿಮ್ಮ ಪರದೆಗೆ ಅನುಗುಣವಾಗಿ ವಿನ್ಯಾಸಗೊಳಿಸದೆ ಇರಬಹುದು. ನಿಮ್ಮ ಪರದೆಗೆ ಇದು ಹೇಗೆ ಹೊಂದಿಕೊಳ್ಳುತ್ತದೆ ಎಂಬುದನ್ನು ನೀವು ಇಲ್ಲಿ ನಿಯಂತ್ರಿಸಬಹುದು."</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"ಆರಂಭಿಸಿದಾಗ ಕೇಳು"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಅಳತೆ ಮಾಡು"</string>
@@ -1548,7 +1545,7 @@
     <string name="filter" msgid="2018011724373033887">"ಫಿಲ್ಟರ್‌"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ಫಿಲ್ಟರ್ ಆಯ್ಕೆಗಳನ್ನು ಆರಿಸಿ"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"ಎಲ್ಲಾ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
-    <string name="filter_apps_disabled" msgid="5862632369555319938">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿದ ಆಪ್‌ಗಳು"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ಡೌನ್‌ಲೋಡ್ ಮಾಡಲಾಗಿದೆ"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"ಚಾಲನೆಯಲ್ಲಿದೆ"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB ಸಂಗ್ರಹಣೆ"</string>
@@ -1569,7 +1566,7 @@
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"ಸ್ಥಾಪಿಸಲಾಗಿರುವ ಅಪ್ಲಿಕೇಶನ್‍ಗಳ ಪಟ್ಟಿಯಲ್ಲಿ ಅಪ್ಲಿಕೇಶನ್ ಕಂಡುಬಂದಿಲ್ಲ."</string>
     <string name="clear_data_failed" msgid="7214074331627422248">"ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ಡೇಟಾ ಅಳಿಸು"</string>
+    <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ಡೇಟಾ ಅಳಿಸಿ"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"ಅಪ್ಲಿಕೇಶನ್‌ನ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್‌ನಲ್ಲಿ ಕೆಳಗಿನದನ್ನು ಪ್ರವೇಶಿಸಬಹುದು:"</string>
     <string name="security_settings_desc" product="default" msgid="61749028818785244">"ಈ ಅಪ್ಲಿಕೇಶನ್ ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಕೆಳಗಿನದನ್ನು ಪ್ರವೇಶಿಸಬಹುದು:"</string>
@@ -1603,7 +1600,7 @@
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"ಅಪ್ಲಿಕೇಶನ್‌ ಅನ್ನು ಬಲವಂತವಾಗಿ ಸ್ಥಗಿತಗೊಳಿಸಿದರೆ, ಅದು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದಿರಬಹುದು."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಸರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ. <xliff:g id="REASON">%1$s</xliff:g>"</string>
-    <string name="app_install_location_title" msgid="2068975150026852168">"ಅಪೇಕ್ಷಿತ ಸ್ಥಾಪನೆ ಸ್ಥಾನ"</string>
+    <string name="app_install_location_title" msgid="2068975150026852168">"ಅಪೇಕ್ಷಿತ ಸ್ಥಾಪನೆ ಸ್ಥಳ"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"ಹೊಸ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಿಗಾಗಿ ಪ್ರಾಶಸ್ತ್ಯದ ಸ್ಥಾಪನೆ ಸ್ಥಾನವನ್ನು ಬದಲಾಯಿಸಿ"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"ಅಂತರ್‌ನಿರ್ಮಿತ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸುವುದೇ?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"ಅಪ್ಲಿಕೇಶನ್‌ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ಎಂದಿಗೂ ಬಳಸಿಲ್ಲ)"</string>
@@ -1650,7 +1648,7 @@
     <string name="no_services" msgid="7133900764462288263">"ಕ್ರಿಯಾಶೀಲವಾಗಿಲ್ಲ"</string>
     <string name="runningservicedetails_services_title" msgid="391168243725357375">"ಸೇವೆಗಳು"</string>
     <string name="runningservicedetails_processes_title" msgid="928115582044655268">"ಪ್ರಕ್ರಿಯೆಗಳು"</string>
-    <string name="service_stop" msgid="6369807553277527248">"ನಿಲ್ಲಿಸು"</string>
+    <string name="service_stop" msgid="6369807553277527248">"ನಿಲ್ಲಿಸಿ"</string>
     <string name="service_manage" msgid="1876642087421959194">"ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="service_stop_description" msgid="9146619928198961643">"ಈ ಸೇವೆಯನ್ನು ಇದರ ಅಪ್ಲಿಕೇಶನ್‌ ಪ್ರಾರಂಭಿಸಿದೆ. ನಿಲ್ಲಿಸುವುದರಿಂದ ಇದು ಅಪ್ಲಿಕೇಶನ್ ವಿಫಲಗೊಳ್ಳಲು ಕಾರಣವಾಗಬಹುದು."</string>
     <string name="heavy_weight_stop_description" msgid="6050413065144035971">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಸುರಕ್ಷಿತವಾಗಿ ನಿಲ್ಲಿಸಲಾಗುವುದಿಲ್ಲ. ನೀವು ಇದನ್ನು ನಿಲ್ಲಿಸಿದರೆ, ನಿಮ್ಮ ಪ್ರಸ್ತುತ ಕೆಲವು ಕಾರ್ಯವನ್ನು ನೀವು ಕಳೆದುಕೊಳ್ಳಬಹುದು."</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"ಕೀಬೋರ್ಡ್ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳ ಸಹಾಯಕ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ಲಭ್ಯವಿರುವ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳನ್ನು ಪ್ರದರ್ಶಿಸು"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ಡಿಫಾಲ್ಟ್"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"ಮೌಸ್/ಟ್ರ್ಯಾಕ್‌ಪ್ಯಾಡ್"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ಪಾಯಿಂಟರ್ ವೇಗ"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ಆಟ ನಿಯಂತ್ರಕ"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"ಕಂಪಕ ಬಳಸಿ"</string>
@@ -1716,7 +1713,7 @@
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"ಐಚ್ಛಿಕ ಶಾರ್ಟ್‌ಕಟ್"</string>
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"ಪದವನ್ನು ಎಡಿಟ್ ಮಾಡಿ"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"ಎಡಿಟ್"</string>
-    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ಅಳಿಸು"</string>
+    <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"ಅಳಿಸಿ"</string>
     <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"ಬಳಕೆದಾರರ ನಿಘಂಟಿನಲ್ಲಿ ನೀವು ಯಾವುದೇ ಪದಗಳನ್ನು ಹೊಂದಿಲ್ಲ. ಪದವನ್ನು ಸೇರಿಸಲು, ಸೇರಿಸು (+) ಬಟನ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"ಎಲ್ಲ ಭಾಷೆಗಳಿಗೆ"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"ಇನ್ನಷ್ಟು ಭಾಷೆಗಳು…"</string>
@@ -1784,7 +1781,7 @@
     <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"ಪ್ರವೇಶ ಶಾರ್ಟ್‌ಕಟ್‌"</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="6488524140219209763">"ಶಾರ್ಟ್‌ಕಟ್ ಆನ್ ಆಗಿರುವಾಗ ಪ್ರವೇಶಿಸುವಿಕೆ ವೈಶಿಷ್ಟ್ಯ ಆನ್ ಮಾಡಲು, ಎರಡೂ ವಾಲ್ಯೂಮ್ ಬಟನ್‌ಗಳನ್ನು ನೀವು 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>
@@ -1795,7 +1792,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ಸ್ಪರ್ಶ &amp; ಹೋಲ್ಡ್‌ ವಿಳಂಬ"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"ಬಣ್ಣ ವಿಲೋಮ"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"ಕಾರ್ಯಕ್ಷಮತೆಯ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರಬಹುದು"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ಪಾಯಿಂಟರ್ ನಿಂತ ಬಳಿಕ ಕ್ಲಿಕ್ ಮಾಡು"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ಪಾಯಿಂಟರ್ ನಿಂತ ಬಳಿಕ ಕ್ಲಿಕ್"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ಕ್ಲಿಕ್ ಮಾಡುವ ಮೊದಲು ವಿಳಂಬ"</string>
     <string name="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>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ಕೊನೆಯ ಬಾರಿ ಪೂರ್ಣ ಚಾರ್ಜ್ ಬಳಿಕ ಪರದೆಯ ಬಳಕೆ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ಪರದೆ ಬಳಕೆ ಮಾಡಿದ್ದು"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್‌ ಸ್ಕ್ಯಾನ್ ಮಾಡುವುದು"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ನಂತರದಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ (<xliff:g id="TIME">%1$s</xliff:g> ಹಿಂದೆ)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ನಿಮಿಷಗಳ ಹಿಂದೆ"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ನಂತರದಿಂದ ಅಪ್ಲಿಕೇಶನ್ ಬಳಕೆ (<xliff:g id="TIME">^1</xliff:g> ಹಿಂದೆ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ಸಂಪೂರ್ಣ ಚಾರ್ಜ್ ಆದ ಬಳಿಕ ಪರದೆ ಆನ್ ಆಗಿದ್ದ ಅವಧಿ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ಕೊನೆಯ ಬಾರಿ ಸಂಪೂರ್ಣ ಚಾರ್ಜ್‌ ಮಾಡಿದ ನಂತರದಿಂದ ಸಾಧನದ ಬಳಕೆ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ಅನ್‌ಪ್ಲಗ್‌ ಆದಾಗಿನಿಂದ ಬ್ಯಾಟರಿಯ ಬಳಕೆ"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"ಕ್ಯಾಮರಾ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ಬ್ಲೂಟೂತ್‌‌"</string>
-    <string name="power_cell" msgid="6596471490976003056">"ಸೆಲ್ ಸ್ಟ್ಯಾಂಡ್‌ಬೈ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"ಮೊಬೈಲ್ ನೆಟ್‌ವರ್ಕ್ ಸ್ಟ್ಯಾಂಡ್‌ ಬೈ"</string>
     <string name="power_phone" msgid="5392641106474567277">"ಧ್ವನಿ ಕರೆಗಳು"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ಟ್ಯಾಬ್ಲೆಟ್ ತಟಸ್ಥ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ಫೋನ್‌ ತಟಸ್ಥ"</string>
@@ -1955,7 +1952,7 @@
     <string name="power_overcounted" msgid="2762354976171358445">"ಅಧಿಕ ಗಣನೆ"</string>
     <string name="power_apps" msgid="2043554781293951327">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="power_service" msgid="1599661212370831780">"ಸೇವೆಗಳು"</string>
-    <string name="power_system" msgid="8290455327965307383">"ಸಿಸ್ಟಮ್"</string>
+    <string name="power_system" msgid="8290455327965307383">"ಸಿಸ್ಟಂ"</string>
     <string name="power_user" msgid="1889728099253018005">"ಬಳಕೆದಾರ"</string>
     <string name="usage_type_cpu" msgid="715162150698338714">"CPU ಮೊತ್ತ"</string>
     <string name="usage_type_cpu_foreground" msgid="6500579611933211831">"CPU ಮುನ್ನೆಲೆ"</string>
@@ -2007,12 +2004,12 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ಬ್ಯಾಟರಿ ಬಳಕೆಯು ವಿದ್ಯುತ್ ಬಳಕೆಯ ಅಂದಾಜು ಆಗಿರುತ್ತದೆ ಮತ್ತು ಬ್ಯಾಟರಿ ಡ್ರೈನ್‌ನ ಪ್ರತಿ ಮೂಲವನ್ನು ಒಳಗೊಂಡಿರುವುದಿಲ್ಲ. ಇತರೆಯು ಗಣನೆ ಮಾಡಲಾದ ಅಂದಾಜು ವಿದ್ಯುತ್ ಬಳಕೆ ಮತ್ತು ಬ್ಯಾಟರಿ ಮೇಲೆ ಗಮನಿಸಲಾದ ಮೂಲ ಡ್ರೈನ್‌ ನಡುವಿನ ವ್ಯತ್ಯಾಸವಾಗಿರುತ್ತದೆ."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ಅಧಿಕ ಗಣನೆಯ ಪವರ್ ಬಳಕೆ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s ಗೆ ಬಳಸಲಾಗಿದೆ"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ಕಾಲ ಬಳಸಲಾಗಿದೆ"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ಬಳಸುತ್ತಿರುವುದು <xliff:g id="PERCENT">%1$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_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="4701358808575132647">"ಉಳಿದಿರುವ ಬ್ಯಾಟರಿ ಸಮಯವನ್ನು ಅಂದಾಜು ಮಾಡಲಾಗಿರುತ್ತದೆ. ಬಳಕೆಯನ್ನು ಆಧಾರದ ಮೇಲೆ ಅದು ಬದಲಾಗಬಹುದು"</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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ಧ್ವನಿ ಇನ್‌ಪುಟ್ &amp; ಔಟ್‌ಪುಟ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ಧ್ವನಿ ಹುಡುಕಾಟ"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android ಕೀಬೋರ್ಡ್"</string>
-    <string name="voice_category" msgid="1430370497125803904">"ಧ್ವನಿ"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"ಧ್ವನಿ ಇನ್‌ಪುಟ್‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ಧ್ವನಿ ಇನ್‌ಪುಟ್‌"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"ಧ್ವನಿ ಇನ್‌ಪುಟ್ ಸೇವೆಗಳು"</string>
@@ -2108,7 +2104,7 @@
     <string name="gadget_state_turning_off" msgid="2395546048102176157">"ಆಫ್‌ ಮಾಡಲಾಗುತ್ತಿದೆ"</string>
     <string name="gadget_wifi" msgid="4712584536500629417">"Wi‑Fi"</string>
     <string name="gadget_bluetooth" msgid="8998572807378694410">"ಬ್ಲೂಟೂತ್‌‌"</string>
-    <string name="gadget_location" msgid="2974757497945178165">"ಸ್ಥಾನ"</string>
+    <string name="gadget_location" msgid="2974757497945178165">"ಸ್ಥಳ"</string>
     <string name="gadget_sync" msgid="858895763714222152">"ಸಿಂಕ್"</string>
     <string name="gadget_brightness_template" msgid="930541920933123603">"ಪ್ರಕಾಶಮಾನ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="gadget_brightness_state_auto" msgid="6667967252426515446">"ಸ್ವಯಂ"</string>
@@ -2275,7 +2271,7 @@
     <string name="cryptkeeper_wrong_pin" msgid="755720788765259382">"ತಪ್ಪು ಪಿನ್‌"</string>
     <string name="checking_decryption" msgid="8287458611802609493">"ಪರಿಶೀಲಿಸಲಾಗುತ್ತಿದೆ..."</string>
     <string name="starting_android" msgid="4001324195902252681">"Android ಪ್ರಾರಂಭಿಸಲಾಗುತ್ತಿದೆ..."</string>
-    <string name="delete" msgid="4219243412325163003">"ಅಳಿಸು"</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>
@@ -2394,7 +2390,7 @@
     <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_cancel" msgid="1979937976123659332">"ರದ್ದುಮಾಡಿ"</string>
-    <string name="vpn_done" msgid="8678655203910995914">"ವಜಾಗೊಳಿಸು"</string>
+    <string name="vpn_done" msgid="8678655203910995914">"ವಜಾಗೊಳಿಸಿ"</string>
     <string name="vpn_save" msgid="4233484051644764510">"ಉಳಿಸು"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"ಸಂಪರ್ಕಿಸು"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"ಸ್ಥಾನಾಂತರಿಸು"</string>
@@ -2411,13 +2407,13 @@
     <string name="vpn_replace_always_on_vpn_enable_message" msgid="2577928591361606641">"ನಿಮ್ಮ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಅನ್ನು ಸ್ಥಾನಾಂತರಿಸಲಾಗುವುದು ಮತ್ತು VPN ಯಶಸ್ವಿಯಾಗಿ ಸಂಪರ್ಕವಾಗುವವರೆಗೆ ನೀವು ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕವನ್ನು ಹೊಂದುವುದಿಲ್ಲ"</string>
     <string name="vpn_replace_always_on_vpn_disable_message" msgid="3011818750025879902">"ಯಾವಾಗಲೂ ಆನ್ ಆಗಿರುವ VPN ಗೆ ನೀವು ಈಗಾಗಲೇ ಸಂಪರ್ಕಗೊಂಡಿರುವಿರಿ. ನೀವು ಬೇರೊಂದಕ್ಕೆ ಸಂಪರ್ಕಗೊಂಡಲ್ಲಿ, ನಿಮ್ಮ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಅನ್ನು ಸ್ಥಾನಾಂತರಿಸಲಾಗುವುದು ಮತ್ತು ಯಾವಾಗಲೂ ಆನ್ ಮೋಡ್‌ನಲ್ಲಿರುವುದನ್ನು ಆಫ್ ಮಾಡಲಾಗುತ್ತದೆ."</string>
     <string name="vpn_replace_vpn_message" msgid="5611635724578812860">"ನೀವು ಈಗಾಗಲೇ VPN ಗೆ ಸಂಪರ್ಕ ಹೊಂದಿರುವಿರಿ. ಒಂದು ವೇಳೆ ನೀವು ಬೇರೊಂದಕ್ಕೆ ಸಂಪರ್ಕಗೊಂಡಲ್ಲಿ, ನಿಮ್ಮ ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಅನ್ನು ಸ್ಥಾನಾಂತರಿಸಲಾಗುವುದು."</string>
-    <string name="vpn_turn_on" msgid="2363136869284273872">"ಆನ್ ಮಾಡು"</string>
+    <string name="vpn_turn_on" msgid="2363136869284273872">"ಆನ್‌ ಮಾಡಿ"</string>
     <string name="vpn_cant_connect_title" msgid="4517706987875907511">"<xliff:g id="VPN_NAME">%1$s</xliff:g> ಸಂಪರ್ಕ ಸಾಧ್ಯವಿಲ್ಲ"</string>
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"ಈ ಅಪ್ಲಿಕೇಶನ್ ಯಾವಾಗಲೂ-ಆನ್ VPN ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ."</string>
     <string name="vpn_title" msgid="6317731879966640551">"VPN"</string>
     <string name="vpn_create" msgid="5628219087569761496">"VPN ಪ್ರೊಫೈಲ್ ಸೇರಿಸಿ"</string>
     <string name="vpn_menu_edit" msgid="408275284159243490">"ಪ್ರೊಫೈಲ್ ಎಡಿಟ್ ಮಾಡಿ"</string>
-    <string name="vpn_menu_delete" msgid="8098021690546891414">"ಪ್ರೊಫೈಲ್ ಅಳಿಸು"</string>
+    <string name="vpn_menu_delete" msgid="8098021690546891414">"ಪ್ರೊಫೈಲ್ ಅಳಿಸಿ"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN ನಲ್ಲಿ ಆನ್‌ ಆಗಿರಿಸಿ"</string>
     <string name="vpn_no_vpns_added" msgid="5002741367858707244">"ಯಾವುದೇ VPN ಗಳನ್ನು ಸೇರಿಸಿಲ್ಲ"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"ಎಲ್ಲ ಸಮಯಗಳಲ್ಲೂ VPN ಜೊತೆ ಸಂಪರ್ಕದಲ್ಲಿರಿ"</string>
@@ -2452,7 +2448,7 @@
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"ಕಾಗುಣಿತ ಪರೀಕ್ಷಕ"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"ಈಗಿನ ಸಂಪೂರ್ಣ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡನ್ನು ಇಲ್ಲಿ ಟೈಪ್‌ ಮಾಡಿ"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"ಸಂಪೂರ್ಣ ಬ್ಯಾಕಪ್‌ಗಳಿಗಾಗಿ ಹೊಸ ಪಾಸ್‌ವರ್ಡನ್ನು ಇಲ್ಲಿ ಟೈಪ್ ಮಾಡಿ"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ನಿಮ್ಮ ಹೊಸ ಪೂರ್ಣ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ಇಲ್ಲಿ ಮರುಟೈಪ್ ಮಾಡಿ"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"ಹೊಸದಾದ ಸಂಪೂರ್ಣ ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡನ್ನು ಇಲ್ಲಿ ಮರುಟೈಪ್ ಮಾಡಿ"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"ಬ್ಯಾಕಪ್ ಪಾಸ್‌ವರ್ಡ್‌ ಹೊಂದಿಸಿ"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"ರದ್ದುಮಾಡಿ"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ಹೆಚ್ಚುವರಿ ಸಿಸ್ಟಂ ಅಪ್‌ಡೇಟ್‌ಗಳು"</string>
@@ -2524,14 +2520,14 @@
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"ಹೊಸ ಬಳಕೆದಾರರನ್ನು ಸೇರಿಸಲಾಗುತ್ತಿದೆ…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"ಬಳಕೆದಾರರನ್ನು ಅಳಿಸಿ"</string>
-    <string name="user_delete_button" msgid="5131259553799403201">"ಅಳಿಸು"</string>
+    <string name="user_delete_button" msgid="5131259553799403201">"ಅಳಿಸಿ"</string>
     <string name="user_guest" msgid="8475274842845401871">"ಅತಿಥಿ"</string>
     <string name="user_exit_guest_title" msgid="5613997155527410675">"ಅತಿಥಿಯನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"ಅತಿಥಿಯನ್ನು ತೆಗೆದುಹಾಕುವುದೇ?"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ಈ ಸೆಷನ್‌ನಲ್ಲಿನ ಎಲ್ಲ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಅಳಿಸಲಾಗುತ್ತದೆ."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"ತೆಗೆದುಹಾಕಿ"</string>
     <string name="user_enable_calling" msgid="5128605672081602348">"ಫೋನ್ ಕರೆಗಳನ್ನು ಆನ್ ಮಾಡಿ"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ಫೋನ್ ಕರೆಗಳು &amp; SMS ಆನ್ ಮಾಡಿ"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ಫೋನ್ ಕರೆಗಳು ಮತ್ತು ಎಸ್‌ಎಂಎಸ್‌ ಆನ್ ಮಾಡಿ"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"ಬಳಕೆದಾರರನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"ಫೋನ್ ಕರೆಗಳನ್ನು ಆನ್ ಮಾಡುವುದೇ?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"ಕರೆ ಇತಿಹಾಸವನ್ನು ಈ ಬಳಕೆದಾರರ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತದೆ."</string>
@@ -2545,7 +2541,7 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ಈ ಸೆಟ್ಟಿಂಗ್‌ ಈ ಟ್ಯಾಬ್ಲೆಟ್‌‌‌‌ನಲ್ಲಿನ ಎಲ್ಲ ಬಳಕೆದಾರರಿಗೂ ಪರಿಣಾಮ ಬಿರುತ್ತದೆ."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ಈ ಸೆಟ್ಟಿಂಗ್‌ ಈ ಫೋನ್‌ನಲ್ಲಿನ ಎಲ್ಲ ಬಳಕೆದಾರರಿಗೂ ಪರಿಣಾಮ ಬಿರುತ್ತದೆ."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ಭಾಷೆ ಬದಲಾಯಿಸು"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ಟ್ಯಾಪ್‌ ಮಾಡಿ &amp; ಪಾವತಿಸಿ"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ಟ್ಯಾಪ್‌ ಮಾಡಿ ಮತ್ತು ಪಾವತಿಸಿ"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"ಇದು ಹೇಗೆ ಕೆಲಸ ಮಾಡುತ್ತದೆ"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"ಅಂಗಡಿಗಳಲ್ಲಿ ನಿಮ್ಮ ಫೋನ್‌ನಲ್ಲಿ ಪಾವತಿಸಿ"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"ಪಾವತಿ ಡೀಫಾಲ್ಟ್"</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"ಡಿಫಾಲ್ಟ್ ಬಳಸಿ"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"ಯಾವಾಗಲೂ"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"ಮತ್ತೊಂದು ಪಾವತಿ ಅಪ್ಲಿಕೇಶನ್ ತೆರೆದಿರುವುದನ್ನು ಹೊರತುಪಡಿಸಿ"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Tap &amp; pay terminal ನಲ್ಲಿ, ಇದರ ಮೂಲಕ ಪಾವತಿಸಿ:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ಟ್ಯಾಪ್‌ ಮಾಡಿ ಮತ್ತು ಪಾವತಿ ಟರ್ಮಿನಲ್‌ನಲ್ಲಿ, ಇದರ ಮೂಲಕ ಪಾವತಿಸಿ:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"ಟರ್ಮಿನಲ್‌ನಲ್ಲಿ ಪಾವತಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"ಪಾವತಿ ಅಪ್ಲಿಕೇಶನ್ ಹೊಂದಿಸಿ. ನಂತರ ಸಂಪರ್ಕವಿಲ್ಲದ ಚಿಹ್ನೆಯೊಂದಿಗೆ ಯಾವುದೇ ಟರ್ಮಿನಲ್‌ಗೆ ನಿಮ್ಮ ಫೋನ್ ಅನ್ನು ಹಿಡಿದುಕೊಳ್ಳಿ."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"ತಿಳಿಯಿತು"</string>
@@ -2604,7 +2600,7 @@
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"ಈ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ಮತ್ತೊಂದು NFC ಸಾಧನವನ್ನು ಸ್ಪರ್ಶಿಸಿದಾಗ ಡೇಟಾ ವಿನಿಮಯವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"ಟ್ಯಾಬ್ಲೆಟ್ ಇನ್ನೊಂದು ಸಾಧನವನ್ನು ಸ್ಪರ್ಶಿಸಿದಾಗ ಡೇಟಾ ವಿನಿಮಯವನ್ನು ಅನುಮತಿಸಿ"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"ಫೋನ್‌ ಇನ್ನೊಂದು ಸಾಧನವನ್ನು ಸ್ಪರ್ಶಿಸಿದಾಗ ಡೇಟಾ ವಿನಿಮಯವನ್ನು ಅನುಮತಿಸಿ"</string>
-    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ಸ್ಥಾನ"</string>
+    <string name="restriction_location_enable_title" msgid="5020268888245775164">"ಸ್ಥಳ"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ನಿಮ್ಮ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಬಳಸಲು ಅನುಮತಿಸಿ"</string>
     <string name="wizard_back" msgid="5567007959434765743">"ಹಿಂದೆ"</string>
     <string name="wizard_next" msgid="3606212602795100640">"ಮುಂದೆ"</string>
@@ -2658,9 +2654,9 @@
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ನೆಟ್‌ವರ್ಕ್ ಮತ್ತು ಇಂಟರ್ನೆಟ್"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"ವೈಫೈ, ಮೊಬೈಲ್, ಡೇಟಾ ಬಳಕೆ, ಹಾಟ್‌ಸ್ಪಾಟ್"</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="app_and_notification_dashboard_title" msgid="7838365599185397539">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು"</string>
+    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ಆಪ್‌ಗಳು ಮತ್ತು ಅಧಿಸೂಚನೆಗಳು"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ಅನುಮತಿಗಳು, ಡಿಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"ಬಳಕೆದಾರರು ಮತ್ತು ಖಾತೆಗಳು"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"ಡಿಫಾಲ್ಟ್ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
@@ -2687,7 +2683,7 @@
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"ರೇಟ್ ಮಾಡು, ಭಾಷೆ, ಡಿಫಾಲ್ಟ್, ಮಾತನಾಡಿ, ಮಾತನಾಡುವಿಕೆ, ಟಿಟಿಎಸ್, ಪ್ರವೇಶಿಸುವಿಕೆ, ಪರದೆ ರೀಡರ್, ಕುರುಡು"</string>
     <string name="keywords_date_and_time" msgid="758325881602648204">"ಕ್ಲಾಕ್‌, ಮಿಲಿಟರಿ"</string>
     <string name="keywords_network_reset" msgid="6024276007080940820">"ಮರುಹೊಂದಿಸಿ, ಮರುಸ್ಥಾಪಿಸಿ, ಫ್ಯಾಕ್ಟರಿ"</string>
-    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"ಒರೆಸು, ಅಳಿಸು, ಮರುಸ್ಥಾಪಿಸು, ತೆರವುಗೊಳಿಸು, ತೆಗೆದುಹಾಕು"</string>
+    <string name="keywords_factory_data_reset" msgid="5894970373671252165">"ಒರೆಸು, ಅಳಿಸಿ, ಮರುಸ್ಥಾಪಿಸು, ತೆರವುಗೊಳಿಸು, ತೆಗೆದುಹಾಕು"</string>
     <string name="keywords_printing" msgid="1701778563617114846">"ಪ್ರಿಂಟರ್"</string>
     <string name="keywords_sounds" msgid="7146245090127541167">"ಸ್ಪೀಕರ್ ಬೀಪ"</string>
     <string name="keywords_sounds_and_notifications_interruptions" msgid="5426093074031208917">"ತೊಂದರೆ ಮಾಡಬೇಡ, ತಡೆ, ತೊಂದರೆ, ವಿರಾಮ"</string>
@@ -2700,7 +2696,7 @@
     <string name="keywords_reset_apps" msgid="5293291209613191845">"ಮರುಹೊಂದಿಸಿ, ಪ್ರಾಶಸ್ತ್ಯಗಳು, ಡಿಫಾಲ್ಟ್"</string>
     <string name="keywords_emergency_app" msgid="3143078441279044780">"ತುರ್ತು, ಐಸ್, ಅಪ್ಲಿಕೇಶನ್, ಡೀಫಾಲ್ಟ್"</string>
     <string name="keywords_default_phone_app" msgid="4213090563141778486">"ಫೋನ್, ಡಯಲರ್, ಡೀಫಾಲ್ಟ್"</string>
-    <string name="keywords_all_apps" msgid="7814015440655563156">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಡೌನ್‌ಲೋಡ್, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಸಿಸ್ಟಮ್"</string>
+    <string name="keywords_all_apps" msgid="7814015440655563156">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಡೌನ್‌ಲೋಡ್, ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಸಿಸ್ಟಂ"</string>
     <string name="keywords_app_permissions" msgid="4229936435938011023">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಅನುಮತಿಗಳು, ಭದ್ರತೆ"</string>
     <string name="keywords_default_apps" msgid="223872637509160136">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಡೀಫಾಲ್ಟ್"</string>
     <string name="keywords_ignore_optimizations" msgid="6102579291119055029">"ಆಪ್ಟಿಮೈಸೇಶನ್‌ಗಳು, ಡೋಜ್, ಅಪ್ಲಿಕೇಶನ್ ಸ್ಟ್ಯಾಂಡ್‌ಬೈ ಅನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ಅಧಿಸೂಚನೆ ವಾಲ್ಯೂಮ್"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ಫೋನ್ ರಿಂಗ್‌ಟೋನ್"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ಡೀಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ಧ್ವನಿ"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ಅಪ್ಲಿಕೇಶನ್ ಒದಗಿಸಿರುವ ಧ್ವನಿ"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"ಡಿಫಾಲ್ಟ್ ಅಧಿಸೂಚನೆ ಧ್ವನಿ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ಡಿಫಾಲ್ಟ್ ಅಲಾರಮ್ ಧ್ವನಿ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ಕರೆಗಳಿಗೂ ಸಹ ವೈಬ್ರೇಟ್‌"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ಇತರ ಧ್ವನಿಗಳು"</string>
@@ -2739,7 +2737,7 @@
     <string name="charging_sounds_title" msgid="1132272552057504251">"ಚಾರ್ಜಿಂಗ್ ಧ್ವನಿಗಳು"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"ಡಾಕಿಂಗ್ ಧ್ವನಿಗಳು"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"ಸ್ಪರ್ಶ ಧ್ವನಿಗಳು"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ಕಂಪಿಸು"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"ಟ್ಯಾಪ್ ಮಾಡಿದಾಗ ವೈಬ್ರೇಟ್‌ ಆಗು"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"ಡಾಕ್ ಸ್ಪೀಕರ್ ಪ್ಲೇಗಳು"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ಎಲ್ಲಾ ಆಡಿಯೊ"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"ಮೀಡಿಯಾ ಆಡಿಯೊ ಮಾತ್ರ"</string>
@@ -2753,7 +2751,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು ಆನ್ ಆಗಿವೆ</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆದ್ಯತೆಗಳು"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ಆದ್ಯತೆ ಮಾತ್ರ ಅನುಮತಿಸುತ್ತದೆ"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ಆದ್ಯತೆಯು ಕೆಳಗಿನವುಗಳಿಗೆ ಅನುಮತಿಸುತ್ತದೆ"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"ಸ್ವಯಂಚಾಲಿತ ನಿಯಮಗಳು"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ನಿಯಮ ಹೊಂದಿಸಿ"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"ಕೆಲವು ಸಲ ಧ್ವನಿ-ವೈಬ್ರೇಶನ್ ಸೀಮಿತ"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"ಎಂದಿಗೂ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಬೇಡಿ"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"ಕಡಿಮೆ: ಧ್ವನಿ ಅಥವಾ ವೀಕ್ಷಣೆಯ ಅಡಚಣೆಗಳಿಲ್ಲ"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"ಮಧ್ಯಮ: ಧ್ವನಿ ಇಲ್ಲ"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ಅಧಿಕ: ಧ್ವನಿ ಮಾಡಿ"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"ತುರ್ತು: ಧ್ವನಿ ಮಾಡಿ ಮತ್ತು ಪರದೆಯಲ್ಲಿ ಪಾಪ್ ಮಾಡಿ"</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="6585849855452076626">"ಧ್ವನಿಗೆ ಅನುಮತಿ ನೀಡಿ"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ಪ್ರಸ್ತುತ ಪರದೆಯಲ್ಲಿ ಈ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೋರಿಸಲು ಧ್ವನಿ, ವೈಬ್ರೇಷನ್ ಅಥವಾ ಇಣುಕು ನೋಟ ಮಾಡಬೇಡ."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ಅಧಿಸೂಚನೆ ಸಹಾಯಕ"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಪ್ರವೇಶ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ಸ್ಥಾಪಿಸಲಾದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಯಾವುದೇ ಅಡಚಣೆ ಮಾಡಬೇಡಿಗೆ ಪ್ರವೇಶ ವಿನಂತಿಸಿಲ್ಲ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ಈ ಸಾಧನದಲ್ಲಿ ಗೋಚರವಾಗುವ ಈ ಪ್ರಕಾರದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಅಧಿಸೂಚನೆಗಳನ್ನು Android ನಿರ್ಬಂಧಿಸುತ್ತದೆ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ವಿಭಾಗಗಳು"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ಇತರೆ"</string>
     <string name="no_channels" msgid="3077375508177744586">"ಯಾವುದೇ ಅಧಿಸೂಚನೆಗಳನ್ನು ಈ ಅಪ್ಲಿಕೇಶನ್‌ ಪೋಸ್ಟ್‌ ಮಾಡಿಲ್ಲ"</string>
@@ -2902,7 +2903,7 @@
     <string name="zen_mode_schedule_rule_days_none" msgid="4954143628634166317">"ಯಾವುದೂ ಇಲ್ಲ"</string>
     <string name="zen_mode_schedule_rule_days_all" msgid="146511166522076034">"ಪ್ರತಿ ದಿನ"</string>
     <string name="zen_mode_schedule_alarm_title" msgid="767054141267122030">"ಅಲಾರಮ್ ಅಂತಿಮ ಸಮಯವನ್ನು ಅತಿಕ್ರಮಿಸಬಹುದು"</string>
-    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"ಅಂತಿಮ ಸಮಯದಲ್ಲಿ ಅಥವಾ ಮುಂದಿನ ಅಲಾರಮ್‌ಗೆ ಯಾವುದು ಮುಂಚಿತವಾಗಿ ಬರುತ್ತದೆಯೊ ಆ ಸಮಯಕ್ಕೆ ನಿಲ್ಲಿಸು"</string>
+    <string name="zen_mode_schedule_alarm_summary" msgid="4597050434723180422">"ಅಂತಿಮ ಸಮಯದಲ್ಲಿ ಅಥವಾ ಮುಂದಿನ ಅಲಾರಮ್‌ಗೆ ಯಾವುದು ಮುಂಚಿತವಾಗಿ ಬರುತ್ತದೆಯೊ ಆ ಸಮಯಕ್ಕೆ ನಿಲ್ಲಿಸಿ"</string>
     <string name="summary_divider_text" msgid="7228986578690919294">", "</string>
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> ರಿಂದ <xliff:g id="END">%2$s</xliff:g>"</string>
@@ -2920,7 +2921,7 @@
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ಎಲ್ಲ ಕರೆದಾರರು"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ಆಯ್ಕೆಮಾಡಲಾದ ಕರೆದಾರರು"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ಪುನರಾವರ್ತಿತ ಕರೆದಾರರು"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ಒಂದು ವೇಳೆ ಅದೇ ವ್ಯಕ್ತಿ <xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷದೊಳಗಿನ ಅವಧಿಯಲ್ಲಿ ಎರಡನೇ ಬಾರಿಗೆ ಕರೆ ಮಾಡಿದರೆ, ಅನುಮತಿಸಿ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ಒಂದು ವೇಳೆ ಒಬ್ಬನೇ ವ್ಯಕ್ತಿ <xliff:g id="MINUTES">%d</xliff:g> ನಿಮಿಷಗಳೊಳಗೆ ಎರಡನೇ ಬಾರಿ ಕರೆ ಮಾಡಿದರೆ, ಅನುಮತಿಸಿ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್‌ ಆಗುವಿಕೆ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ಎಂದಿಗೂ ಬೇಡ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ಪ್ರತಿ ರಾತ್ರಿ"</string>
@@ -2940,9 +2941,9 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> ವರೆಗೆ ಮಾತ್ರ ಅಲಾರಮ್‌ಗಳಲ್ಲಿ ಬದಲಾವಣೆ"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"ಯಾವಾಗಲೂ ಅಡಚಣೆಗೆ ಬದಲಾಯಿಸಿ"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"ಪರದೆ ಆನ್ ಆಗಿರುವಾಗ ನಿರ್ಬಂಧಿಸಿ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"ಪರದೆಯ ಮೇಲೆ ಇಣುಕು ನೋಟ ಅಥವಾ ಪಾಪ್ ಮಾಡುವುದರಿಂದ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಮೂಲಕ ನಿಶಬ್ದಗೊಳಿಸಿದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\'ಅಡಚಣೆ ಮಾಡಬೇಡಿ\' ಮೂಲಕ ನಿಶ್ಯಬ್ದಗೊಳಿಸಲಾದ ಅಧಿಸೂಚನೆಗಳು ಪರದೆಯ ಮೇಲೆ ಇಣುಕುವುದನ್ನು, ಪಾಪ್‌ ಮಾಡುವುದನ್ನು ತಡೆಯಿರಿ"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"ಪರದೆ ಆಫ್ ಆಗಿರುವಾಗ ನಿರ್ಬಂಧಿಸಿ"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"ಪರದೆ ಆನ್ ಮಾಡಿ ಅಥವಾ ಅಧಿಸೂಚನೆ ಲೈಟ್‌ ಅನ್ನು ಪಲ್ಸ್ ಮಾಡುವುದರಿಂದ ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಮೂಲಕ ನಿಶಬ್ದ ಮಾಡಲಾದ ಅಧಿಸೂಚನೆಗಳನ್ನು ತಡೆಯಿರಿ"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\'ಅಡಚಣೆ ಮಾಡಬೇಡಿ\' ಮೂಲಕ ನಿಶ್ಯಬ್ದಗೊಳಿಸಲಾದ ಅಧಿಸೂಚನೆಗಳು ಪರದೆ ಆನ್‌ ಮಾಡುವುದನ್ನು ಮತ್ತು ಅಧಿಸೂಚನೆ ಲೈಟ್‌ ಮಿನುಗುವಂತೆ ಮಾಡುವುದನ್ನು ತಡೆಯಿರಿ"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಅಡಚಣೆ ಮಾಡಬೇಡಿಯ ಮೂಲಕ ಪರದೆಯನ್ನು ಆನ್ ಮಾಡುವುದನ್ನು ತಡೆಯಿರಿ"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ಆಫ್"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"ಪರದೆ ಆನ್ ಆಗಿರುವಾಗ"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"ಆನ್"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ಆಫ್"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"ಸ್ಕ್ರೀನ್ ಪಿನ್ನಿಂಗ್"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"ಈ ಸೆಟ್ಟಿಂಗ್ ಆನ್ ಮಾಡಿದಾಗ, ನೀವು ಅನ್‌ಪಿನ್ ಮಾಡುವ ತನಕ ಪ್ರಸ್ತುತ ಪರದೆಯನ್ನು ವೀಕ್ಷಣೆಯಲ್ಲಿ ಇರಿಸಲು ಪರದೆ ಪಿನ್ನಿಂಗ್ ಅನ್ನು ನೀವು ಬಳಸಬಹುದು.\n\nಪರದೆ ಪಿನ್ನಿಂಗ್ ಬಳಸಲು:\n\n1. ಪರದೆ ಪಿನ್ನಿಂಗ್ ಆನ್ ಆಗಿದೆಯೆ ಎಂದು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.\n\n2. ನೀವು ಪಿನ್ ಮಾಡಲು ಬಳಸುವ ಪರದೆಯನ್ನು ತೆರೆಯಿರಿ.\n\n3. ಅವಲೋಕನ ಟ್ಯಾಪ್ ಮಾಡಿ.\n\n4. ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ ತದನಂತರ ಪಿನ್ ಐಕಾನ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"ಈ ಸೆಟ್ಟಿಂಗ್ ಆನ್ ಮಾಡಿದಾಗ, ಅನ್‌ಪಿನ್ ಮಾಡುವ ತನಕ ಪ್ರಸ್ತುತ ಪರದೆಯನ್ನು ವೀಕ್ಷಣೆಯಲ್ಲಿರಿಸಲು ಸ್ಕ್ರೀನ್‌ ಪಿನ್ನಿಂಗ್ ಅನ್ನು ಬಳಸಬಹುದು.\n\nಸ್ಕ್ರೀನ್‌ ಪಿನ್ನಿಂಗ್ ಬಳಸಲು:\n\n1. ಸ್ಕ್ರೀನ್‌ ಪಿನ್ನಿಂಗ್ ಆನ್ ಆಗಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ.\n\n2. ಪಿನ್ ಮಾಡಲು ಬಳಸುವ ಪರದೆಯನ್ನು ತೆರೆಯಿರಿ.\n\n3. ಅವಲೋಕನ ಟ್ಯಾಪ್ ಮಾಡಿ.\n\n4. ಮೇಲಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ, ಪಿನ್ ಐಕಾನ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ಅನ್‌ಪಿನ್ ಮಾಡಲು ಅನ್‌ಲಾಕ್ ಪ್ಯಾಟರ್ನ್ ಕೇಳು"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ಅನ್‌ಪಿನ್‌ ಮಾಡಲು ಪಿನ್‌ ಕೇಳು"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ಅನ್‌ಪಿನ್ ಮಾಡಲು ಪಾಸ್‌ವರ್ಡ್ ಕೇಳು"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ಪ್ರಸ್ತುತ ಓರಿಯಂಟೇಶನ್‌ನಲ್ಲಿ ಉಳಿಯಿರಿ"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ಸುರಕ್ಷಿತ ಆರಂಭ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ಮುಂದುವರಿಸು"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ಪಿನ್ ಸ್ವೀಕರಿಸುವ ಮೂಲಕ ಅದನ್ನು ಇನ್ನಷ್ಟು ಸುರಕ್ಷಿತಗೊಳಿಸಬಹುದು. ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ಸಾಧನವು ಎಚ್ಚರಿಕೆಗಳು ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಧಿಸೂಚನೆಗಳನ್ನಾಗಲೀ ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ. \n\nಇದು ಸಾಧನಗಳಲ್ಲಿನ ಕಳೆದುಹೋದ ಅಥವಾ ನಾಶವಾದ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"ನೀವು ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ನಿಮ್ಮ ನಮೂನೆಯನ್ನು ಪಡೆದುಕೊಳ್ಳುವ ಮೂಲಕ ಅದನ್ನು ಇನ್ನಷ್ಟು ರಕ್ಷಿಸಬಹುದು. ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವವರೆಗೂ, ಎಚ್ಚರಿಕೆಗಳು ಸೇರಿದಂತೆ ಇದು ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ. \n\nಇದು ಸಾಧನಗಳಲ್ಲಿನ ಕಳೆದುಹೋದ ಅಥವಾ ನಾಶವಾದ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"ನೀವು ಈ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವ ಮೊದಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್‌ ಅನ್ನು ಪಡೆದುಕೊಳ್ಳುವ ಮೂಲಕ ಅದನ್ನು ಇನ್ನಷ್ಟು ರಕ್ಷಿಸಬಹುದು. ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವವರೆಗೂ, ಎಚ್ಚರಿಕೆಗಳು ಸೇರಿದಂತೆ ಇದು ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸುವುದಿಲ್ಲ. \n\nಇದು ಸಾಧನಗಳಲ್ಲಿನ ಕಳೆದುಹೋದ ಅಥವಾ ನಾಶವಾದ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬೆರಳಚ್ಚಿನ ಜೊತೆಗೆ ಹೆಚ್ಚುವರಿಯಾಗಿ, ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವ ಮುನ್ನ ನಿಮ್ಮ ಪಿನ್ ಮೂಲಕ ಈ ಸಾಧನವನ್ನು ರಕ್ಷಿಸಿಕೊಳ್ಳಬಹುದು. ಈ ಸಾಧನ ಪ್ರಾರಂಭವಾಗುವವರೆಗೂ, ಇದು ಎಚ್ಚರಿಕೆಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\nಇದು ಕಳೆದುಹೋದ ಅಥವಾ ಕಳುವಾದ ಸಾಧನದಲ್ಲಿನ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"ನಿನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬೆರಳಚ್ಚಿನ ಜೊತೆಗೆ ಹೆಚ್ಚುವರಿಯಾಗಿ, ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವ ಮುನ್ನ ನಿಮ್ಮ ಪಿನ್ ಮೂಲಕ ಈ ಸಾಧನವನ್ನು ರಕ್ಷಿಸಿಕೊಳ್ಳಬಹುದು. ಈ ಸಾಧನ ಪ್ರಾರಂಭವಾಗುವವರೆಗೂ, ಇದು ಎಚ್ಚರಿಕೆಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\nಇದು ಕಳೆದುಹೋದ ಅಥವಾ ಕಳುವಾದ ಸಾಧನದಲ್ಲಿನ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಬೆರಳಚ್ಚಿನ ಜೊತೆಗೆ ಹೆಚ್ಚುವರಿಯಾಗಿ, ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವ ಮುನ್ನ ನಿಮ್ಮ ಪಿನ್ ಮೂಲಕ ಈ ಸಾಧನವನ್ನು ರಕ್ಷಿಸಿಕೊಳ್ಳಬಹುದು. ಈ ಸಾಧನ ಪ್ರಾರಂಭವಾಗುವವರೆಗೂ, ಇದು ಎಚ್ಚರಿಕೆಗಳನ್ನು ಒಳಗೊಂಡಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ.\n\nಇದು ಕಳೆದುಹೋದ ಅಥವಾ ಕಳುವಾದ ಸಾಧನದಲ್ಲಿನ ಡೇಟಾವನ್ನು ರಕ್ಷಿಸಲು ಸಹಾಯ ಮಾಡುತ್ತದೆ."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"ಸಾಧನ ಪ್ರಾರಂಭಿಸಲು ಪಿನ್‌ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"ಸಾಧನ ಪ್ರಾರಂಭಿಸಲು ಮಾದರಿ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"ಸಾಧನ ಪ್ರಾರಂಭಿಸಲು ಪಾಸ್‌ವರ್ಡ್ ಅಗತ್ಯವಿದೆ"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"ಧನ್ಯವಾದಗಳು"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"ಧನ್ಯವಾದಗಳು"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"ಧನ್ಯವಾದಗಳು"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು, ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ, ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನದಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ನಿಮ್ಮ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ಈ ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ಹೆಚ್ಚಿನ ಸಂರಕ್ಷಣೆ ನೀಡಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭವಾಗುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳು ಸೇರಿದಂತೆ ಕರೆಗಳನ್ನು, ಸಂದೇಶಗಳನ್ನು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ಸಹಾಯ ಮಾಡುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು, ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದು ಮಾತ್ರವಲ್ಲದೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ, ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ.\n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ಪಿನ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಗೊಳಿಸುವುದೇ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದರ ಜೊತೆಗೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ, ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನ ಪ್ರಾರಂಭಗೊಳ್ಳುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳೂ ಸೇರಿದಂತೆ ಯಾವುದೇ ಕರೆಗಳು, ಸಂದೇಶಗಳು, ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸಲು ವಿನ್ಯಾಸ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವುದೇ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ನಿಮ್ಮ ಸಾಧನವನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡಲು ನಿಮ್ಮ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಬಳಸುವುದು ಮಾತ್ರವಲ್ಲದೆ, ಸಾಧನ ಪ್ರಾರಂಭವಾಗಲು ನಿಮ್ಮ ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸುವ ಮೂಲಕ ಈ ಸಾಧನಕ್ಕೆ ನೀವು ಹೆಚ್ಚಿನ ಸುರಕ್ಷೆ ಒದಗಿಸಬಹುದು. ಸಾಧನವು ಪ್ರಾರಂಭವಾಗುವವರೆಗೆ ನೀವು ಅಲಾರ್ಮ್‌ಗಳು ಸೇರಿದಂತೆ ಕರೆಗಳು, ಸಂದೇಶಗಳು ಅಥವಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ಸ್ವೀಕರಿಸಲು ಸಾಧ್ಯವಾಗುವುದಿಲ್ಲ. \n\nಕಳೆದುಹೋಗಿರುವ ಅಥವಾ ಕಳವಾಗಿರುವ ಸಾಧನಗಳಲ್ಲಿರುವ ಡೇಟಾವನ್ನು ಸಂರಕ್ಷಿಸಲು ಇದು ನೆರವಾಗುತ್ತದೆ. ನಿಮ್ಮ ಸಾಧನವನ್ನು ಪ್ರಾರಂಭಿಸುವಾಗ, ಪಾಸ್‌ವರ್ಡ್ ನಮೂದಿಸುವುದನ್ನು ಆವಶ್ಯಕಗೊಳಿಸಿ&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ಹೌದು"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"ಇಲ್ಲ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ಅಗತ್ಯವಿದೆಯೇ?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿದೆಯೇ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ಪಾಸ್‌ವರ್ಡ್‌ ಅಗತ್ಯವಿದೆಯೇ?"</string>
@@ -3036,7 +3033,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"ವೈಯಕ್ತಿಕ"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"ಕೆಲಸ"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು: ಎಲ್ಲ"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು: ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"ಆಪ್‌ಗಳು: ಆಫ್ ಮಾಡಿದೆ"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"ವರ್ಗಗಳು: ತುರ್ತು ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"ವರ್ಗಗಳು: ಕಡಿಮೆ ಪ್ರಾಮುಖ್ಯತೆ"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"ವರ್ಗಗಳು: ಆಫ್ ಮಾಡಲಾಗಿದೆ"</string>
@@ -3115,7 +3112,7 @@
     <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"ಈ ಸಾಧನದ ಸಮಸ್ಯೆ ನಿವಾರಿಸುವುದಕ್ಕೆ ಸಹಾಯ ಮಾಡಲು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರು ಬಗ್‌ ವರದಿಯನ್ನು ವಿನಂತಿಸಿದ್ದಾರೆ. ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಹಂಚಿಕೊಳ್ಳಬಹುದು ಹಾಗೂ ನಿಮ್ಮ ಸಾಧನವು ತಾತ್ಕಾಲಿಕವಾಗಿ ನಿಧಾನಗೊಳ್ಳಬಹುದು."</string>
     <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"ಈ ಬಗ್‌ ವರದಿಯನ್ನು ನಿಮ್ಮ IT ನಿರ್ವಾಹಕರ ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಲಾಗುತ್ತಿದೆ. ಹೆಚ್ಚಿನ ವಿವರಗಳಿಗಾಗಿ ಅವರನ್ನು ಸಂಪರ್ಕಿಸಿ."</string>
     <string name="share_remote_bugreport_action" msgid="532226159318779397">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
-    <string name="decline_remote_bugreport_action" msgid="518720235407565134">"ನಿರಾಕರಿಸು"</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>
     <string name="usb_use_power_only" msgid="6426550616883919530">"ಪವರ್ ಪೂರೈಕೆ"</string>
@@ -3153,12 +3150,12 @@
     <string name="sort_max_use" msgid="4629247978290075124">"ಗರಿಷ್ಠ ಬಳಕೆ ಪ್ರಕಾರವಾಗಿ ವಿಂಗಡಿಸಿ"</string>
     <string name="memory_performance" msgid="5661005192284103281">"ಕಾರ್ಯಕ್ಷಮತೆ"</string>
     <string name="total_memory" msgid="2017287600738630165">"ಒಟ್ಟು ಮೆಮೊರಿ"</string>
-    <string name="average_used" msgid="5338339266517245782">"ಬಳಸಿದ ಸರಾಸರಿ (%)"</string>
+    <string name="average_used" msgid="5338339266517245782">"ಸರಾಸರಿ ಬಳಕೆ (%)"</string>
     <string name="free_memory" msgid="4003936141603549746">"ಲಭ್ಯವಿರುವುದು"</string>
     <string name="memory_usage_apps" msgid="5650192998273294098">"ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಬಳಸಿರುವ ಮೆಮೊರಿ"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
-      <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>
+      <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="memory_maximum_usage" msgid="6513785462055278341">"ಗರಿಷ್ಠ ಬಳಕೆ"</string>
@@ -3190,10 +3187,10 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ಅನುಮತಿಯೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"ಹೌದು"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"ಇಲ್ಲ"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"ಅಪರಿಚಿತ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಿ"</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>
+    <string name="keywords_write_settings" msgid="6415597272561105138">"ಸಿಸ್ಟಂ‌ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಿ ಬರೆಯಿರಿ"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_1">%2$d</xliff:g> ರಲ್ಲಿ <xliff:g id="COUNT_0">%1$d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು ಅನುಮತಿಸಿದೆ"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳನ್ನು ಸ್ಥಾಪಿಸಬಹುದು"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ಮಾರ್ಪಡಿಸಬಹುದು"</string>
@@ -3204,14 +3201,14 @@
     <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_trusted" msgid="6857780460845250885">"ಹೌದು"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"ಇಲ್ಲ"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"ಅಪ್ಲಿಕೇಶನ್ ಸ್ಥಾಪಿಸಲು ಅನುಮತಿಸಿ"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"ಅನುಮತಿಸಲಾಗಿದೆ"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"ಅನುಮತಿಸಲಾಗುವುದಿಲ್ಲ"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ಕ್ಯಾಮರಾಗೆ ಪವರ್ ಬಟನ್ ಎರಡು ಬಾರಿ ಒತ್ತಿ"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"ನಿಮ್ಮ ಪರದೆಯನ್ನು ಅನ್‌ಲಾಕ್ ಮಾಡದೆಯೇ ಕ್ಯಾಮರಾವನ್ನು ತ್ವರಿತವಾಗಿ ತೆರೆಯಿರಿ"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"ಪ್ರದರ್ಶನ ಗಾತ್ರ"</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_summary" msgid="6445488991799015407">"ಪರದೆಯ ಮೇಲಿನ ಐಟಂಗಳನ್ನು ಸಣ್ಣದು ಅಥವಾ ದೊಡ್ಡದಾಗಿ ಮಾಡಿ. ನಿಮ್ಮ ಪರದೆಯ ಮೇಲಿರುವ ಕೆಲವು ಅಪ್ಲಿಕೇಶನ್‌ಗಳ ಸ್ಧಳ ಬದಲಾಗುಬಹುದು."</string>
@@ -3262,7 +3259,7 @@
     <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಬಳಕೆದಾರರಿಗೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="admin_device_owner_message" msgid="6232893638259790789">"ನಿಮ್ಮ ನಿರ್ವಾಹಕರು ಸೆಟ್ಟಿಂಗ್‌ಗಳು, ಅನುಮತಿಗಳು, ಕಾರ್ಪೊರೇಟ್‌ ಪ್ರವೇಶ, ನೆಟ್‌ವರ್ಕ್‌ ಚಟುವಟಿಕೆ ಮತ್ತು ಸಾಧನದ ಸ್ಥಳ ಮಾಹಿತಿಯನ್ನು ಒಳಗೊಂಡಂತೆ ಈ ಸಾಧನಕ್ಕೆ ಸಂಬಂಧಿಸಿದ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು ಮತ್ತು ಡೇಟಾವನ್ನು ಮೇಲ್ವಿಚಾರಣೆ ಮಾಡಬಹುದು ಮತ್ತು ನಿರ್ವಹಿಸಬಹುದು."</string>
     <string name="condition_turn_off" msgid="1960945836880080298">"ಆಫ್ ಮಾಡು"</string>
-    <string name="condition_turn_on" msgid="9089876276117874591">"ಆನ್ ಮಾಡು"</string>
+    <string name="condition_turn_on" msgid="9089876276117874591">"ಆನ್‌ ಮಾಡಿ"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"ತೋರಿಸು"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"ಮರೆಮಾಡು"</string>
     <string name="condition_hotspot_title" msgid="7778958849468560027">"ಹಾಟ್‌ಸ್ಪಾಟ್ ಆನ್ ಆಗಿದೆ"</string>
@@ -3379,7 +3376,7 @@
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ಅಪ್ಲಿಕೇಶನ್‌ಗಳು, ಅನಿರ್ಬಂಧಿತ ಡೇಟಾ ಬಳಸಬಹುದು</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"ನಿಜವಾಗಿಯೂ ಬಳಕೆದಾರ ಡೇಟಾವನ್ನು ಅಳಿಸಿ ಫೈಲ್ ಎನ್‌ಕ್ರಿಪ್ಶನ್‌ಗೆ ಪರಿವರ್ತಿಸುವುದೇ?"</string>
-    <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"ಅಳಿಸು ಮತ್ತು ಪರಿವರ್ತಿಸು"</string>
+    <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>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"ಇದಕ್ಕೆ ಸಂಪರ್ಕಪಡಿಸಲಾಗಿದೆ"</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>
@@ -3413,13 +3411,13 @@
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"ಸಲಹೆಗಳು ಮತ್ತು ತಂತ್ರಗಳನ್ನು ಎಕ್ಸ್‌ಪ್ಲೋರ್ ಮಾಡಿ"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"ಸಹಾಯ ಹುಡುಕಾಟ ಮತ್ತು ಪ್ರತಿಕ್ರಿಯೆ ಕಳುಹಿಸಿ"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"ಸಂಪರ್ಕ ಬೆಂಬಲ"</string>
-    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ಸೈನ್ ಇನ್ ಮಾಡು"</string>
+    <string name="support_sign_in_button_text" msgid="3054769428620671241">"ಸೈನ್‌ ಇನ್‌"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"ಸೈನ್ ಇನ್ ಆಗಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲವೇ?"</string>
     <string name="support_disclaimer_title" msgid="4825302018208770031">"ಸಿಸ್ಟಂ ಮಾಹಿತಿಯನ್ನು ಕಳುಹಿಸಿ"</string>
     <string name="support_disclaimer_do_not_show" msgid="3378367075323727539">"ಮತ್ತೆ ತೋರಿಸಬೇಡ"</string>
     <string name="support_account_request_prefix" msgid="6387847874661861650">"ಇದರಂತೆ ವಿನಂತಿಸಲಾಗುತ್ತಿದೆ"</string>
     <string name="support_account_picker_add_account" msgid="5076277544846506214">"ಖಾತೆ ಸೇರಿಸಿ"</string>
-    <string name="support_system_information_title" msgid="3439905790018934773">"ಸಿಸ್ಟಮ್ ಮಾಹಿತಿ"</string>
+    <string name="support_system_information_title" msgid="3439905790018934773">"ಸಿಸ್ಟಂ ಮಾಹಿತಿ"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"ಕೆಲಸದ ಪ್ರೊಫೈಲ್ ಸೆಟ್ಟಿಂಗ್‌ಗಳು"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"ಸಂಪರ್ಕ ಹುಡುಕಿ"</string>
     <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"ಕರೆದಾತರು ಮತ್ತು ಸಂಪರ್ಕಗಳನ್ನು ಗುರುತಿಸಲು ನಿಮ್ಮ ಸಂಸ್ಥೆಯ ಮೂಲಕ ಸಂಪರ್ಕ ಹುಡುಕಾಟಗಳಿಗೆ ಅನುಮತಿಸಿ"</string>
@@ -3462,16 +3460,16 @@
     <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="2521630136233865893">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ತ್ವರಿತವಾಗಿ ಪರೀಕ್ಷಿಸಲು, ನಿಮ್ಮ ಪರದೆಯ ಮೇಲೆ ಡಬಲ್ ಟ್ಯಾಪ್ ಮಾಡಿ."</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_title" product="device" msgid="5380534405773531175">"ಸಾಧನ ಪರಿಶೀಲಿಸಲು ಕೈಗೆತ್ತಿಕೊಳ್ಳಿ"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ತ್ವರಿತವಾಗಿ ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಫೋನ್ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ತ್ವರಿತವಾಗಿ ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಟ್ಯಾಬ್ಲೆಟ್ ತೆಗೆದುಕೊಳ್ಳಿ."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"ತ್ವರಿತವಾಗಿ ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸಾಧನವನ್ನು ತೆಗೆದುಕೊಳ್ಳಿ."</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_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>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"ಅಧಿಸೂಚನೆಗಳನ್ನು ಪರಿಶೀಲಿಸಲು, ನಿಮ್ಮ ಸಾಧನದ ಹಿಂಭಾಗದಲ್ಲಿನ ಬೆರಳಚ್ಚು ಸೆನ್ಸರ್‌ನಲ್ಲಿ ಕೆಳಕ್ಕೆ ಸ್ವೈಪ್ ಮಾಡಿ."</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>
@@ -3565,7 +3563,7 @@
     <string name="app_names_concatenation_template_3" msgid="8949045544491604376">"<xliff:g id="FIRST_APP_NAME">%1$s</xliff:g>, <xliff:g id="SECOND_APP_NAME">%2$s</xliff:g>, <xliff:g id="THIRD_APP_NAME">%3$s</xliff:g>"</string>
     <string name="storage_photos_videos" msgid="319854636702241898">"ಫೋಟೋಗಳು ಮತ್ತು ವೀಡಿಯೊಗಳು"</string>
     <string name="storage_music_audio" msgid="789779084825206838">"ಸಂಗೀತ ಮತ್ತು ಆಡಿಯೋ"</string>
-    <string name="storage_games" msgid="7703159201697117621">"ಆಟಗಳು"</string>
+    <string name="storage_games" msgid="7703159201697117621">"ಗೇಮ್‌ಗಳು"</string>
     <string name="storage_other_apps" msgid="5524321740031718083">"ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳು"</string>
     <string name="storage_files" msgid="8581083146777364063">"ಫೈಲ್‌ಗಳು"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ಟ್ಯಾಬ್ಲೆಟ್ ಸಂಗ್ರಹಣೆ"</string>
@@ -3575,13 +3573,13 @@
     <string name="storage_percent_full" msgid="6095012055875077036">"ಬಳಕೆಯಾದ"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"ಅಪ್ಲಿಕೇಶನ್ ತೆರವುಗೊಳಿಸಿ"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ಈ ತತ್‌ಕ್ಷಣ ಅಪ್ಲಿಕೇಶನ್ ತೆಗೆದುಹಾಕಲು ಬಯಸುವಿರಾ?"</string>
-    <string name="game_storage_settings" msgid="3410689937046696557">"ಆಟಗಳು"</string>
+    <string name="game_storage_settings" msgid="3410689937046696557">"ಗೇಮ್‌ಗಳು"</string>
     <string name="audio_files_title" msgid="4777048870657911307">"ಆಡಿಯೋ ಫೈಲ್‌ಗಳು"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ಅಸ್ಥಾಪಿಸಲಾಗಿದೆ)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> ಬಳಕೆದಾರರಿಗೆ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ಸ್ವಯಂತುಂಬುವಿಕೆ ಸೇವೆ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ಸ್ವಯಂ, ತುಂಬುವಿಕೆ, ಸ್ವಯಂತುಂಬುವಿಕೆ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"ನಿಮ್ಮ ಸ್ವಯಂತುಂಬಿಕೆ ಅಪ್ಲಿಕೇಶನ್ ಆಗಿ <xliff:g id="APP_NAME_0">%1$s</xliff:g> ಅನ್ನು ಮಾಡಬೇಕೆ? ನಿಮ್ಮ ಪರದೆಯನ್ನು ಓದಲು ಮತ್ತು ಇತರ ಅಪ್ಲಿಕೇಶನ್‌ಗಳಲ್ಲಿ ಫೀಲ್ಡ್‌ಗಳನ್ನು ತುಂಬಲು <xliff:g id="APP_NAME_1">%1$s</xliff:g> ಗೆ ಸಾಧ್ಯವಾಗುತ್ತದೆ."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ನಿಮಗೆ ಈ ಅಪ್ಲಿಕೇಶನ್ ಮೇಲೆ ವಿಶ್ವಾಸವಿರುವುದನ್ನು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಿ &lt;/b&gt; &lt;br/&gt; &lt;br/&gt; ಯಾವ ಕ್ಷೇತ್ರಗಳನ್ನು ಸ್ವಯಂ-ಭರ್ತಿ ಮಾಡಬಹುದು ಎಂಬುದನ್ನು ನಿರ್ಧರಿಸಲು &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ನಿಮ್ಮ ಪರದೆಯಲ್ಲಿರುವ ಮಾಹಿತಿಯನ್ನು ಬಳಸಿಕೊಳ್ಳುತ್ತದೆ."</string>
     <string name="device_theme" msgid="4571803018917608588">"ಸಾಧನದ ಥೀಮ್‌"</string>
     <string name="default_theme" msgid="7085644992078579076">"ಡಿಫಾಲ್ಟ್"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ಸಂಗ್ರಹಣಾ ನಿರ್ವಾಹಕ: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index dc961c1..52d8d59 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"없음"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"없음"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ff92a08..b396aa8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"계정"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"위치"</string>
     <string name="account_settings_title" msgid="626177544686329806">"계정"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"보안 및 위치 정보"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"암호화 및 사용자 인증 정보"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"휴대전화 암호화됨"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"휴대전화 암호화됨"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"잠금 화면 환경설정"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"개인정보 보호"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"관리자가 사용 중지함"</string>
     <string name="security_status_title" msgid="5848766673665944640">"보안 상태"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"지문 관리"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"지문을 사용할 항목"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi 검색이 사용 중지되어 사용할 수 없습니다."</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"서브넷 마스크"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 주소"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"저장된 네트워크"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP 설정"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"이 사용자는 Wi‑Fi 고급 설정을 사용할 수 없습니다."</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"사용 안함"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"휴대전화가 도킹 또는 절전 모드일 때 작동 방식을 조정하려면 화면 보호기를 사용 설정합니다."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"시작 시간"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"현재 화면 보호기"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"시작하기"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"설정"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"기기를 들어 대기 모드 해제"</string>
-    <string name="doze_title" msgid="5389406335828323273">"수신 알림 화면"</string>
+    <string name="doze_title" msgid="2259176504273878294">"절전 모드 자동 해제"</string>
     <string name="doze_summary" msgid="3846219936142814032">"알림을 수신하면 절전 모드를 해제합니다."</string>
     <string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"텍스트를 확대 또는 축소"</string>
@@ -1347,7 +1344,7 @@
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"<xliff:g id="MAXCONNECTION">%1$d</xliff:g>개의 기기까지만 테더링 사용 가능"</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> 기기의 테더링이 끊깁니다."</string>
     <string name="tethering_footer_info" msgid="7287131664937054043">"핫스팟 및 테더링을 사용하여 다른 기기에서 내 모바일 데이터 연결을 통해 인터넷을 사용할 수 있도록 합니다."</string>
-    <string name="tethering_help_button_text" msgid="656117495547173630">"도움말"</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="sms_application_title" msgid="4903928270533250448">"SMS 앱"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(사용 안 함)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"키보드 단축키 도우미"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"사용할 수 있는 단축키 표시"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"기본"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"마우스/트랙패드"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"포인터 속도"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"게임 컨트롤러"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"진동 사용"</string>
@@ -1759,7 +1756,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"접근성"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"접근성 설정"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"스크린 리더, 디스플레이, 상호작용 컨트롤"</string>
-    <string name="vision_settings_title" msgid="4204111425716868288">"시력 설정"</string>
+    <string name="vision_settings_title" msgid="4204111425716868288">"보기 설정"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"필요에 따라 기기를 맞춤설정할 수 있습니다. 다음 접근성 기능은 언제든지 설정에서 변경할 수 있습니다."</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"스크린 리더"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"오디오 및 화면에 있는 텍스트"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"충전 완료 후 화면 사용"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"화면 소비 전력"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"모바일 네트워크 검색"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> 전"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"충전 완료(<xliff:g id="TIME">%1$s</xliff:g> 전) 후 앱 사용"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> 전"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"충전 완료(<xliff:g id="TIME">^1</xliff:g> 전) 후 앱 사용"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"충전 완료 후 화면이 켜진 시간"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"충전 완료 후 기기 사용"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"플러그를 뽑은 이후 배터리 전원 사용"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"카메라"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"블루투스"</string>
-    <string name="power_cell" msgid="6596471490976003056">"대기 소모 전력"</string>
+    <string name="power_cell" msgid="3392999761958982492">"모바일 네트워크 대기"</string>
     <string name="power_phone" msgid="5392641106474567277">"음성 통화"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"유휴 상태 태블릿"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"휴대전화 유휴 상태"</string>
@@ -2007,11 +2004,11 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"배터리 사용량은 대략적으로 계산한 전원 사용량이며 모든 배터리 소모 요인이 포함되지는 않습니다. 기타 전원 사용량은 대략 계산한 전원 사용량과 배터리에서 관찰된 실제 소모량 사이의 차이입니다."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"전력 사용량 과다 산정됨"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s 동안 사용"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> 사용됨"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>에서 <xliff:g id="PERCENT">%1$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_last_full_charge" msgid="7151251641099019361">"마지막 충전 완료"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"남은 배터리 사용 시간은 대략적인 수치이며, 사용량에 따라 변경될 수 있습니다."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"연속사용 중일 때"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"백그라운드에 있을 때"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"음성 입력 &amp; 출력 설정"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"음성 검색"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android 키보드"</string>
-    <string name="voice_category" msgid="1430370497125803904">"음성"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"음성 입력 설정"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"음성 입력"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"음성 입력 서비스"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"알림 볼륨"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"기본 알림 소리"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"앱에서 제공된 소리"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"기본 알림 소리"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"기본 알람 소리"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"전화 올 때 벨소리와 함께 진동"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"기타 소리"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"알림 표시 안함"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"낮음: 소리나 시각적인 방해 없음"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"중간: 소리 안 남"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"높음: 소리로 알림"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"긴급: 소리 및 화면 표시로 알림"</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="6585849855452076626">"소리 허용"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"현재 화면에서 소리, 진동, 알림 표시를 허용하지 않습니다."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"알림 어시스턴트"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"알림 일시중지 액세스"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"설치된 앱 중에서 알림 일시중지 액세스를 요청한 앱이 없습니다."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android에서 기기에 이 앱의 알림이 표시되지 않도록 차단하고 있습니다."</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android에서 기기에 이 카테고리의 알림이 표시되지 않도록 차단하고 있습니다."</string>
     <string name="notification_channels" msgid="5346841743182627500">"카테고리"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"기타"</string>
     <string name="no_channels" msgid="3077375508177744586">"이 앱에서 게시한 알림이 없음"</string>
@@ -2920,7 +2921,7 @@
     <string name="zen_mode_all_callers" msgid="584186167367236922">"모든 발신자"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"선택한 발신자"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"반복 발신자"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g>분 이내에 같은 사람이 다시 전화를 걸면 통화를 허용합니다."</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g>분 이내에 같은 사람이 다시 전화를 걸면 알림을 허용합니다."</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"자동 사용 설정"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"사용 안함"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"매일 밤"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"현재 방향 유지"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"안전한 시작"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"계속"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"기기를 시작할 때 PIN을 입력하도록 설정하면 기기를 보호할 수 있습니다. 기기가 시작되기 전까지 전화, 메시지 및 알람을 포함한 알림을 받을 수 없게 됩니다. \n\n이를 통해 분실 또는 도난된 기기에서 데이터를 보호할 수 있습니다."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"기기를 시작할 때 패턴을 입력하도록 설정하면 기기를 보호할 수 있습니다. 기기가 시작되기 전까지 전화, 메시지 및 알람을 포함한 알림을 받을 수 없게 됩니다. \n\n이를 통해 분실 또는 도난된 기기에서 데이터를 보호할 수 있습니다."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"기기를 시작할 때 비밀번호를 입력하도록 설정하면 기기를 보호할 수 있습니다. 기기가 시작되기 전까지 전화, 메시지 및 알람을 포함한 알림을 받을 수 없게 됩니다. \n\n이를 통해 분실 또는 도난된 기기에서 데이터를 보호할 수 있습니다."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"기기의 잠금을 해제하는 데 지문을 사용하는 것뿐만 아니라 기기 시작 전에 PIN을 입력하도록 하여 보안 단계를 추가할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지, 알림(예: 알람)을 받을 수 없습니다.\n\n분실 또는 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"기기의 잠금을 해제하는 데 지문을 사용하는 것뿐만 아니라 기기 시작 전에 패턴을 입력하도록 하여 보안 단계를 추가할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지, 알림(예: 알람)을 받을 수 없습니다.\n\n분실 또는 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"기기의 잠금을 해제하는 데 지문을 사용하는 것뿐만 아니라 기기 시작 전에 비밀번호를 입력하도록 하여 보안 단계를 추가할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지, 알림(예: 알람)을 받을 수 없습니다.\n\n분실 또는 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"기기 시작 시 PIN 요청"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"기기 시작 시 패턴 요청"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"기기 시작 시 비밀번호 요청"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"요청 안함"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"요청 안함"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"요청 안함"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다. \n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"기기가 시작되기 전에 패턴을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다. \n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 패턴을 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다. \n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 PIN을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 PIN을 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 패턴을 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 패턴을 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"지문을 사용하여 기기를 잠금 해제하는 방법 외에도 기기가 시작되기 전에 비밀번호를 입력하도록 설정하여 기기를 더욱 안전하게 보호할 수 있습니다. 기기가 시작되기 전에는 전화, 메시지 또는 알람을 포함한 알림을 받을 수 없습니다.\n\n이렇게 하면 분실하거나 도난당한 기기의 데이터를 보호하는 데 도움이 됩니다. 기기가 시작되기 전에 비밀번호를 입력하도록 설정하시겠습니까?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"예"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"아니요"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN이 필요한가요?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"패턴이 필요한가요?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"비밀번호가 필요한가요?"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"예"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"아니요"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"앱 설치 허용"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"허용됨"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"허용되지 않음"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"전원 버튼을 두 번 눌러 카메라 열기"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"연결된 기기"</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">"Google로부터 지원받기"</string>
@@ -3569,7 +3567,7 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"기타 앱"</string>
     <string name="storage_files" msgid="8581083146777364063">"파일"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"태블릿 저장용량"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"휴대전화 저장공간"</string>
+    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"휴대전화 저장용량"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>"<xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"/<xliff:g id="TOTAL">%1$s</xliff:g> 사용"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"사용됨"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>님의 경우 사용 안함)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"자동완성 서비스"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"자동, 완성, 자동완성"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>을(를) 자동완성 앱으로 설정하시겠습니까? <xliff:g id="APP_NAME_1">%1$s</xliff:g>에서 화면의 내용을 읽고 다른 앱의 입력란을 완성할 수 있게 됩니다."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;이 앱을 신뢰할 수 있는지 확인하세요.&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;에서는 자동완성할 수 있는 항목을 결정하기 위해 화면의 내용을 사용합니다."</string>
     <string name="device_theme" msgid="4571803018917608588">"기기 테마"</string>
     <string name="default_theme" msgid="7085644992078579076">"기본값"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"저장용량 관리자: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index da053d2..f711e95 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Эч бири"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM-карта"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Эч бири"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -384,7 +386,7 @@
     <item msgid="2372711992605524591">"Узун"</item>
   </string-array>
   <string-array name="captioning_typeface_selector_titles">
-    <item msgid="1319652728542138112">"Абалкы"</item>
+    <item msgid="1319652728542138112">"Демейки"</item>
     <item msgid="1016452621833735880">"Санс-сериф"</item>
     <item msgid="2496277987934654454">"коюлтулган Санс-сериф"</item>
     <item msgid="7247838127505318669">"Sans-serif бир орундуу"</item>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 6b07ce3..6d31743 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -239,7 +239,7 @@
     <string name="language_picker_title" msgid="3596315202551687690">"Тилдер"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Тил тандоо"</string>
     <string name="locale_remove_menu" msgid="7651301406723638854">"Алып салуу"</string>
-    <string name="add_a_language" msgid="2330538812283783022">"Тилди кошуңуз"</string>
+    <string name="add_a_language" msgid="2330538812283783022">"Тил кошуу"</string>
     <plurals name="dlg_remove_locales_title" formatted="false" msgid="4276642359346122396">
       <item quantity="other">Тандалган тилдер алынып салынсынбы?</item>
       <item quantity="one">Тандалган тил алынып салынсынбы?</item>
@@ -274,14 +274,14 @@
     <string name="radio_controls_title" msgid="3447085191369779032">"Дагы"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Зымсыз тармактар"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi‑Fi, Bluetooth, учак тартибин, мобилдик түйүндөрдү жана VPN\'дерди башкаруу"</string>
-    <string name="cellular_data_title" msgid="6835451574385496662">"Мобилдик дайындар"</string>
+    <string name="cellular_data_title" msgid="6835451574385496662">"Мобилдик Интернет"</string>
     <string name="calls_title" msgid="3544471959217176768">"Чалуулар"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"SMS билдирүүлөр"</string>
     <string name="cellular_data_summary" msgid="4660351864416939504">"Дайындар моб. тармак аркылуу өткөрүлсүн"</string>
     <string name="allow_data_usage_title" msgid="2238205944729213062">"Роуминг учурунда дайындарды пайдаланууга уруксат берүү"</string>
     <string name="roaming" msgid="3596055926335478572">"Интернет роуминг"</string>
-    <string name="roaming_enable" msgid="3737380951525303961">"Роуминг учурунда мобилдик интернетке туташтырылсын"</string>
-    <string name="roaming_disable" msgid="1295279574370898378">"Роуминг учурунда мобилдик интернетке туташтырылсын"</string>
+    <string name="roaming_enable" msgid="3737380951525303961">"Роуминг учурунда мобилдик Интернетке туташат"</string>
+    <string name="roaming_disable" msgid="1295279574370898378">"Роуминг учурунда мобилдик Интернетке туташат"</string>
     <string name="roaming_reenable_message" msgid="9141007271031717369">"Жергиликтүү тармагыңыздан интернет-роуминг өчүрүлгөн абалда кеткендиктен Интернет туташуусун жоготтуңуз."</string>
     <string name="roaming_turn_it_on_button" msgid="4387601818162120589">"Аны күйгүзүү"</string>
     <string name="roaming_warning" msgid="4275443317524544705">"Бир топ чыгымдарга дуушар болуп калышыңыз мүмкүн."</string>
@@ -294,11 +294,11 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Күн жана убакытын коюу"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Датаны, убакытты, саат алкагын, жана форматтарды тууралоо"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Тармактагы күн жана убакыт"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Тармактын убакыты колдонулсун"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Тармактын убакыты колдонулсун"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Тармактын убакыты колдонулат"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Тармактын убакыты колдонулат"</string>
     <string name="zone_auto" msgid="334783869352026648">"Убакыт алкагын авто-аныктоо"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Тармактан алынган убакыт алкагы колдонулсун"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Тармактан алынган убакыт алкагы колдонулсун"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Тармактын убакыт алкагы колдонулат"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Тармактын убакыт алкагы колдонулат"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"24 сааттык формат"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"24 сааттык форматты колдонуу"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Убакыт"</string>
@@ -316,7 +316,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> тарабынан кулпусу ачык калтырылгандан башка убакта, уктагандан кийин дароо"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="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>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Кулпу экран билдрсү"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Кулпу экрндгы текст"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Виджеттерди жандыруу"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Администратор өчүрүп койгон"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Эч бири"</string>
@@ -328,20 +328,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Каттоо эсептери"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Жайгашкан жер"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Каттоо эсептери"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Коопсуздук жана жайгашкан жер"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрлөө жана эсептик дайындар"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Телефон шифрленген"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Кулпуланган экрандын жеке жөндөөлөрү"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон шифрленген"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Кулпу экранынын жөндөөлөрү"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Жайгашкан жеримди, экрандын кулпусун ачуу ыкмасын, SIM карта кулпусун, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Жайгашкан жеримди, экран кулпусун ачууну, аныктоо эстутумунун кулпусун коюу"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Купуялык"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Администратор өчүрүп койгон"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Коопсуздук абалы"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Манжа издерин башкаруу"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Манжа издерин колдонуу"</string>
@@ -473,7 +472,7 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Манжа изи + PIN код"</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="fingerprint_unlock_title" msgid="2826226740306003991">"Телефонуңуздун кулпусун манжаңыздын изи менен ачсаңыз болот. Коопсуздук максатында кулпуну ачуунун дагы бир ыкмасын тандап коюңуз."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Администратор же башка эрежелер б-ча тыюу салынган"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Жок"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Экранды сүрүү"</string>
@@ -572,8 +571,8 @@
     <string name="manage_device_admin" msgid="537804979483211453">"Түзмөктү башкарган колдонмолор"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Активдүү колдонмолор жок"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> жигердүү колдонмо</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> жигердүү колдонмо</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> колдонмо иштеп жатат</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> колдонмо иштеп жатат</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Ишеним агенттери"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Алгач экранды кулпулоо ыкмасын тандаңыз"</string>
@@ -647,9 +646,9 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Катуу сүйлөткүч телефон катары"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Музыка жана медиа үчүн"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Жөндөөлөрдү эстеп калуу"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Тандалгандар"</string>
+    <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_no_devices_found" msgid="1382012407154143453">"Жакын жерден бир дагы түзмөк табылган жок."</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>
@@ -666,15 +665,15 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> бул түзмөктө WiFi\'ды өчүргөнү жатат"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</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_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 Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Колдонмо мазмунун NFC аркылуу өткөргөнгө даяр"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Дайындар NFC аркылуу өткөрүлөт"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Өчүк"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC өчүк болгондуктан жеткиликсиз"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Бул мүмкүнчүлүк жандырылганда, сиз түзмөктөрдү бири-бирине жакын кармап, NFC аркылуу колдонмонун мазмунун башка түзмөккө өткөрө аласыз. Мисалы, веб баракчаларды, YouTube видеолорун, байланыштар жана башка нерселерди өткөрө аласыз.\n\nТүзмөктөрдү жакын кармаңыз да (арт жактарын тийгизип), экраныңызды таптап коюңуз. Эмне өткөрүлөөрүн колдонмо өзү аныктайт."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Бул мүмкүнчүлүк жандырылганда, түзмөктөрдү бири-бирине тийиштирип, NFC аркылуу веб баракчалар, YouTube видеолору, байланыштар, шилтемелер, сүрөттөр сыяктуу дайындарды биринен экинчисине өткөрө аласыз.\n\nТүзмөктөрдү бири-бирине тийиштирип (арка жактарын), экраныңызды басып коюңуз. Эмне өткөрүлөөрүн колдонмо өзү аныктай алат."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi\'ды жандыруу"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -687,15 +686,16 @@
     <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">"Байланыш сигналы жакшы болгон cакталган тармактарга (мисалы, үйүңүздөгү туташуу түйүнүнө) жакындаганда, 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_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" msgid="2982091714252931713">"Байланыш сигналы жакшы болгон жалпыга ачык тармактарга автоматтык түрдө туташат"</string>
     <string name="wifi_install_credentials" msgid="3551143317298272860">"Сертификаттарды орнотуу"</string>
     <string name="wifi_scan_notify_text" msgid="5593805423071186757">"Кандайдыр бир жерди тагыраак аныктоо үчүн, тутум колдонмолору жана кызматтар жакын арадагы Bluetooth тармактарын издей берет. Бул функцияны <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">"Кандайдыр бир жерди тагыраак аныктоо үчүн <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>издөө жөндөөлөрүнөн<xliff:g id="LINK_END_1">LINK_END</xliff:g> Wi-Fi тармактарын издөө дегенди күйгүзүңүз."</string>
@@ -717,8 +717,8 @@
     <string name="wifi_access_points" msgid="7053990007031968609">"Wi‑Fi түйүндөрү"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push баскычы"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Көбүрөөк мүмкүнчүлүктөр"</string>
-    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS Pin киргизүү"</string>
-    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Дайрект"</string>
+    <string name="wifi_menu_wps_pin" msgid="6426448256268695933">"WPS PIN кодун киргизүү"</string>
+    <string name="wifi_menu_p2p" msgid="7619851399250896797">"Wi‑Fi Direct"</string>
     <string name="wifi_menu_scan" msgid="1470911530412095868">"Скандоо"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Өркүндөтүлгөн"</string>
     <string name="wifi_menu_configure" msgid="6150926852602171938">"Конфигурациялоо"</string>
@@ -802,7 +802,7 @@
     <string name="wifi_failed_forget_message" msgid="1348172929201654986">"Түйүн унутулган жок"</string>
     <string name="wifi_save" msgid="3331121567988522826">"Сактоо"</string>
     <string name="wifi_failed_save_message" msgid="6650004874143815692">"Түйүн сакталган жок"</string>
-    <string name="wifi_cancel" msgid="6763568902542968964">"Жокко чыгаруу"</string>
+    <string name="wifi_cancel" msgid="6763568902542968964">"Жок"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"Сакталган тармактар"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
       <item quantity="other">%d тармак</item>
@@ -812,11 +812,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Тармак бөлүктөрүнүн маскасы"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 даректери"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Сакталган тармактар"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP жөндөөлөрү"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Бул колдонуучу үчүн Wi‑Fi өздөштүрүлгөн жөндөөлөрү жеткиликсиз"</string>
@@ -830,7 +828,7 @@
     <string name="wifi_dns2" msgid="1368601006824882659">"DNS 2"</string>
     <string name="wifi_gateway" msgid="163914742461092086">"Шлюз"</string>
     <string name="wifi_network_prefix_length" msgid="3028785234245085998">"Тармак префиксинин узуну"</string>
-    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Дайрект"</string>
+    <string name="wifi_p2p_settings_title" msgid="5444461191435291082">"Wi‑Fi Direct"</string>
     <string name="wifi_p2p_device_info" msgid="3191876744469364173">"Түзмөк тууралуу"</string>
     <string name="wifi_p2p_persist_network" msgid="1646424791818168590">"Бул туташууну эстеп калуу"</string>
     <string name="wifi_p2p_menu_search" msgid="3436429984738771974">"Түзмөктөрдү издөө"</string>
@@ -846,19 +844,19 @@
     <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_tether_checkbox_text" msgid="1847167643625779136">"Көчмө Wi‑Fi туташуу түйүнү"</string>
+    <string name="wifi_hotspot_checkbox_text" msgid="7763495093333664887">"Wi‑Fi туташуу түйүнү"</string>
     <string name="wifi_hotspot_checkbox_text_summary" msgid="5347703013899354452">"Wi‑Fi тармагын бөлүшүү үчүн мобилдик байланышты пайдалануу"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Планшеттин Интернети туташуу чекити аркылуу бөлүшүлгөн жок"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Телефондун Интернети туташуу чекити аркылуу бөлүшүлгөн жок"</string>
+    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Планшеттин Интернети туташуу түйүнү аркылуу бөлүшүлгөн жок"</string>
+    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Телефондун Интернети туташуу түйүнү аркылуу бөлүшүлгөн жок"</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">"Көчмө Wi‑Fi хотспоттун катасы"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi хотспотту тууралоо"</string>
+    <string name="wifi_tether_failed_subtext" msgid="1484941858530919002">"Көчмө Wi‑Fi түйүнүнө туташууда ката кетти"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi‑Fi туташуу түйүнүн жөндөө"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"Wi‑Fi туташуу чекитин орнотуу"</string>
-    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK туташуу чекити"</string>
-    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> туташуу чекити"</string>
+    <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK туташуу түйүнү"</string>
+    <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> туташуу түйүнү"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
     <string name="wifi_calling_settings_title" msgid="4102921303993404577">"Wi-Fi чалуу"</string>
     <string name="wifi_calling_suggestion_title" msgid="9008010480466359578">"Wi-Fi чалууну күйгүзүү"</string>
@@ -962,7 +960,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"Жарыктыгы"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Экрандын жарыктыгын тууралоо"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Ыңгайлаштырылуучу жарык"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Жарык деңгээлин учурдагы жарыкка ыңгайлаштыруу"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Жарык деңгээлин учурдагы жарыкка карап өзгөртүү"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Өчүк"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Өтө төмөн жарык деңгээли тандалды"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Төмөн жарык деңгээли тандалды"</string>
@@ -978,7 +976,7 @@
     <string name="auto_brightness_subtitle" msgid="6454652530864093466">"Сизге жаккан жарык деңгээли"</string>
     <string name="auto_brightness_off_summary" msgid="7629228736838155268">"Учурдагы жарыкка ыңгайлаштырылбасын"</string>
     <string name="auto_brightness_very_high_summary" msgid="4551003097086220709">"Батареянын кубаты көп сарпталат"</string>
-    <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Жарык деңгээлин учурдагы жарыкка ыңгайлаштыруу. Бул функция күйгүзүлгөндө, жарыкты тууралай аласыз."</string>
+    <string name="auto_brightness_disclaimer" msgid="871436423746343406">"Жарык деңгээли учурдагы жарыкка карап өзгөрөт. Зарылчылыкка жараша аны убактылуу өзгөртсөңүз болот."</string>
     <string name="night_display_title" msgid="2626451512200357686">"Түнкү жарык"</string>
     <string name="night_display_text" msgid="1837277457033025056">"Түнкү жарыкта экран янтарь түскө боёлот. Ушуну менен күңүрт жерде көзүңүзгө күч келбей, тезирээк уктап каласыз."</string>
     <string name="night_display_category_schedule" msgid="2044072617637348966">"Күн тартиби"</string>
@@ -998,7 +996,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Эч качан автоматтык түрдө өчпөйт."</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> болгондо автоматтык түрдө өчөт."</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Күн чыкканда автоматтык түрдө өчөт."</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Уктоо"</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="wallpaper_settings_title" msgid="5449180116365824625">"Тушкагаз"</string>
@@ -1016,26 +1014,25 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Өчүк"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Телефон докко орнотулганда жана/же уйку режиминде турганда эмне болоорун көзөмөлдөө үчүн көшөгөнү күйгүзүңүз."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Качан баштоо керек"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Учурдагы көшөгө"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Азыр баштоо"</string>
-    <string name="screensaver_settings_button" msgid="7292214707625717013">"Тууралоолор"</string>
+    <string name="screensaver_settings_button" msgid="7292214707625717013">"Жөндөөлөр"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматтык жарыктык"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ойготуу үчүн көтөрүү"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Кирүүчү эскертменин экраны"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Градиент дисплейи"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Эскертмелерди алганыңызда экран күйөт"</string>
     <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>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"SIM картаны кулпулоо жөндөөлөрү"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM карта кулпусу"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Өчүк"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Кулпуланган"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM карта кулпусу"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM картаны кулпулоо"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Планшетти колдонуу үчүн PIN код суралсын"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Телефонду колдонуу үчүн PIN код суралсын"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Телефонду иштеткенде PIN код керектелет"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Планшетти колдонуу үчүн PIN код суралсын"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Телефонду колдонуу үчүн PIN код суралсын"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Телефонду иштеткенде PIN код керектелет"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM карта PIN кодун өзгөртүү"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM карта PIN коду"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM картаны кулпулоо"</string>
@@ -1052,9 +1049,9 @@
     <string name="sim_enter_ok" msgid="6475946836899218919">"Жарайт"</string>
     <string name="sim_enter_cancel" msgid="6240422158517208036">"Жокко чыгаруу"</string>
     <string name="sim_multi_sims_title" msgid="9159427879911231239">"Бир нече SIM табылды"</string>
-    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Мобилдик дайындарды колдонуу үчүн SIM-картаны тандаңыз."</string>
+    <string name="sim_multi_sims_summary" msgid="2698176447067691396">"Мобилдик Интернет үчүн SIM картаны тандаңыз."</string>
     <string name="sim_change_data_title" msgid="294357201685244532">"Дайындар SIM\'и өзгөртүлсүнбү?"</string>
-    <string name="sim_change_data_message" msgid="5854582807996717811">"Мобилдик дайындарды колдонуу үчүн <xliff:g id="OLD_SIM">%2$s</xliff:g> SIM-картасынын ордуна <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM-картасын колдоносузбу?"</string>
+    <string name="sim_change_data_message" msgid="5854582807996717811">"Мобилдик Интернетти пайдалануу үчүн <xliff:g id="OLD_SIM">%2$s</xliff:g> SIM картасынын ордуна <xliff:g id="NEW_SIM">%1$s</xliff:g> SIM картасын колдоносузбу?"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"Жактыргн SIM карта жаңртлснбы?"</string>
     <string name="sim_preferred_message" msgid="8466930554330635780">"<xliff:g id="NEW_SIM">%1$s</xliff:g> түзмөгүңүздөгү жалгыз SIM-карта. Бул SIM-карта мобилдик дайындар, чалуулар жана SMS жөнөтүү үчүн колдонулсунбу?"</string>
     <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM-карта PIN-коду туура эмес. Эми түзмөктү бөгөттөн чыгарыш үчүн операторуңузга кайрылышыңыз керек."</string>
@@ -1177,7 +1174,7 @@
     <string name="storage_external_title" msgid="3433462910096848696">"Ташылма сактагыч"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="TOTAL">%2$s</xliff:g> ичинен <xliff:g id="USED">%1$s</xliff:g> колдонулду"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
-    <string name="storage_volume_used" msgid="1303803057698959872">"<xliff:g id="TOTAL">%1$s</xliff:g> ичинен колдонулганы"</string>
+    <string name="storage_volume_used" msgid="1303803057698959872">"колдонулду <xliff:g id="TOTAL">%1$s</xliff:g> ичинен"</string>
     <string name="storage_volume_used_total" msgid="6113121714019000244">"<xliff:g id="TOTAL">%1$s</xliff:g> ичинен жалпы колдонулганы"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> кошулду"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"<xliff:g id="NAME">%1$s</xliff:g> кошулбай койду"</string>
@@ -1238,7 +1235,7 @@
     <string name="battery_status_title" msgid="9159414319574976203">"Батареянын абалы"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Батарея деңгээли"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN\'дер"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"Мүмкүнчүлүк алуу түйүнүн түзөтүү"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"Туташуу түйүнүн өзгөртүү"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Аныкталган эмес"</string>
     <string name="apn_name" msgid="4115580098369824123">"Аталышы"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1269,7 +1266,7 @@
     <string name="menu_delete" msgid="6981294422841124659">"APN жок кылуу"</string>
     <string name="menu_new" msgid="3014205883303921729">"Жаңы APN"</string>
     <string name="menu_save" msgid="8109345640668285399">"Сактоо"</string>
-    <string name="menu_cancel" msgid="2194502410474697474">"Жарактан чыгаруу"</string>
+    <string name="menu_cancel" msgid="2194502410474697474">"Сакталбасын"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
     <string name="error_name_empty" msgid="5508155943840201232">"Аталыш сабы бош болбошу керек."</string>
     <string name="error_apn_empty" msgid="4932211013600863642">"APN бош болбошу керек."</string>
@@ -1279,14 +1276,14 @@
     <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_network_desc" msgid="5547979398298881406">"Бул тармактын бардык жөндөөлөрүн баштапкы абалга келтирет, анын ичинде:\n\n"<li>"Wi‑Fi"</li>\n<li>"Мобилдик дайындар"</li>\n<li>"Bluetooth"</li></string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Тармак жөндөөлөрүн баштапкы абалга келтирүү"</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>
     <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="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>
@@ -1315,45 +1312,45 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Күтө туруңуз…"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Чалуу жөндөөлөрү"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Үн почтасы, чалууну багыттоо, чалууну кармоо, номурду аныктоону жөндөө"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB жалгаштыруу"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB модем"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Ташыма кошулуу чекити"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth жалгаштыруу"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth модем"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Жалгаштыруу"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Туташуу чекити жана жалгаштыруу"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Туташуу түйүнү/модем режими"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Хотспот күйгүзүлгөн, тетеринг"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Хотспот күйгүзүлгөн"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Тетеринг"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Дайындарды үнөмдөгүч режиминде түзмөктү модем же көчмө туташуу түйүнү катары колдонуу мүмкүн эмес"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Трафикти үнөмдөө режиминде түзмөктү модем же көчмө туташуу түйүнү катары колдонууга болбойт"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB жалгаштыруу"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB туташты, жалгаштыруу үчүн текшериңиз"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB модем"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB түзмөгү сайылды, эми мобилдик Интернетти иштетиңиз"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Жалгашты"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"USB сактагыч колдонулуп жатканда, интернет бөлүшүү мүмкүн эмес"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB туташкан жок"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Күйгүзүү үчүн туташыңыз"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB жалгаштыруу катасы"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth жалгаштыруу"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB модем"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth модем"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Планшеттин Интернети Bluetooth аркылуу бөлүшүлүүдө"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Телефондун Интернети Bluetooth аркылуу бөлүшүлүүдө"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Планшеттин Интернети Bluetooth аркылуу 1 түзмөк м-н бөлүш-дө"</string>
-    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Телефондун Интернети Bluetooth аркылуу 1 түзмөк м-н бөлүш-дө"</string>
+    <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Телефондун Интернети Bluetooth аркылуу 1 түзмөк менен бөлүшүлүүдө"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Планшеттин Интернети Bluetooth аркылуу <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> түзмөк м-н бөлүш-дө"</string>
-    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Телефондун Интернети Bluetooth аркылуу <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> түзмөк м-н бөлүш-дө"</string>
+    <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Телефондун Интернети Bluetooth аркылуу <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> түзмөк менен бөлүшүлүүдө"</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_off_subtext" product="tablet" msgid="1889565070769307732">"Планшеттин Интернети Bluetooth аркылуу бөл-гөн жок"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Телефондун Интернети Bluetooth аркылуу бөл-гөн жок"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Телефондун Интернети Bluetooth аркылуу бөлүшүлгөн жок"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Интернет бөлүшүү болгон жок"</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>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Мобилдик Интернетиңиз аркылуу башка түзмөктөргө Интернет таратуу үчүн туташуу чекити же жалгаштыруу функцияларын пайдаланыңыз."</string>
+    <string name="tethering_footer_info" msgid="7287131664937054043">"Мобилдик Интернетиңиз аркылуу башка түзмөктөргө Интернет таратуу үчүн туташуу түйүнү же модем режимин пайдаланыңыз."</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="sms_application_title" msgid="4903928270533250448">"SMS колдонмосу"</string>
-    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS колдонмо алмашсынбы?"</string>
+    <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS колдонмону алмаштырасызбы?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Сиздин <xliff:g id="CURRENT_APP">%2$s</xliff:g> SMS колдонмоңуз ордуна <xliff:g id="NEW_APP">%1$s</xliff:g> колдонулсунбу?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> SMS колдонмосу болсунбу?"</string>
-    <string name="network_scorer_picker_title" msgid="6383879578279046456">"Тармак рейтингинин провайдери"</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">"Wi‑Fi жардамчысы өзгөрүлсүнбү?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Тармактык туташууларыңызды башкаруу үчүн, <xliff:g id="CURRENT_APP">%2$s</xliff:g> ордуна <xliff:g id="NEW_APP">%1$s</xliff:g> колдоносузбу?"</string>
@@ -1364,26 +1361,26 @@
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернетке кошулуңуз"</string>
     <string name="location_title" msgid="1029961368397484576">"Жайгашкан жерим"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Жумуш профилинин жайгашкн жери"</string>
-    <string name="location_mode_title" msgid="3982009713118421689">"Тартип"</string>
+    <string name="location_mode_title" msgid="3982009713118421689">"Режим"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Жогорку тактык"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Батарейди үнөмдөө"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Тармактын координаттары боюнча"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Түзмөк гана"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Жайгашкан жерди аныктоо өчүк"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Колдонмонун уруксаттары"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Акыркы жайгашуу талаптары"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Жакында изделген жерлер"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Акыркы мезгилде жайгашууну сураган колдонмолор болгон жок"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Жайгашкан жерди аныктоо кызматы"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Батарейди көп колдонуу"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Батарейди аз колдонуу"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"Жайгашуу тартиби"</string>
-    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi, Bluetooth же мобилдик тармактарды колдонуңуз"</string>
-    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Жайгашкан жерди аныктоо үчүн Wi‑Fi, Bluetooth же мобилдик тармактарды колдонуңуз"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Жайгашкан жерди аныктоо үчүн GPS колдонуңуз"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Скандалууда…"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi изделүүдө"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Тутум колдонмолору жана кызматтарына Bluetooth тармактарын ар дайым издеп турганга уруксат берүү менен кандайдыр бир жерди тагыраак аныктай аласыз."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth изделүүдө"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Тутум колдонмолору жана кызматтарына Bluetooth түзмөктөрүн ар дайым издеп турганга уруксат берүү менен кандайдыр бир жерди тагыраак аныктай аласыз."</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Батареянын кубаты үнөмдөлүүдө"</string>
+    <string name="location_mode_screen_title" msgid="4528716772270246542">"Жайгашкан жерди аныктоо"</string>
+    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi, Bluetooth же мобилдик Интернет колдонулат"</string>
+    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Жайгашкан жерди аныктоо үчүн GPS, Wi‑Fi, Bluetooth же мобилдик Интернет колдонулат"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Жайгашкан жерди аныктоо үчүн GPS колдонулат"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Издөө"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi тармактарын издөө"</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Тутум колдонмолору менен кызматтарына Wi-Fi тармактарын такай издөөгө уруксат берүү менен жайгашкан жерди тагыраак аныктоого болот."</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth түзмөктөрүн издөө"</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Тутум колдонмолору менен кызматтарына Wi-Fi тармактарын такай издөөгө уруксат берүү менен жайгашкан жерди тагыраак аныктоого болот."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi‑Fi ж-а мобилдик жайгаштыруу"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Колдонмолорго Google жайгаштыруу м-н ордуңузду тактоого жол берүү. Жайгашуу берилиштери аноним. чогултулат ж-а Google\'га берилет."</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"Жайгашуу Wi‑Fi аркылуу аныкталды"</string>
@@ -1500,7 +1497,7 @@
     <string name="application_info_label" msgid="5736524913065714880">"Колдонмо тууралуу"</string>
     <string name="storage_label" msgid="8700867073480107253">"Сактагыч"</string>
     <string name="auto_launch_label" msgid="2669236885531442195">"Демейки боюнча ачуу"</string>
-    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Абалкы"</string>
+    <string name="auto_launch_label_generic" msgid="3230569852551968694">"Демейки"</string>
     <string name="screen_compatibility_label" msgid="663250687205465394">"Экрандын шайкештиги"</string>
     <string name="permissions_label" msgid="2605296874922726203">"Уруксаттар"</string>
     <string name="cache_header_label" msgid="1877197634162461830">"Кэш"</string>
@@ -1539,7 +1536,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>
@@ -1555,7 +1552,7 @@
     <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>
+    <string name="no_applications" msgid="7336588977497084921">"Бир дагы колдонмо жок."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Ички эстутум"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"ички сактагыч"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB сактагыч"</string>
@@ -1564,7 +1561,7 @@
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"Колдонмо берилиштери өчүрүлсүнбү?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"Бул колдонмонун бардык маалыматтары биротоло жок болот. Алар менен кошо бардык файлдар, орнотуулар, эсептер, берилиштер корлору ж.б. жок болот."</string>
     <string name="dlg_ok" msgid="2402639055725653590">"Жарайт"</string>
-    <string name="dlg_cancel" msgid="1674753358972975911">"Жокко чыгаруу"</string>
+    <string name="dlg_cancel" msgid="1674753358972975911">"Жок"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
     <string name="app_not_found_dlg_text" msgid="4893589904687340011">"Бул колдонмо орнотулган колдонмолор тизмегинен табылган жок."</string>
     <string name="clear_data_failed" msgid="7214074331627422248">"Колдонмонун берилиштери тазаланган жок."</string>
@@ -1599,7 +1596,7 @@
     <string name="system_package" msgid="1352722848400644991">"Системдин жаңыртуулары сырткы сактагычка орнотулбайт."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Түзмөктү башкарган колдонмо сырткы сактагычка орнотулбайт"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Токтотулсунбу?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Колдонмону токтотсоңуз, ал туура эмес иштеши мүмкүн."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Колдонмону токтотсоңуз, ал туура эмес иштеп калышы мүмкүн."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Колдонмону жылдыруу мүмкүн эмес. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Орнотууга тандалган жер"</string>
@@ -1614,6 +1611,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Эч качан колдонулган эмес)"</string>
@@ -1638,10 +1636,10 @@
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процесс жана <xliff:g id="NUMSERVICES">%2$d</xliff:g> кызмат"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> процесс жана <xliff:g id="NUMSERVICES">%2$d</xliff:g> кызмат"</string>
     <string name="running_processes_header_title" msgid="6588371727640789560">"Түзмөк эстутуму"</string>
-    <string name="running_processes_header_footer" msgid="723908176275428442">"Колдонмонун RAM пайдалануусу"</string>
+    <string name="running_processes_header_footer" msgid="723908176275428442">"Оперативдик эстутумдун керектелиши"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Тутум"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Колдонмолор"</string>
-    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Акысыз"</string>
+    <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Бош"</string>
     <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Колдонулган"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"Кэштелген"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"RAM ичинен <xliff:g id="RAM_0">%1$s</xliff:g>"</string>
@@ -1677,7 +1675,7 @@
     <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_quick_settings" msgid="246728645150092058">"Тууралоолор"</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>
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Виртуалдык баскычтоп"</string>
@@ -1690,7 +1688,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Баскычтоптун кыска жолдору"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Жеткиликтүү кыска жолдор көрсөтүлсүн"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Демейки"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Чычкан/тракпед"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Көрсөткүчтүн ылдамдыгы"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Оюн контроллери"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Титиреткичти колдонуу"</string>
@@ -1698,7 +1695,7 @@
     <string name="keyboard_layout_dialog_title" msgid="8030087214949381372">"Тергичтин жайылмасын тандоо"</string>
     <string name="keyboard_layout_dialog_setup_button" msgid="8514583747236476384">"Тергичтин жайылмасын тууралоо"</string>
     <string name="keyboard_layout_dialog_switch_hint" msgid="3889961090676293795">"Которуш үчүн Control-Боштукту басыңыз"</string>
-    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Абалкы"</string>
+    <string name="keyboard_layout_default_label" msgid="2952672513543482165">"Демейки"</string>
     <string name="keyboard_layout_picker_title" msgid="556081931972771610">"Тергичтин жайылмалары"</string>
     <string name="user_dict_settings_title" msgid="3427169369758733521">"Колдонуучунун сөздүгү"</string>
     <string name="user_dict_settings_summary" msgid="7965571192902870454"></string>
@@ -1731,7 +1728,7 @@
     <string name="input_method_selector_always_hide_title" msgid="7699647095118680424">"Ар дайым жашырылсын"</string>
     <string name="configure_input_method" msgid="1317429869771850228">"Киргизүү ыкмаларын тууралоо"</string>
     <string name="input_method_settings" msgid="5801295625486269553">"Жөндөөлөр"</string>
-    <string name="input_method_settings_button" msgid="6778344383871619368">"Тууралоолор"</string>
+    <string name="input_method_settings_button" msgid="6778344383871619368">"Жөндөөлөр"</string>
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> жөндөөлөрү"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"Иштеген киргизме ыкмаларын тандаңыз"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"Экрандагы баскычтоптун жөндөөлөрү"</string>
@@ -1761,13 +1758,13 @@
     <string name="vision_settings_title" msgid="4204111425716868288">"Атайн мүмкүнчлктрдн жөндлр"</string>
     <string name="vision_settings_description" msgid="5679491180156408260">"Түзмөктү өзүңүзгө карап ыңгайлаштырып алыңыз. Бул атайын мүмкүнчүлүктөрдүн параметрлерин кийинчерээк өзгөртсөңүз болот."</string>
     <string name="screen_reader_category_title" msgid="7739154903913400641">"Экрандагыны окугучтар"</string>
-    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио жана экранда SMS жөнөтүү"</string>
+    <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Аудио жана текстти окуп берүү"</string>
     <string name="display_category_title" msgid="685461049938269166">"Дисплей"</string>
-    <string name="interaction_control_category_title" msgid="7836591031872839151">"Карым-катнашты көзөмөлдөө"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"Башкаруу элементтери"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Жүктөлүп алынган кызматтар"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"Сынамык"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
-    <string name="talkback_summary" msgid="8331244650729024963">"Экран окугуч негизинен сокур жана көзү начар көргөн адамдар үчүн чыгарылган"</string>
+    <string name="talkback_summary" msgid="8331244650729024963">"Экрандагы нерсени окуп берүүчү курал көздөрү начар көргөн адамдарга арналган"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Экраныңыздагы элементтерди түзмөк окуп бериши үчүн аларды таптап коюңуз"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Коштомо жазуулар"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Чоңойтуу"</string>
@@ -1776,31 +1773,31 @@
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Баскыч менен жана үч жолу таптоо аркылуу чоңойтуу"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Экранды чоңойтуу"</string>
     <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>"Жылдыруу үчүн бир нече манжаңыз менен сүйрөңүз"</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_short_summary" msgid="3693116360267980492">"Чоңойтуп/кичирейтүү үчүн баскычты басыңыз"</string>
+    <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_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="6488524140219209763">"Атайын мүмкүнчүлүктөр функциясын пайдалануу үчүн, анын кыска жолу күйгүзүлгөндө, үндү катуулатуу/акырындатуу баскычын үч секунддай кое бербей басып туруңуз."</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>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Кубат баскычы чалууну бүтүрөт"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Чалууну кубат баскычы бүтүрөт"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Чычкандын чоң көрсөткүчү"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Моно аудио"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Аудио ойнотулуп жатканда каналдар бириктирилсин"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Коё бербей басып туруу узактыгы"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Түстү инверсиялоо"</string>
-    <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_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>
-    <string name="daltonizer_type" msgid="1124178250809091080">"Түзөтүү тартиби"</string>
+    <string name="daltonizer_type" msgid="1124178250809091080">"Тууралоо режими"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
       <item quantity="other">Өтө кыска убакытка кечиктирүү (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
       <item quantity="one">Өтө кыска убакытка кечиктирүү (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> мс)</item>
@@ -1821,7 +1818,7 @@
       <item quantity="other">Өтө узакка кечиктирүү (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> мс)</item>
       <item quantity="one">Өтө узакка кечиктирүү (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> мс)</item>
     </plurals>
-    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Тууралоолор"</string>
+    <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Жөндөөлөр"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"Күйүк"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"Өчүк"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"Алдын ала көрүү"</string>
@@ -1841,7 +1838,7 @@
     <string name="captioning_typeface" msgid="1826169240566563259">"Тамга түрү"</string>
     <string name="captioning_preview_text" msgid="4067935959797375065">"Субтитрлер мындай көрүнөт"</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Өө"</string>
-    <string name="locale_default" msgid="2593883646136326969">"Абалкы"</string>
+    <string name="locale_default" msgid="2593883646136326969">"Демейки"</string>
     <string name="color_title" msgid="4258931051732243983">"Түс"</string>
     <string name="color_unspecified" msgid="5179683785413568326">"Демейки"</string>
     <string name="color_none" msgid="3475640044925814795">"Эчтеке жок"</string>
@@ -1854,16 +1851,16 @@
     <string name="color_cyan" msgid="7033027180641173211">"Кызгылт көк"</string>
     <string name="color_yellow" msgid="9112680561610873529">"Сары"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Кочкул"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> колдонулсунбу?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> талап кылат:"</string>
+    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> колдоносузбу?"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g>:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Колдонмо уруксат суроо-талабын түшүнбөй жаткандыктан, Жөндөөлөр жообуңузду текшере албайт."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Эгер <xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлсө, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Атайын мүмкүнчүлүктөр кызматы күйгүзүлгөндүктөн, түзмөгүңүз дайындарды шифрлөөнү күчтөндүрүү үчүн экраныңыздын кулпусун пайдаланбайт."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө дайындарды шифрлөөгө таасир тийгизгендиктен, үлгүңүздү ырасташыңыз керек."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө дайындарды шифрлөөгө таасир тийгизгендиктен, PIN ырасташыңыз керек."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g> күйгүзүлгөндө дайындарды шифрлөөгө таасир тийгизгендиктен, сырсөзүңүздү ырасташыңыз керек."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Иш-аракеттериңизди байкоо"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Колдонмо менен иштеп жатканда эскертмелерди алып туруу."</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Аракеттериңизге көз салат"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Колдонмодо кандай аракеттерди аткарып жаткандыгыңызды билип турасыз."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> токтотулсунбу?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"OK тапталганда <xliff:g id="SERVICE">%1$s</xliff:g> токтотулат."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Эч кандай кызматтар орнотулган эмес"</string>
@@ -1876,10 +1873,10 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> принтер кызматы иштетилген</item>
       <item quantity="one">1 принтер кызматы иштетилген</item>
     </plurals>
-    <string name="print_settings_title" msgid="3685449667822217816">"Принтер-кызматтары"</string>
+    <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_menu_item_settings" msgid="6591330373682227082">"Тууралоолор"</string>
+    <string name="print_menu_item_settings" msgid="6591330373682227082">"Жөндөөлөр"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Принтерлерди кошуу"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Күйүк"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Өчүк"</string>
@@ -1908,14 +1905,14 @@
     <string name="power_charge_remaining" msgid="6132074970943913135">"<xliff:g id="UNTIL_CHARGED">%1$s</xliff:g> кубаттоо"</string>
     <string name="background_activity_title" msgid="8618384801540759730">"Фондогу активдүүлүк"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"Колдонмо фондо аткарылсын"</string>
-    <string name="background_activity_summary_on" msgid="649282072540085599">"Колдонмону пайдаланбаган учурда фондо иштей берет"</string>
-    <string name="background_activity_summary_off" msgid="7666330699090632040">"Колдонмону пайдаланбаган учурда фондогу аракеттери чектелет"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"Колдонмо пайдаланылбаган учурда фондо иштей берет"</string>
+    <string name="background_activity_summary_off" msgid="7666330699090632040">"Колдонмо пайдаланылбаган учурда фондогу иши чектелет"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Колдонмону фондо иштетүүгө уруксат жок"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Толук кубат-н бери экрандын колдонулушу"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Толук кубатталгандан бери экран канча убакыт колдонулду"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Экран керектеген кубат"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобилдик тармак скандалууда"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> мурун"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Толук кубатталгандан бери (<xliff:g id="TIME">%1$s</xliff:g> мурун) иштеп жаткан колдонмолор"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> мурун"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Толук кубаттлг бери иштегн колднмлр (<xliff:g id="TIME">^1</xliff:g> мурун)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Толук кубатталгандан бери экрандын күйүп турган убактысы"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Толук кубатталгандан бери түзмөктүн колдонулушу"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Суурулгандан бери батареянын колдонулушу"</string>
@@ -1935,7 +1932,7 @@
     <string name="awake" msgid="387122265874485088">"Түзмөк ойгоо турган убакыт"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi өз учурунда"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Өз убагындагы Wi‑Fi"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Батареяны кеңири колдонуу"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Батареянын кубатынын кеңири жөндөөлөрү"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Таржымалдын чоо-жайы"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Батарея колдонулушу"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Чоо-жайын колдонуу"</string>
@@ -1946,10 +1943,10 @@
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Уюлдун сенек учуру"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Күтүү режиминдеги мобилдик тармак"</string>
     <string name="power_phone" msgid="5392641106474567277">"Үн менен чалуулар"</string>
-    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшеттин сенек учуру"</string>
-    <string name="power_idle" product="default" msgid="9055659695602194990">"Телефондун сенек учуру"</string>
+    <string name="power_idle" product="tablet" msgid="4612478572401640759">"Күтүү режиминдеги планшет"</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Күтүү режими"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Калган-каткандар"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Ашыкча эсептелген"</string>
     <string name="power_apps" msgid="2043554781293951327">"Колдонмолор"</string>
@@ -1999,23 +1996,23 @@
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Башка Bluetooth түзмөккө туташтырып көрүңүз"</string>
     <string name="battery_desc_apps" msgid="8530418792605735226">"Колдонмонун батарей сарпташы"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Колдонмону токтотуу же жок кылуу"</string>
-    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Батарейди үнөмдөө абалына өткөзүү"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Батарейди үнөмдөө максатында, колдонмо тууралоолорду сунушташы мүмкүн"</string>
+    <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Батареяны үнөмдөө режимин тандаңыз"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Программада батареяны үнөмдөө жөндөөлөрү болушу мүмкүн"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Кодонуучулардын батарейди пайдалануусу"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Кубаттын учурдагы керектелиши"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Батареянын колдонулушу – кубаттын орточо керектелиши, анда батареянын кубатын керектеген бардык булактар камтылбайт. Кубаттын учурдагы керектелгендиги – кубаттын эсептелген болжолдуу керектелиши жана иш жүзүндө кубаттын канчалык деңгээлде керектелгендигин көрсөтүп турат."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ашыкча эсептелген кубаттын пайдаланылышы"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s колдонулду"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> бою колдонулду"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> колдонмосу <xliff:g id="PERCENT">%1$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_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_detail_foreground" msgid="3350401514602032183">"Колдонулуп жатканда"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Фондук режимде"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Батарея колдонулушу"</string>
-    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"Батареяны сарптаган колдонмолордун ичинен <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g>мА/с.)"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"Колдонмонун батареяны жалпы сарптаганынан <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g>мА/с.)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Толук кубатталгандан бери"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"Батареянын колдонулушун башкаруу"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Болжолдуу калган убакыт"</string>
@@ -2032,8 +2029,12 @@
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Автоматтык түрдө күйгүзүү"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Эч качан"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> батарея менен"</string>
-    <string name="battery_percentage" msgid="723291197508049369">"Батарянын кубатынын деңгээли пайыз менен"</string>
-    <string name="battery_percentage_description" msgid="8511658577507384014">"Батарянын кубатынын деңгээли пайыз менен абал тилкесинде көрсөтүлсүн"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_percentage (723291197508049369) -->
+    <skip />
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_percentage_description (8511658577507384014) -->
+    <skip />
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Процесстин статистикасы"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Иштеп жаткан процесстердин өзгөчө статистикасы"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Эс тутумдун пайдаланылышы"</string>
@@ -2060,7 +2061,7 @@
     <string name="mem_use_native_type" msgid="5976704902328347400">"Өздүк"</string>
     <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Ядро кештери"</string>
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
-    <string name="mem_use_free_type" msgid="717708548454880840">"Акысыз"</string>
+    <string name="mem_use_free_type" msgid="717708548454880840">"Бош"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Жалпы"</string>
     <string name="menu_duration_3h" msgid="4714866438374738385">"3 саат"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 саат"</string>
@@ -2078,7 +2079,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Үн киргизүү жана чыгаруунун жөндөөлөрү"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Үн менен издөө"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android тергичи"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Сүйлөө"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Үн менен киргизүү жөндөөлөрү"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Үн менен киргизүү"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Үн киргизүү кызматтары"</string>
@@ -2137,7 +2137,7 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Сертификат сактагычтын сырсөзүн териңиз."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Учурдагы сырсөз:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Бардык мазмундар өчүрүлсүнбү?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Сырсөз кеминде 8 белгиден турушу зарыл."</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Сырсөз кеминде 8 белгиден турушу керек."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Туура эмес сырсөз."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Сырсөз туура эмес. Дагы бир аракеттен кийин аныктоо эстутуму тазаланат."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Сырсөз туура эмес. Дагы <xliff:g id="NUMBER">%1$d</xliff:g> аракеттен кийин аныктоо эстутуму тазаланат."</string>
@@ -2145,7 +2145,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">"Эсептик дайындардын сактагычын пайдаланаардан мурун кулпуланган экранды ачуучу PIN кодду же сырсөздү коюшуңуз керек."</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>
@@ -2161,8 +2161,8 @@
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"Учурда эч бир каттоо эсебинде камдык көчүрмө дайындары сакталбай эле"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
     <string name="backup_erase_dialog_message" msgid="5221011285568343155">"Колдонмолордун берилиштерин, Wi-Fi сырсөздөрүн, бүктөмөлөрдү, жана башка тууралоолорду, колдономолордун берилиштерин Google\'дун серверине сактоо токтотулуп, бардык көчүрмөлөр жок кылынсынбы?"</string>
-    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсүн сактоону токтотуп, аралыктагы серверлердеги бардык көчүрмөлөр жок кылынсынбы?"</string>
-    <string name="fullbackup_data_summary" msgid="960850365007767734">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсүн алыстан автоматтык түрдө сактоо.\n\nКамдык көчүрмөнү автоматтык түрдө сактоо мүмкүнчүлүгү иштетилгенде, түзмөктүн жана колдонмонун дайындары маалы менен автоматтык түрдө сакталып турат. Иштеп чыгуучунун жөндөөлөрүнө ылайык колдонмодо сакталган дайындарда байланыштар, билдирүүлөр, сүрөттөр сыяктуу купуя маалыматтар камтылышы мүмкүн."</string>
+    <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү мындан ары сакталбай, аралыктагы серверлердеги бардык көчүрмөлөр жок кылынат. Уланта бересизби?"</string>
+    <string name="fullbackup_data_summary" msgid="960850365007767734">"Түзмөктөгү дайындардын (мисалы, Wi-Fi тармагынын сырсөздөрү жана чалуулар таржымалы) жана колдонмонун дайындарынын (мисалы жөндөөлөр жана файлдар) камдык көчүрмөсү алыстан автоматтык түрдө сакталат.\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>
@@ -2279,13 +2279,13 @@
     <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_usage_summary_title" msgid="3804110657238092929">"Дайындардын колдонулушу"</string>
+    <string name="data_usage_summary_title" msgid="3804110657238092929">"Дайындардын өткөрүлүшү"</string>
     <string name="data_usage_app_summary_title" msgid="4147258989837459172">"Колдонмонун дайындарынын пайдаланылышы"</string>
     <string name="data_usage_accounting" msgid="7170028915873577387">"Оператор эсептеген дайындар түзмөгүңүздө эсептелген дайындардан айырмаланышы мүмкүн."</string>
     <string name="data_usage_app" msgid="4970478397515423303">"Колдонмонун пайдаланылышы"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"КОЛДОНМО МААЛЫМАТЫ"</string>
-    <string name="data_usage_cellular_data" msgid="9168928285122125137">"Мобилдик дайындар"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"Дайындарга чек коюу"</string>
+    <string name="data_usage_cellular_data" msgid="9168928285122125137">"Мобилдик Интернет"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Трафикти чектөө"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Дайындарды колдонуу цикли"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Колдонмонун пайдаланылышы"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Интернет роуминг"</string>
@@ -2310,7 +2310,7 @@
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Алдыңкы планда"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Фондо"</string>
     <string name="data_usage_app_restricted" msgid="3568465218866589705">"тыюу салынган"</string>
-    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Мобилдик дайындар өчүрүлсүнбү?"</string>
+    <string name="data_usage_disable_mobile" msgid="8656552431969276305">"Мобилдик Интернетти өчүрөсүзбү?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Мобилдик трафикти чектөө"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"4G трафигин чектөө"</string>
     <string name="data_usage_disable_3g_limit" msgid="2558557840444266906">"2G-3G трафигин чектөө"</string>
@@ -2322,7 +2322,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Мобилдик"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Эчтеке жок"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мобилдик дайындар"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мобилдик трафик"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-3G дайындары"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G дайындары"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Алдыңкы план:"</string>
@@ -2338,15 +2338,15 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Желеден каттоо эсептериңизге кандайдыр бир өзгөртүүлөр киргизилгенде, алардын баары планшетиңизге автоматтык түрдө көчүрүлөт.\n\nАйрым каттоо эсептеринин планшетиңиздеги өзгөртүүлөрү автоматтык түрдө желеге көчүрүлөт. Кыскасы, Google Каттоо эсеби ушундай жол менен иштейт."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Желеден каттоо эсептериңизге кандайдыр бир өзгөртүүлөр киргизилгенде, алардын баары телефонуңузга автоматтык түрдө көчүрүлөт.\n\nАйрым учурларда телефонуңуздагы өзгөртүүлөр автоматтык түрдө желеге көчүрүлүшү мүмкүн. Кыскасы, Google Каттоо эсеби ушундай жол менен иштейт."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Автошайкештирүү токтотулсунбу?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Ушуну менен трафик жана батареянын кубатын үнөмдөөгө болот. Бирок жаңы дайындарды алып туруу үчүн ар бир каттоо эсебин кол менен шайкештирип чыгуу керек. Бул учурда жаңыртуулар тууралуу эскертмелер алынбайт."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Колдонуу циклин баштапкы абалга келтирүү күнү"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Ушуну менен трафикти жана батареянын кубатын үнөмдөөгө болот. Бирок маалыматты жаңыртып туруу үчүн ар бир каттоо эсебин кол менен шайкештирип чыгуу керек. Бул учурда жаңыртуулар тууралуу эскертмелер алынбайт."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Статистика качан жаңырат"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Ар бир айдын күнү:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Коюу"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Трафик колдонууга эскертме коюу"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Трафик колдонууга чек коюу"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Дайындарды колдонууну чектөө"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Белгиленген чекке жеткенде, планшетиңиз мобилдик дайындарды өчүрөт.\n\nПланшетиңиз дайындардын колдонулушун башкача өлчөп, операторуңуз башкача эсептегендиктен, чекти кабелтең коюңуз."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Белгиленген чекке жеткенде, телефонуңуз мобилдик дайындарды өчүрөт.\n\nТелефонуңуз дайындардын колдонулушун башкача өлчөп, операторуңуз башкача эсептегендиктен, чекти кабелтең коюңуз."</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Трафикти чектөө"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Трафикти чектөө"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="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>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Фондук режимдеги мобилдик дайындарга чек коюлганда, айрым колдонмолор жана кызматтар Wi‑Fi\'га туташмайынча иштебейт."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Фондук режимдеги мобилдик дайындарга чек коюлганда, айрым колдонмолор жана кызматтар Wi‑Fi\'га туташмайынча иштебейт.\n\nБул жөндөө ушул планшеттеги бардык колдонуучуларга таасирин тийгизет."</string>
@@ -2360,10 +2360,10 @@
     <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>: болжол менен <xliff:g id="TOTAL">%1$s</xliff:g> пайдаланылды - планшеттин ченеми. Оператор эсеби башка болушу мүмкүн."</string>
     <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>: болжол менен <xliff:g id="TOTAL">%1$s</xliff:g> пайдаланылды - телефондун ченеми. Оператор эсеби башка болушу мүмкүн."</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"Тармак чектөөлөрү"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"Фондук режимде дайындар чектелгенде, трафиги тарифтелген тармактар мобилдик катары каралат. Бул тармактар аркылуу көлөмдүү нерселерди жүктөп алуудан мурда, колдонмолордон эскертүү жиберилет."</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"Фондук режимде дайындардын өткөрүлүшү чектелгенде, тарифтелген тармактар мобилдик тармактар катары каралат. Бул тармактар аркылуу көлөмдүү нерселерди жүктөп алуудан мурда, колдонмолордон эскертүү жиберилет."</string>
     <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_wifi" msgid="1761738002328299714">"Тарифтелген Wi‑Fi тармактары"</string>
+    <string name="data_usage_metered_wifi_disabled" msgid="727808462375941567">"Тарифтелген тармактарды тандоо үчүн, Wi‑Fi күйгүзүңүз."</string>
     <string name="data_usage_disclaimer" msgid="6887858149980673444">"Оператор эсептеген дайындар түзмөгүңүздө эсептелген дайындардан айырмаланышы мүмкүн."</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Шашылыш чалуу"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Чалууга кайтуу"</string>
@@ -2392,7 +2392,7 @@
     <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_cancel" msgid="1979937976123659332">"Жокко чыгаруу"</string>
+    <string name="vpn_cancel" msgid="1979937976123659332">"Жок"</string>
     <string name="vpn_done" msgid="8678655203910995914">"Этибарга албоо"</string>
     <string name="vpn_save" msgid="4233484051644764510">"Сактоо"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Туташуу"</string>
@@ -2449,11 +2449,11 @@
     <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="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Толук бэкапыңыздын жаңы сырсөзүн бул жерге кайра териңиз"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Бэкапка сырсөз орнотуңуз"</string>
-    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Айнуу"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Учурдагы сырсөздү териңиз"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Жаңы сырсөздү териңиз"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Жаңы сырсөздү бул жерге кайра киргизиңиз"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Сырсөздү сактап коюу"</string>
+    <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Баш тартуу"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Кошумча тутум жаңртлары"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Токтотулган"</string>
     <string name="selinux_status_permissive" msgid="6004965534713398778">"Жол берүүчү"</string>
@@ -2513,7 +2513,7 @@
     <string name="user_new_user_name" msgid="369856859816028856">"Жаңы колдонуучу"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Жаңы профайл"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Өзүңүздү жок кылалыбы?"</string>
-    <string name="user_confirm_remove_title" msgid="1163721647646152032">"Колдонуучуну өчүрөлүбү?"</string>
+    <string name="user_confirm_remove_title" msgid="1163721647646152032">"Колдонуучуну өчүрөсүзбү?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Профилди алып салалыбы?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Жумуш профили алынып салынсынбы?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"Сиз бул планшеттеги мейкиндигиңизди жана берилиштериңизди жоготосуз. Сиз муну артка кайтара албайсыз."</string>
@@ -2536,7 +2536,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Чалуу таржымалы бул колдонуучу менен бөлүшүлөт."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Чалуулар менен SMS иштетилсинби?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Чалуу жана SMS таржымалы бул колдонуучу менен бөлүшүлөт."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Шашылыш кырдаал жөнүндө маалымат"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Өзгөчө кырдаал жөнүндө маалымат"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g> жөнүндө маалымат жана байланыштар"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Колдонмолорго жана мазмунга уруксат"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Чектелген колдонмолор"</string>
@@ -2553,7 +2553,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Демейкини колдонуу"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Ар дайым"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Акы төлөнүүчү башка колдонмо ачылып турган учурларды эске албаганда"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Тийип төлөө терминалында төмөнкүнү колдонуу:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Аралыктан төлөө терминалында төмөнкүнү колдонуу:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Терминалдан акы төлөө"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Акы төлөнүүчү колдонмону жөндөп туруп, телефондун арткы бетин колду тийгизбей туруп төлөө белгиси түшүрүлгөн терминалга ыктап кармап туруңуз."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Түшүндүм"</string>
@@ -2565,7 +2565,7 @@
     <string name="restriction_menu_reset" msgid="2067644523489568173">"Чектөөлөрдү жок кылуу"</string>
     <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="help_label" msgid="6886837949306318591">"Жардам/пикир билдирүү"</string>
     <string name="support_summary" msgid="8276116616493882830">"Жардам макалалары, телефон жана чат аркылуу колдоо көрсөтүү"</string>
     <string name="user_account_title" msgid="1127193807312271167">"Мазмун үчүн эсеп"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"Сүрөттүн ID\'си"</string>
@@ -2581,7 +2581,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="2451014351355183338">"Өзгөчө кырдаал тууралуу кулактандыруу"</string>
     <string name="network_operators_settings" msgid="2583178259504630435">"Тармактык операторлор"</string>
     <string name="access_point_names" msgid="1381602020438634481">"Жетки түйүнүнүн аталыштары"</string>
     <string name="enhanced_4g_lte_mode_title" msgid="5808043757309522392">"Жакшыртылган 4G LTE режими"</string>
@@ -2602,7 +2602,7 @@
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
     <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Бул <xliff:g id="DEVICE_NAME">%1$s</xliff:g> башка NFC түзмөгүнө тийгенде, дайындар менен алмашууга уруксат берүү"</string>
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Планшет башка түзмөккө тийгенде, берилиштерди алмашууга жол берүү"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Телефон башка түзмөккө тийгенде, берилиштерди алмашууга жол берүү"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Телефон башка түзмөккө тийгенде маалымат алмашууга уруксат берүү"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Жайгашуу"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Колдонмолорго сиздин жайгашуу маалыматтарыңызды колдонууга уруксат берүү"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Артка"</string>
@@ -2617,8 +2617,8 @@
     <string name="sim_settings_summary" msgid="4050372057097516088">"<xliff:g id="SIM_NAME">%1$s</xliff:g> – <xliff:g id="SIM_NUMBER">%2$s</xliff:g>"</string>
     <string name="sim_cards_changed_message" msgid="7900721153345139783">"SIM карталар өзгөртүлдү"</string>
     <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Аракеттерди коюу үчүн таптап коюңуз"</string>
-    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Мобилдик дайындар жеткиликтүү эмес"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Мобилдик дайындар үчүн SIM картаны тандоо үчүн таптап коюңуз"</string>
+    <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Мобилдик Интернет жеткиликтүү эмес"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Мобилдик Интернет үчүн SIM картаны тандоо үчүн таптап коюңуз"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Бул нерсе дайым чалуулр үчүн колдонулсн"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Дайындар үчүн SIM тандаңыз"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"Дайындар SIM\'и которулууда, бул бир мүнөткө чейин созулушу мүмкүн…"</string>
@@ -2659,9 +2659,9 @@
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi, мобилдик түзмөк, дайындарды өткөрүү, хотспот"</string>
     <string name="connected_devices_dashboard_title" msgid="2355264951438890709">"Туташкан түзмөктөр"</string>
     <string name="connected_devices_dashboard_summary" msgid="2390582103384791904">"Bluetooth, Cast, NFC"</string>
-    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Колдонмолор жана эскертмелер"</string>
+    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"Колдонмолор/эскертмелер"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"Уруксаттар, демейки колдонмолор"</string>
-    <string name="account_dashboard_title" msgid="4936890821712178853">"Колдонуучулар жана каттоо эсептери"</string>
+    <string name="account_dashboard_title" msgid="4936890821712178853">"Колдонуучулар/каттоо эсептер"</string>
     <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>
@@ -2724,13 +2724,15 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Коңгуроо дирилдейт"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Коңгуроонун үнү өчүрүлгөн"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Шыңгырдын катуулугу 80%"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Медианын үнүнүн катуулугу"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Музыка, видео, оюндар жана башка медиафайлдар"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ойготкучтун үнүнүн катуулугу"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Шыңгырдын катуулугу"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Эскертме үнүнүн катуулугу"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Телефондун рингтону"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"Демейки эскертменин добушу"</string>
-    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Демейки ойготкуч добушу"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Телефондун шыңгыры"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Эскертменин демейки үнү"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Колдонмонун демейки добушу"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Эскертменин демейки добушу"</string>
+    <string name="alarm_ringtone_title" msgid="6344025478514311386">"Ойготкучтун демейки үнү"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Дирилдеп чалынсын"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Башка үндөр"</string>
     <string name="dial_pad_tones_title" msgid="1999293510400911558">"Тергич үндөрү"</string>
@@ -2751,16 +2753,16 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> эреже автоматтык түрдө иштейт</item>
       <item quantity="one">1 эреже автоматтык түрдө иштейт</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Тынчымды алба\" режиминин жеке жөндөөлөрү"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Артыкчылыктууга гана уруксат"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"\"Тынчымды алба\" жөндөөлөрү"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Шашылыш эскертмелер гана"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Автоматтык эрежелер"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\"Тынчымды алба\" режиминин эрежелери"</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_important_interruptions" msgid="3903928008177972500">"Шашылыш эскертмелер гана"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Ойготкучтар гана"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Тымтырс"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Көрүүгө тоскоолдукту бөгөттөө"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Визуалдык эскертмелерди бөгөттөө"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Жумуш профилиндеги үндөр"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Жеке профилдин үндөрүн колдонуу"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Жумуш жана жеке профилдер үчүн окшош добуштар колдонулат"</string>
@@ -2778,19 +2780,20 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Эскертмелер"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Өркүндөтүлгөн"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Жумуш боюнча эскертмелер"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"Жаркылдаган жарык"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Жарык индикатору"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Кулпуланган экранда"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Эскертме толугу менен көрүнсүн"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Жеке эскертме жашырылсын"</string>
-    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Эскертмелер такыр көрсөтүлбөсүн"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Эскертмелер такыр көрүнбөсүн"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Түзмөгүңүз кулпуланып турганда, эскертмелер кандай болуп көрүнсүн?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Эскертмелер"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Жумуш эскертмесин толугу менен көрсөтүү"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Жумуш эскертмесинин астейдил мазмунун жашыруу"</string>
-    <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Жумуш эскертмелери такыр көрсөтүлбөсүн"</string>
+    <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="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_blocked" msgid="7938180808339386300">"Эскертмелер эч качан көрсөтүлбөсүн"</string>
@@ -2798,14 +2801,14 @@
     <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_min_summary" msgid="8233873580287975662">"Маанисиз: Добуш да чыгарбасын, экранда да көрсөтүлбөсүн"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Орточо: Добушу жок"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Маанилүү: Добуш чыксын"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Өтө маанилүү: Добуш менен экранга калкып чыксын"</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="6585849855452076626">"Добуш чыгарууга уруксат берүү"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Үн чыгарылбасын, дирилдебесин же бул эскертмелер учурдагы экранда көрүнбөсүн."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Эскертме жардамчысы"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Эскертмени колдонуу мүмкүнчлгү"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Эскертмелерди ишт мүмкүнчлгү"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Колдонмолор эскертмелерди окуй алышпайт"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="other">%d колдонмо эскертмелерди окуй алат</item>
@@ -2818,7 +2821,7 @@
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Өчүрүү"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Жок"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR көмөкчү кызматтары"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"Орнотулган колдонмолордун эч бири көмөкчү VR-кызматы катары иштөөгө уруксат сураган жок."</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"Орнотулган колдонмолор көмөкчү VR кызматы катары иштөөгө уруксат сураган жок."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"VR кызматына <xliff:g id="SERVICE">%1$s</xliff:g> кызматында иштөөгө уруксат берилсинби?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"Колдонмолор виртуалдык дүйнө режиминде колдонулганда <xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> иштей баштайт."</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Түзмөк VR режиминде турган кезде"</string>
@@ -2832,9 +2835,11 @@
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"Бул колдонмо ачылып турганда же андан чыгып кеткениңизде (мисалы, видео көрүүнү улантуу үчүн), колдонмого сүрөт ичиндеги сүрөт терезсин түзүүгө уруксат бериңиз. Терезе колдонулуп жаткан башка колдонмолордун үстүнөн көрсөтүлөт."</string>
     <string name="picture_in_picture_on" msgid="6103704909710176555">"Ооба"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Жок"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Тынчымды алба\" функциясын пайдалануу"</string>
+    <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Тынчымды алба\" функциясы"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Орнотулган колдонмолор үчүн \"Тынчымды алба\" функциясы талап кылынбайт"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Колдонмолор жүктөлүүдө…"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android тутуму бул колдонмонун эскертмелерин бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android тутуму ушул категориядагы эскертмелерди бул түзмөктөн көрсөтпөй, бөгөттөп жатат"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категориялар"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Башка"</string>
     <string name="no_channels" msgid="3077375508177744586">"Бул колдонмо эч кандай эскертме берген жок"</string>
@@ -2858,14 +2863,14 @@
     <string name="notification_badge_title" msgid="7166470350070693657">"Колдонмонун сүрөтчөсүн белгилөө"</string>
     <string name="notification_badge_summary" msgid="3944771498030335669">"Эгер колдоого алынса, эскертмелер Home колдонмосунда бейджик түрүндө көрсөтүлсүн."</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Тынчымды албаны өзгөртүп коюу"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Тынчымды алба режиминде\" \"Маанилүү гана\" деп белгиленсе ушул эскертмелерге уруксат берилет"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"\"Тынчымды алба режиминде\" \"Шашылыш эскертмелер гана\" деп белгиленсе ушул эскертмелер көрүнөт"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"Кулпуланган экранда"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Бөгөттөлгөн"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Маанилүүлүгү"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Сезимтал"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Бүттү"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Маанилүүлүгү"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"Жаркылдаган жарык"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Жарык индикатору"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"Дирилдесин"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Добуш"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Жок кылуу"</string>
@@ -2881,7 +2886,7 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Эреженин түрү"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Белгисиз"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Эрежени конфигурациялоо"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Убакыт"</string>
+    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Убакыт эрежеси"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Белгилүү бир убакытта \"Тынчымды алба\" режимин иштетүү эрежеси жөндөлгөн."</string>
     <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Окуя эрежеси"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Белгилүү бир окуялар учурунда \"Тынчымды алба\" режимин иштетүү эрежеси жөндөлгөн."</string>
@@ -2918,8 +2923,8 @@
     <string name="zen_mode_events" msgid="7914446030988618264">"Окуялар"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Бардык чалуучулар"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Тандалган чалуучулар"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Кайталанма чалуучулар"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Эгер бир эле киши <xliff:g id="MINUTES">%d</xliff:g> мүнөт ичинде экинчи жолу чалса, уруксат берилсин"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Кайра чалуучулар"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Эгер бир эле адам <xliff:g id="MINUTES">%d</xliff:g> мүнөттүн ичинде кайра чалса, уруксат берилсин"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Автоматтык түрдө күйүү"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Эч качан"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Түн сайын"</string>
@@ -2938,10 +2943,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> чейин \"Ойготкучтар гана\" режимин иштетүү"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Ар дайым үзгүлтүккө учуратуу режимине өзгөртүү"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Экран күйүп турганда бөгөттөлсүн"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\"Тынчымды албагыла\" режиминде эскертмелер тууралуу маалымат экранда көрсөтүлбөйт же калкып чыкпайт"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Экран күйүп тургнд бөгөттлсүн"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"\"Тынчымды алба\" режиминде өчүрүлгөн эскертмелер көрүнбөйт"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Экран өчүп турганда бөгөттөлсүн"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\"Тынчымды албагыла\" режиминде бөгөттөлгөн эскертмелер алынганда экран же жарык индикатору күйбөсүн"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"\"Тынчымды алба\" режиминде өчүрүлгөн эскертмелер алынганда экран же жарык индикатору күйбөйт"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"\"Тынчымды алба\" режиминде өчүрүлгөн эскертмелер алынганда экран күйбөсүн"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Өчүк"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Экран күйүп турганда"</string>
@@ -2952,34 +2957,30 @@
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Администратордун PIN кодун киргизиңиз"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Күйгүзүлгөн"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Өчүк"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Экранды кадап коюу"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Бул жөндөө күйгүзүлгөндө, учурдагы экран бошотулганга чейин көрүнүп турушу үчүн экран кадоону пайдалансаңыз болот.\n\nЭкран кадоону пайдалануу үчүн:\n\n1. Экран кадоо күйгүзүлгөнүн текшериңиз.\n\n2. Кадала турган экранды ачыңыз.\n\n3. Көз жүгүртүүнү таптаңыз.\n\n4. Жогору серпип, төөнөгүч сөлөкөтүн таптап коюңуз."</string>
+    <string name="screen_pinning_title" msgid="2292573232264116542">"Колдонмону кадоо"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Бул жөндөө аркылуу бир колдонмодон экинчисине өтүү мүмкүнчүлүгүн өчүрүп койсо болот.\n\nАл үчүн:\n\n1. Колдонмону кадоо функциясын иштетиңиз.\n\n2. Керектүү экранды ачыңыз.\n\n3. Көз жүгүртүүнү таптаңыз.\n\n4. Экранды жогору сүрүп, төөнөгүч сөлөкөтүнө тийип коюңуз."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Бошотуудан мурун кулпуну ачкан үлгү суралсын"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Бошотуудан мурун PIN суралсын"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Бошотуудан мурун сырсөз суралсын"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Бошотулганда түзмөк кулпулансын"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Колдонмо бошотулганда түзмөк кулпулансын"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Бул жумуш профилин төмөнкү башкарат:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Төмөнкү башкарат <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Сынамык)"</string>
     <string name="display_auto_rotate_title" msgid="7119684966039069439">"Түзмөктү буруу"</string>
-    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Экрандын мазмундарын айландыруу"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Тигинен көрүнүштө кала берсин"</string>
+    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"Көрүнүштү буруу"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"Тигинен көрүнө берсин"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"Туурасынан көрүнүштө кала берсин"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Учурдагы багытта кала берсин"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Коопсуз баштоо"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Улантуу"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Бул түзмөктү иштетүү үчүн PIN\'ди талап кылуу менен, аны коргосоңуз болот. Түзмөк иштетилмейинче чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар алынбайт. \n\nУшуну менен, жоголгон же уурдалган түзмөктөрдөгү дайындар корголот."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Бул түзмөктү иштетүү үчүн үлгүнү талап кылуу менен, аны коргосоңуз болот. Түзмөк иштетилмейинче чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар алынбайт. \n\nУшуну менен, жоголгон же уурдалган түзмөктөрдөгү дайындар корголот."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Бул түзмөктү иштетүү үчүн сырсөздү талап кылуу менен, аны коргосоңуз болот. Түзмөк иштетилмейинче чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар алынбайт. \n\nУшуну менен, жоголгон же уурдалган түзмөктөрдөгү дайындар корголот."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Түзмөгүңүздүн кулпусун ачуу үчүн манжа изин, ал эми аны коргоо үчүн PIN кодду колдонсоңуз болот. Түзмөк иштетилмейинче чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар алынбайт.\n\nУшуну менен жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого болот."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Түзмөгүңүздүн кулпусун ачуу үчүн манжа изин, ал эми аны коргоо үчүн графикалык үлгүнү колдонсоңуз болот. Түзмөк иштетилмейинче чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар алынбайт.\n\nУшуну менен жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого болот."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Түзмөгүңүздүн кулпусун ачуу үчүн манжа изин, ал эми аны коргоо үчүн сырсөздү колдонсоңуз болот. Түзмөк иштетилмейинче чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар алынбайт.\n\nУшуну менен жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого болот."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Түзмөктү жүргүзүү үчүн PIN талап кылуу"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Түзмөктү жүргүзүү үчүн графикалык ачкыч талап кылуу"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Түзмөктү жүргүзүү үчүн сырсөз талап кылуу"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Жок, рахмат"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Жок, рахмат"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Жок, рахмат"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Түзмөгүңүздү коргоо үчүн аны PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн PIN код коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Түзмөгүңүздү коргоо үчүн аны графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот. \n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн графикалык ачкыч коёсузбу?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Түзмөгүңүздү коргоо үчүн аны сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот. \n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн сырсөз коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Түзмөгүңүздү коргоо үчүн аны манжа изи менен же PIN код менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн PIN код коёсузбу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Түзмөгүңүздү коргоо үчүн аны манжа изи менен же графикалык ачкыч менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн графикалык ачкыч коёсузбу?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Түзмөгүңүздү коргоо үчүн аны манжа изи менен же сырсөз менен кулпулап койсоңуз болот. Түзмөк кулпуланып турганда, чалуулар, билдирүүлөр же эскертмелер, ошондой эле ойготкучтар жеткиликсиз болот.\n\nБул чаралар жоголгон же уурдалган түзмөктөрдөгү дайындарды коргоого жардам берет. Түзмөгүңүздү иштетүү үчүн сырсөз коёсузбу?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ооба"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Жок"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN талап кылынсынбы?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Үлгү талап кылынсынбы?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Сырсөз талап кылынсынбы?"</string>
@@ -2991,7 +2992,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI байланыштуу маалымат"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Оюк<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Демейки боюнча ачуу"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Шилтемелер ачылууда"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Шилтемелерди ачуу"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Колдоого алынган шилтемелерди ачуу"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Сурабай туруп ачуу"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Колдоого алынган шилтемелер"</string>
@@ -3029,7 +3030,7 @@
     </plurals>
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"Эч уруксат берилген жок"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"Эч уруксат суралган жок"</string>
-    <string name="filter_all_apps" msgid="1988403195820688644">"Бардк колдонмлр"</string>
+    <string name="filter_all_apps" msgid="1988403195820688644">"Бардык колдонмолор"</string>
     <string name="filter_enabled_apps" msgid="5395727306799456250">"Орнотулган колдонмолор"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"Ыкчам ачылуучу колдонмолор"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"Жеке"</string>
@@ -3047,10 +3048,10 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Колдонмолор <xliff:g id="APPS">%1$s</xliff:g> функцияларын пайдаланууда"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Ойготуу үчүн тийип коюңуз"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Түзмөктү ойготуу үчүн экрандын каалаган жерине эки жолу тийип коюңуз"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Шилтемелер ачылууда"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Шилтемелерди ачуу"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Колдоого алынган шилтемелер ачылбасын"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> ачуу"</string>
-    <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> жана башка URL\'дерди ачуу"</string>
+    <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> жана башка URL\'дер ачылат"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Колдоого алынган шилтемелерди ача турган колдонмо жок"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
       <item quantity="other">Колдоого алынган шилтемелерди <xliff:g id="COUNT">%d</xliff:g> колдонмо ачат</item>
@@ -3062,7 +3063,7 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Таанылган жок"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Демейки"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Жумуш үчүн демейки жөндөөлөр"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Көмөкчү жана үн менен киргизүү"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Жардамчы жана үн буйруктары"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"Көмөкчү колдонмо"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> сиздин көмөкчү колдонмоңуз болсунбу?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Жардамчы тутумуңузда иштеп жаткан программалар, ошондой эле экраныңызда көрүнүп турган же колдонмодогу маалыматты окуй алат."</string>
@@ -3075,8 +3076,8 @@
     <string name="default_app" msgid="6864503001385843060">"(Демейки)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Тутум)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Демейки тутум)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Колдонмо кампасы"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Колдонуу мүмкүнчүлүгү"</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="app_usage_preference" msgid="7065701732733134991">"Колдонмону пайдалануунун жеке жөндөөлөрү"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Колдонуу мүмкүнчүлүгү колдонмонун башка кандай колдонмолорду жана канча ирет пайдаланып жатканыңызга, ошондой эле операторуңуз, тил жөндөөлөрү жана башка маалыматтарга көз салышына жол ачат."</string>
@@ -3091,19 +3092,19 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"Орточо <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"Батареянн кубатн үнөмдөө"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Колдонуу эскертүүлөрү"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"Батареяны үнөмдөө"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Батареянын сарпталышы"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Бардык колдонмолорду көрсөтүү"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Кошумча колдонмолорду жашыруу"</string>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"Батарянн кубатн үнөмдшпйт"</string>
+    <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_system" msgid="7362862974428225301">"Батареянын кубатын үнөмдөөнү иштетүү мүмкүн эмес"</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>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> колдонмосу фондо тынымсыз иштей берсе, батареянын кубаты тез сарпталышы мүмкүн. \n\nАны кийинчерээк Жөндөөлөр, Колдонмолор жана эскертмелер бөлүмүнөн өзгөртсөңүз болот."</string>
     <string name="battery_summary" msgid="8044042095190688654">"Акыркы жолу толук кубатталгандан бери <xliff:g id="PERCENTAGE">%1$s</xliff:g> сарпталды"</string>
-    <string name="battery_power_management" msgid="5571519699679107523">"Батарея кубатын башкаруу"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"Батареянын кубатын башкаруу"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Акыркы жолу толук кубатталгандан бери батарея керектеле элек"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Колдонмонун жөндөөлөрү"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"SystemUI Tuner\'ди көрсөтүү"</string>
@@ -3203,9 +3204,9 @@
     <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_trusted" msgid="6857780460845250885">"Ооба"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Жок"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Колдонмону орнотууга уруксат берүү"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Уруксат берилген"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Тыюу салынган"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера үчүн кубат баскычын эки басыңыз"</string>
@@ -3219,9 +3220,9 @@
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"Чоңураак кылуу"</string>
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
-    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Салам, Азат!"</string>
-    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Кофе ичип, бүгүн кобурашып отурбайлыбы?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Мейли. Бул жерден алыс эмес, жакшы бир жерди билем."</string>
+    <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Салам Толкунбек!"</string>
+    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Салам! Бүгүн бир жакка барып тамак ичип келбейлиби?"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Макул! Жакын жерде жакшы кафе бар."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Жарайт!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Шй. 18:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Шй. 18:01"</string>
@@ -3240,10 +3241,10 @@
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Ички сактагыч: <xliff:g id="PERCENTAGE">%1$s</xliff:g> ээленген – <xliff:g id="FREE_SPACE">%2$s</xliff:g> бош"</string>
     <string name="display_summary" msgid="6737806235882127328">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> мүнөт ишсиз тургандан кийин уйку режимине өтүү"</string>
     <string name="display_dashboard_summary" msgid="4145888780290131488">"Тушкагаз, уйку режими, арип өлчөмү"</string>
-    <string name="display_summary_example" msgid="9102633726811090523">"10 мүнөт колдонулбагандан кийин уктоо режимине өтсүн"</string>
+    <string name="display_summary_example" msgid="9102633726811090523">"Түзмөк 10 мүнөт колдонулбагандан кийин көшүү режимине өтөт"</string>
     <string name="memory_summary" msgid="8080825904671961872">"Орто эсеп менен <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g> ичинен <xliff:g id="USED_MEMORY">%1$s</xliff:g> эстутум колдонулууда"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Учурдагы колдонуучу: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> каттоо эсеби аркылуу кирген"</string>
+    <string name="users_summary" msgid="1674864467098487328">"<xliff:g id="USER_NAME">%1$s</xliff:g> каттоо эсеби аркылуу кирдиңиз"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> демейки колдонмо"</string>
     <string name="location_on_summary" msgid="5127631544018313587">"КҮЙҮК / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"ӨЧҮК"</string>
@@ -3271,7 +3272,7 @@
     <string name="condition_zen_title" msgid="2679168532600816392">"\"Тынчымды алба\" режими күйүк (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Батареяны үнөмдөгүч күйүк"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Түзмөктүн иштеши солгундатылды. Жайгашкан жер кызматтары жана фондук дайындар өчүрүлдү."</string>
-    <string name="condition_cellular_title" msgid="1327317003797575735">"Мобилдик дайындар өчүрүлгөн"</string>
+    <string name="condition_cellular_title" msgid="1327317003797575735">"Мобилдик Интернет өчүрүлгөн"</string>
     <string name="condition_cellular_summary" msgid="1818046558419658463">"Интернет Wi-Fi аркылуу гана жеткиликтүү"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"Дайындарды үнөмдөгүч күйүк"</string>
     <string name="condition_bg_data_summary" msgid="656957852895282228">"Дайындарды фондук режимде өткөрүү үчүн Wi-Fi тармагына туташуу керек. Wi-Fi жок болгондо, айрым кызматтар менен колдонмолор иштебей калат."</string>
@@ -3287,31 +3288,31 @@
     <string name="color_temperature_toast" msgid="4974218172133854827">"Түс өзгөртүүлөрүн күчүнө киргизүү үчүн, экранды өчүрүңүз"</string>
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Telephony Monitor функциясын колдонуу үчүн түзмөктү өчүрүп-күйгүзүү керек"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматтык тутум жаңыртуулары"</string>
-    <string name="usage" msgid="2977875522080448986">"Колдонулушу"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Мобилдик дайындарды өткөрүү"</string>
+    <string name="usage" msgid="2977875522080448986">"Дайындардын өткөрүлүшү"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Мобилдик трафик"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Wi-Fi дайндрн колднлш"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Ethernet дайындарынын колдонулушу"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi‑Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> мобилдик дайындар"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> мобилдик трафик"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> Wi-Fi дайындары"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> Ethernet дайындары"</string>
-    <string name="cell_warning_only" msgid="763147658209027140">"Дайындар өткөрүлүп жатканда эскертүү: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="cell_warning_and_limit" msgid="2273413629267437470">"Дайындар өткөрүлүп жатканда эскертүү: <xliff:g id="ID_1">%1$s</xliff:g> / Дайындардын өткөрүлүшүн чектөө: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
-    <string name="billing_cycle" msgid="5169909190811133499">"Эсептерди коюу мерчими"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Бир айдын төлөө мерчими ай сайын <xliff:g id="ID_1">%1$s</xliff:g> күнү башталат"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Ай сайын <xliff:g id="ID_1">%1$s</xliff:g> күнүнөн баштап"</string>
+    <string name="cell_warning_only" msgid="763147658209027140">"Дайындардын өткөрүлүшү боюнча эскертүү: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="cell_warning_and_limit" msgid="2273413629267437470">"Дайындардын өткөрүлүшү боюнча эскертүү: <xliff:g id="ID_1">%1$s</xliff:g> / Дайындардын өткөрүлүшүн чектөө: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="billing_cycle" msgid="5169909190811133499">"Эсептешүү мерчими"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"Төлөө мерчими ар бир айдын <xliff:g id="ID_1">%1$s</xliff:g>-күнүнөн башталат"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Ар бир айдын <xliff:g id="ID_1">%1$s</xliff:g>-күнүнөн баштап"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Тармак чектөөлөрү"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> чектөө</item>
       <item quantity="one">1 чектөө</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"Байланыш оператору эсептеген дайындар түзмөгүңүздөгү дайындардан айырмаланышы мүмкүн."</string>
+    <string name="operator_warning" msgid="1862988028996859195">"Байланыш операторунун статистикасы түзмөгүңүздүн статистикасынан айырмаланышы мүмкүн."</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> колдонулду"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Трафик тууралуу эскертүү коюу"</string>
-    <string name="data_warning" msgid="209133958008062117">"Дайындар жөнүндө эскертүү"</string>
-    <string name="set_data_limit" msgid="2901526323210516923">"Дайындарга чек коюу"</string>
-    <string name="data_limit" msgid="1885406964934590552">"Дайындарды чектөө"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Трафик тууралуу эскертүү"</string>
+    <string name="data_warning" msgid="209133958008062117">"Эскертүүлөр"</string>
+    <string name="set_data_limit" msgid="2901526323210516923">"Трафикти чектөө"</string>
+    <string name="data_limit" msgid="1885406964934590552">"Чектелген трафик"</string>
     <string name="data_usage_template" msgid="392191945602400904">"<xliff:g id="ID_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>
@@ -3320,7 +3321,7 @@
       <item quantity="one">Дайындарды үнөмдөгүч күйүп турганда 1 колдонмо дайындарды чектөөсүз өткөрө алат</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Дайындарды үнөмдөгүч"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Дайндрды чексиз пайдалн"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Дайындарды чексиз пайдалануу"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фондук дайындар өчүрүлгөн"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Күйүк"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Өчүк"</string>
@@ -3372,10 +3373,10 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"эч бири"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Баалануучу объект жок болуп жатат."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Баалануучу объектте мындай ачкыч жок."</string>
-    <string name="special_access" msgid="3458780842491881155">"Колдонмону пайдаланууга берилген атайын мүмкүнчүлүк"</string>
+    <string name="special_access" msgid="3458780842491881155">"Атайын мүмкүнчүлүк"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> колдонмо дайындарды чектөөсүз пайдаланат</item>
-      <item quantity="one">1 колдонмо дайындарды чектөөсүз пайдаланат</item>
+      <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> колдонмо дайындарды чектөөсүз өткөрө алат</item>
+      <item quantity="one">1 колдонмо дайындарды чектөөсүз өткөрө алат</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Колдонуучунун дайындарын тазалап, файлды шифрлөөгө өтөсүзбү?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Тазалап туруп өтүү"</string>
@@ -3387,11 +3388,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Колдоо"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Эң кууш"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Орнотулган колдонмолордун эч бири артыкчылыктуу SMS жөнөтүүгө уруксат сураган жок"</string>
+    <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_connected_summary" msgid="8733997010923307915">"Төмөнкү түзмөккө туташкан"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Иштеп чыгуучунун ыкчам жөндөөлөр такталары"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Жардам берүүгө даярбыз"</string>
@@ -3409,8 +3411,8 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"Эл аралык байланыш акысын төлөп калышыңыз мүмкүн"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Телефон"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Маек"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Кеңештер жана ыкмаларды изилдөө"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"Издөө боюнча жардам алуу жана жооп пикир жөнөтүү"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Сунуштар жана пайдалуу кеңештер"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"Издөө боюнча жардам алуу/Пикир билдирүү"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Колдоо кызматына кайрылуу"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Кирүү"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"Кире албай жатасызбы?"</string>
@@ -3454,19 +3456,19 @@
     <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>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Камераларды ыкчам которуштуруу"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Камераны тез ачуу үчүн каалаган экрандан кубат баскычын эки жолу басыңыз."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Камераны которуштуруу"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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="2521630136233865893">"Эскертмелериңизди тез текшерүү үчүн экраныңызды эки жолу таптаңыз."</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="8696432220086951466">"Эскетмелериңизди тез текшерүү үчүн телефонуңузду алыңыз."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Эскертмелериңизди көрүү үчүн телефонуңузду колуңузга алыңыз."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Эскертмелериңизди тез текшерүү үчүн планшетиңизди алыңыз."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Эскетмелериңизди тез текшерүү үчүн түзмөгүңүздү алыңыз."</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Эскертмелериңизди көрүү үчүн түзмөгүңүздү колуңузга алыңыз."</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>
@@ -3570,7 +3572,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Планшеттин сактагычы"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Телефондун сактагычы"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> ичинен колдонулганы"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"колдонулду <xliff:g id="TOTAL">%1$s</xliff:g> ичинен"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"колдонулду"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Колдонмонун дайындарын тазалоо"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Бул ыкчам ачылуучу колдонмо алынып салынсынбы?"</string>
@@ -3580,7 +3582,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> үчүн өчүрүлгөн)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Автотолтуруу кызматы"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"авто, толтуруу, автотолтуруу"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> автотолтуруучу колдонмоңуз болсунбу? <xliff:g id="APP_NAME_1">%1$s</xliff:g> экраныңызды окуп, башка колдонмолордогу талааларды толтурууга мүмкүндүк алат."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Бул колдонмо ишенимдүү экенин тактаңыз&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; экрандагы нерселерди аныктап, автоматтык түрдө толтурууга боло турган талааларды табат."</string>
     <string name="device_theme" msgid="4571803018917608588">"Түзмөктүн темасы"</string>
     <string name="default_theme" msgid="7085644992078579076">"Демейки"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Сактагычты көзөмөлдөгүч: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index 305f26a..ccb296c 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ບໍ່ມີ"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ບໍ່ໃຊ້"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 7571cec..250928b 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ບັນຊີ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ສະຖານທີ່"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ບັນຊີ"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"ຄວາມປອດໄພ ແລະ ສະຖານທີ່"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ການເຂົ້າລະຫັດ ແລະ ຂໍ້ມູນການເຂົ້າສູ່ລະບົບ"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ເຂົ້າລະຫັດໂທລະສັບແລ້ວ"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ເຂົ້າລະຫັດໂທລະສັບແລ້ວ"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ການຕັ້ງຄ່າໜ້າຈໍລັອກ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ກຳນົດທີ່ຢູ່ຂອງຂ້ອຍ, ການປົດລັອກໜ້າຈໍ, ການລັອກບ່ອນເຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ຄວາມເປັນສ່ວນຕົວ"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ຖືກຜູ້ເບິ່ງແຍງລະບົບປິດໄວ້"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ສະຖານະຄວາມປອດໄພ"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"ຈັດ​ການ​ລາຍ​ນີ້ວ​ມື"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ໃຊ້​ລາຍ​ນີ້ວ​ມື​ສຳ​ລັບ"</string>
@@ -675,7 +674,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"ປິດ"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"ບໍ່ສາມາດໃຊ້ໄດ້ເນື່ອງຈາກ NFC ຖືກປິດໄວ້"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"ເມື່ອເປີດໃຊ້ຄຸນສົມບັດນີ້ແລ້ວ ທ່ານຈະສາມາດປ່ອຍຄື່ນສັນຍານ ເພື່ອສົ່ງເນື້ອຫາແອັບຯໄປໃຫ້ອຸປະກອນທີ່ຮອງຮັບ NFC ເຄື່ອງອື່ນໄດ້ໂດຍການນຳອຸປະກອນມາຢູ່ໃກ້ໆກັນ. ຍົກຕົວຢ່າງເຊັ່ນ: ທ່ານສາມາດສົ່ງໜ້າເວັບ, ວິດີໂອ YouTube, ລາຍຊື່ຜູ່ຕິດຕໍ່ ແລະຂໍ້ມູນອື່ນໆ ໃຫ້ກັບອຸປະກອນອື່ນໂດຍໃຊ້ NFC ໄດ້.\n\nພຽງນຳອຸປະກອນມາຢູ່ໃກ້ໆກັນ (ໂດຍປົກກະຕິຈະເອົາດ້ານຫຼັງມາຕິດກັນ) ຈາກນັ້ນແຕະໃສ່ທີ່ໜ້າຈໍຂອງທ່ານ, ແອັບຯກໍຈະກວດສອບວ່າຈະສົ່ງຂໍ້ມູນຫຍັງແດ່."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"ເມື່ອເປີດຄຸນສົມບັດນີ້ແລ້ວ ທ່ານຈະສາມາດປ່ອຍຄື້ນສັນຍານ ເພື່ອສົ່ງເນື້ອຫາແອັບໄປຫາອຸປະກອນທີ່ຮອງຮັບ NFC ເຄື່ອງອື່ນໄດ້ໂດຍການນຳອຸປະກອນມາຢູ່ໃກ້ໆກັນ. ຍົກຕົວຢ່າງເຊັ່ນ: ທ່ານສາມາດສົ່ງໜ້າເວັບ, ວິດີໂອ YouTube, ລາຍຊື່ຜູ້ຕິດຕໍ່ ແລະຂໍ້ມູນອື່ນໆ ໃຫ້ກັບອຸປະກອນອື່ນໂດຍໃຊ້ NFC ໄດ້.\n\nພຽງນຳອຸປະກອນມາຢູ່ໃກ້ໆກັນ (ໂດຍປົກກະຕິຈະເອົາດ້ານຫຼັງມາຕິດກັນ) ຈາກນັ້ນແຕະໜ້າຈໍຂອງທ່ານ, ແອັບກໍຈະກວດສອບວ່າຈະສົ່ງຂໍ້ມູນຫຍັງແດ່."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi​-Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"ເປີດໃຊ້ Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi​-Fi"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ບໍ່ສາມາດໃຊ້ໄດ້ເນື່ອງຈາກການສະແກນ Wi‑Fi ປິດຢູ່"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"ຕັ້ງຄ່າ 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet Mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"ທີ່ຢູ່ IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"ເຄືອຂ່າຍ​ທີ່​ບັນທຶກ​ໄວ້"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"ການຕັ້ງຄ່າ IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"ບໍ່ສາມາດໃຊ້ການຕັ້ງຄ່າ Wi‑Fi ຂັ້ນສູງກັບຜູ້ໃຊ້ນີ້ໄດ້"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ປິດ"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ເພື່ອຄວບຄຸມວ່າຈະເກີດຫຍັງຂຶ້ນເມື່ອວາງໂທລະສັບໄວ້ ແລະ/ຫຼື ເມື່ອກຳລັງນອນຫຼັບ, ໃຫ້ເປີດພາບພັກໜ້າຈໍກ່ອນ."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ເລີ່ມຕອນໃດ"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"ຕົວພັກໜ້າຈໍປັດຈຸບັນ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ເລີ່ມດຽວນີ້"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ການຕັ້ງຄ່າ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ປັບຄວາມແຈ້ງອັດຕະໂນມັດ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ຍົກ​ເພື່ອ​ເປີດ​ໜ້າ​ຈໍ"</string>
-    <string name="doze_title" msgid="5389406335828323273">"ໜ້າຈໍການແຈ້ງເຕືອນສາຍໂທເຂົ້າ"</string>
+    <string name="doze_title" msgid="2259176504273878294">"ການ​ສະ​ແດງ​ຜົນ​ສະ​ພາບ​ແວດ​ລ້ອມ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ເປີດໜ້າຈໍເມື່ອທ່ານໄດ້ຮັບການແຈ້ງເຕືອນ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ຂະໜາດຕົວອັກສອນ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ເຮັດໃຫ້ຂໍ້ຄວາມໃຫຍ່ຂຶ້ນ ຫຼື ນ້ອຍລົງ"</string>
@@ -1379,8 +1376,8 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"ໂຫມດຂໍ້ມູນສະຖານທີ່"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ໃຊ້ GPS, Wi‑Fi, Bluetooth ຫຼື ເຄືອຂ່າຍມືຖືເພື່ອລະບຸສະຖານທີ່"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ໃຊ້ Wi‑Fi, Bluetooth ຫຼື ເຄືອຂ່າຍມືຖືເພື່ອລະບຸສະຖານທີ່"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ໃຊ້ GPS ເພື່ອກຳ​ນົດ​ທີ່​ຕັ້ງຂອງທ່ານ"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ກຳລັງສະແກນ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ໃຊ້ GPS ເພື່ອຊອກຫາສະຖານທີ່ຂອງທ່ານ"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"ການສະແກນ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"ການ​ສະ​ແກນ Wi‑Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"​ປັບ​ປຸງ​ທີ່​ຕັ້ງໂດຍ​ການ​ອະ​ນຸຍາດ​ໃຫ້ແອັບ ແລະ ການ​ບໍ​ລິ​ການຂອງລະບົບເພື່ອກວດຫາ​ເຄືອ​ຂ່າຍ Wi‑Fi ໄດ້​ທຸກ​ເວ​ລາ."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"ການ​ສະ​ແກນ Bluetooth"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"ການອັບເດດລະບົບ ບໍ່ສາມາດຖືກຕິດຕັ້ງໃສ່ບ່ອນຈັດເກັບຂໍ້ມູນພາຍນອກໄດ້."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"ບໍ່ສາມາດຕິດຕັ້ງແອັບຜູ້ເບິ່ງແຍງລະບົບອຸປະກອນຢູ່ມີເດຍພາຍນອກໄດ້"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"ບັງ​ຄັບ​ປິດ?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"ຫານທ່ານບັງຄັບປິດແອັບຯໃດນຶ່ງ, ມັນອາດເຮັດວຽກຜິດປົກກະຕິໄດ້."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"ຫານທ່ານບັງຄັບປິດແອັບໃດໜຶ່ງ, ມັນອາດເຮັດວຽກຜິດປົກກະຕິໄດ້."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ບໍ່ສາມາດຍ້າຍແອັບຯໄດ້. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"ບ່ອນຕິດຕັ້ງທີ່ຕ້ອງການ"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ບໍ່ເຄີຍໃຊ້)"</string>
@@ -1676,7 +1674,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"ການຕັ້ງຄ່າແປ້ນພິມແທ້"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"ກົດປຸ່ມຍະຫວ່າງສອງຄັ້ງເພື່ອໃສ່ເຄື່ອງໝາຍ \".\""</string>
     <string name="show_password" msgid="4837897357002495384">"ສະແດງລະຫັດຜ່ານ"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"ສະແດງຕົວອັກສອນຫຍໍ້ໆເມື່ອທ່ານພິມ"</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_quick_settings" msgid="246728645150092058">"ການຕັ້ງຄ່າ"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"ພາສາ"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"ຕົວຊ່ວຍທາງລັດແປ້ນພິມ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ສະແດງປຸ່ມລັດທີ່ໃຊ້ໄດ້"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ຄ່າເລີ່ມຕົ້ນ"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"ເມົ້າ/ແທຣັກແພດ"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ຄວາມໄວລູກສອນ"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ມືເກມ"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"ໃຊ້ການສັ່ນເຕືອນ"</string>
@@ -1888,7 +1885,7 @@
     <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>
+    <string name="print_service_disabled" msgid="7739452396114245222">"ບໍລິການຖືກປິດການນຳໃຊ້"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"ວຽກ​ພິມ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"ວຽກ​ພິມ"</string>
     <string name="print_restart" msgid="8373999687329384202">"ປິດເປີດໃໝ່"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ການນຳໃຊ້ໜ້າຈໍຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ການໃຊ້ພະລັງງານໄປກັບໜ້າຈໍ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ການສະແກນເຄືອຂ່າຍມືຖື"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> ກ່ອນ"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"ການນຳໃຊ້ແອັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="TIME">%1$s</xliff:g> ກ່ອນ)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ກ່ອນ"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"ການນຳໃຊ້ແອັບຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ (<xliff:g id="TIME">^1</xliff:g> ກ່ອນ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ໄລຍະເວລາທີ່ໜ້າຈໍເປີດຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ການນຳໃຊ້ອຸປະກອນຕັ້ງແຕ່ສາກເຕັມຫຼ້າສຸດ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ການນຳໃຊ້ແບັດເຕີຣີຕັ້ງແຕ່ຖອດສາຍສາກ"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"ກ້ອງຖ່າຍຮູບ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi​-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"ການສະແຕນບາຍເຄືອຂ່າຍ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"ການສະແຕນບາຍເຄືອຂ່າຍມືຖື"</string>
     <string name="power_phone" msgid="5392641106474567277">"ການໂທດ້ວຍສຽງ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ແທັບເລັດບໍ່ເຮັດວຽກ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ໂທລະ​ສັບ​ບໍ່​ເຮັດ​ວຽກ"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ການ​ນຳ​ໃຊ້​ແບັດ​ເຕີ​ຣີ​ແມ່ນ​ການ​ປະ​ມານ​ຂອງ​ການ​ໃຊ້​ພະ​ລັງ​ງານ ແລະ​ບໍ່​ຮວມ​ເຖິງ​ທຸກໆ ແຫລ່ງ​ການ​ນຳ​ໃຊ້​ແບັດ​ເຕີ​ຣີ. ການ​ນຳ​ໃຊ້​ພະ​ລັງ​ງານ​ອື່ນໆ ແມ່ນ​ຄວາມ​ແຕກ​ຕ່າງ​ລະ​ຫວ່າງ​ການ​ນຳ​ໃຊ້​ພະ​ລັງ​ງານ​ໂດຍ​ປະ​ມານ ແລະ​ການ​ນຳ​ໃຊ້​ໂຕ​ຈິງ​ທີ່​ຕິດ​​ຕາມ​ໃນ​ແບັດ​ເຕີ​ຣີ."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ການໃຊ້ພະລັງງານທີ່ຄິດໄລ່ເກີນ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"ໃຊ້ເປັນເວລາ %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"ໃຊ້ເປັນເວລາ <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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ການຕັ້ງຄ່າປ້ອນຂໍ້ມູນສຽງເຂົ້າ &amp; ອອກ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ຊອກຫາດ້ວຍສຽງ"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"ແປ້ນພິມ Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"ການ​​ເວົ້າ"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"ການ​ຕັ້ງ​ຄ່າ​ການ​ປ້ອນ​ຂໍ້​ມູນ​​ດ້ວຍສຽງ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ການປ້ອນ​ຂໍ້ມູນ​ດ້ວຍສຽງ"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"​ບໍ​ລິ​ການ​ປ້ອນ​ຂໍ້​ມູນ​ດ້ວຍ​ສຽງ"</string>
@@ -2146,7 +2142,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">"ທ່ານຕ້ອງຕັ້ງ PIN ລັອກໜ້າຈໍ ຫຼືລະຫັດຜ່ານ ກ່ອນທີ່ຈະສາມາດໃຊ້ບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງໄດ້."</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>
@@ -2157,7 +2153,7 @@
     <string name="backup_configure_account_title" msgid="3790872965773196615">"ບັນຊີສຳຮອງ"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"​ຮວມ​ຂໍ້​ມູນ​ແອັບຯ"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"ການກູ້ຂໍ້ມູນອັດຕະໂນມັດ"</string>
-    <string name="auto_restore_summary" msgid="4235615056371993807">"ເມື່ອຕິດຕັ້ງແອັບຯໃດນຶ່ງຄືນໃໝ່, ໃຫ້ໃຊ້ການຕັ້ງຄ່າ ແລະຂໍ້ມູນທີ່ເຄີຍສຳຮອງໄວ້"</string>
+    <string name="auto_restore_summary" msgid="4235615056371993807">"ເມື່ອຕິດຕັ້ງແອັບໃດໜຶ່ງຄືນໃໝ່, ໃຫ້ໃຊ້ການຕັ້ງຄ່າ ແລະ ຂໍ້ມູນທີ່ເຄີຍສຳຮອງໄວ້"</string>
     <string name="backup_inactive_title" msgid="685838037986644604">"ບໍລິການສຳຮອງຂໍ້ມູນບໍ່ເຮັດວຽກ"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"ບໍ່ມີບັນຊີໃດໃນປັດຈຸບັນທີ່ຈັດເກັບຂໍ້ມູນສຳຮອງໄວ້"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ລະ​ດັບ​ສຽງ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ຣິງໂທນໂທລະສັບ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ສຽງແຈ້ງເຕືອນເລີ່ມຕົ້ນ"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ແອັບມີສຽງ"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"ສຽງແຈ້ງເຕືອນເລີ່ມຕົ້ນ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ສຽງ​ໂມງ​ປຸກ​ຕາມຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ສັ່ນ​ເຕືອນ​ເມື່ອ​ມີ​ການ​ໂທ​ເຂົ້າ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ສຽງ​ອື່ນໆ"</string>
@@ -2775,7 +2773,7 @@
     <string name="ringtones_install_custom_sound_title" msgid="5948792721161302255">"ເພີ່ມສຽງແບບກຳນົດເອງບໍ?"</string>
     <string name="ringtones_install_custom_sound_content" msgid="2195581481608512786">"ໄຟລ໌ນີ້ຈະຖືກສຳເນົາໄປໃສ່ໂຟນເດີ <xliff:g id="FOLDER_NAME">%s</xliff:g>"</string>
     <string name="ringtones_category_preference_title" msgid="5675912303120102366">"ຣິງໂທນ"</string>
-    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"Other sounds and vibrations"</string>
+    <string name="other_sound_category_preference_title" msgid="2521096636124314015">"ສຽງ ແລະ ການສັ່ນເຕືອນອື່ນໆ"</string>
     <string name="configure_notification_settings" msgid="7616737397127242615">"ການແຈ້ງເຕືອນ"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"​ຂັ້ນ​ສູງ"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"ການແຈ້ງເຕືອນວຽກ"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"ຢ່າສະແດງການແຈ້ງເຕືອນອີກ"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"ຕໍ່ຳ: ບໍ່ມີສຽງ ຫຼື ການລົບກວນທາງພາບ"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"ປານກາງ: ບໍ່ມີສຽງ"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ສູງ: ເປີດສຽງ"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"ເລັ່ງດ່ວນ: ເປີດສຽງ ແລະ ສະແດງຢູ່ໜ້າຈໍ"</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="6585849855452076626">"ອະນຸຍາດສຽງ"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ບໍ່ໃຊ້ສຽງ, ສັ່ນ ຫຼື ເຫັນການແຈ້ງເຕືອນເຫຼົ່ານີ້ໃນໜ້າຈໍປັດຈຸບັນ."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ຕົວຊ່ວຍ​ການ​ແຈ້ງ​ເຕືອນ"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"​ຫ້າມ​ລົບ​ກວນການ​ເຂົ້າ​ຫາ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ບໍ່​ມີ​ການ​ຂໍ​ແອັບ​ທີ່​ຕິດ​ຕັ້ງ​ໄວ້ ​ຫາ​ຫ້າມ​ລົບ​ກວນການ​ເຂົ້າ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ກຳລັງບລັອກການແຈ້ງເຕືອນແອັບບໍ່ໃຫ້ປາກົດໃນອຸປະກອນນີ້"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ກຳລັງບລັອກການແຈ້ງເຕືອນໃນໝວດໝູ່ນີ້ບໍ່ໃຫ້ປາກົດໃນອຸປະກອນນີ້"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ໝວດໝູ່"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ອື່ນໆ"</string>
     <string name="no_channels" msgid="3077375508177744586">"This app has not posted any notifications"</string>
@@ -2910,7 +2911,7 @@
     <string name="zen_mode_messages" msgid="5886440273537510894">"ຂໍ້​ຄວາມ"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"ຂໍ້​ຄວາມທັງໝົດ"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"ຂໍ້​ຄວາມ​ເລືອກ​ໄວ້"</string>
-    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ຈາກ​ຜູ້​ໃດ​ຜູ້​ໜຶ່ງ"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"ຈາກທຸກຄົນ"</string>
     <string name="zen_mode_from_contacts" msgid="2232335406106711637">"ຈາກ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ເທົ່າ​ນັ້ນ"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"ຈາກ​ລາຍ​ຊື່​ຕິດ​ຕໍ່​ໃສ່​ດາວ​ໄວ້​ເທົ່າ​ນັ້ນ"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"ບໍ່ມີ"</string>
@@ -2919,8 +2920,8 @@
     <string name="zen_mode_events" msgid="7914446030988618264">"ກິດຈະກຳ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ຜູ້​ໂທທັງ​ໝົດ"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ຜູ້​ໂທ​ທີ່​ເລືອກ​ໄວ້"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ຊ້ຳ​ຄືນ​ຜູ້​ໂທ"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ຖ້າ​ຄົນ​ດຽວ​ກັນ​ໂທ​ເປັນ​ຄັ້ງ​ທີ​ສອງ​ພາຍ​ໃນ​ໄລ​ຍະ​ເວ​ລາ <xliff:g id="MINUTES">%d</xliff:g> ວິ​ນາ​ທີ, ອະ​ນຸ​ຍາດ​ໃຫ້​ມັນ​ໄດ້"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ຜູ້ໂທຊ້ຳໆ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"ອະນຸຍາດໃຫ້ຮັບສາຍໄດ້ຖ້າຄົນດຽວກັນໂທຊ້ຳໃນ <xliff:g id="MINUTES">%d</xliff:g> ນາທີ"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"ເປີດ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ບໍ່ໃຊ້"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ທຸກ​ທ່ຽງ​ຄືນ"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ໃຊ້ທິດທາງ​ປັດຈຸບັນ​ຂອງ​ໜ້າ​ຈໍ"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ການເລີ່ມຕົ້ນຢ່າງປອດໄພ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ດຳເນີນການຕໍ່"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"ທ່ານ​ສາ​ມາດ​ເສີມ​ການ​ປ້ອງ​ກັນ​ໃຫ້​ອຸ​ປະ​ກອນ​ນີ້​ໄດ້ ໂດຍ​ການ​ບັງ​ຄັບ​ໃຫ້​ໃສ່​ລະ​ຫັດ PIN ​ກ່ອນ​ເປີດ​ໃຊ້. ​ກ່ອນ​ການ​ເປີດ​ໃຊ້, ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ສາ​ມາດຮັບ​ໂທ​ລະ​ສັບ, ຂໍ້​ຄວາມ ຫຼື ການ​ແຈ້ງ​ເຕືອນ ຮວມ​ເຖິງ​ໂມງ​ປຸກ​ໄດ້. \n\n​ມັນ​ຈະ​ຊ່ວຍ​ປ້ອງ​ການ​ການ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ຫາກ​ອຸ​ປະ​ກອນ​ສູນ​ຫາຍ ຫຼື ຖືກ​ລັກ."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"ທ່ານ​ສາ​ມາດ​ເສີມ​ການ​ປ້ອງ​ກັນ​ໃຫ້​ອຸ​ປະ​ກອນ​ນີ້​ໄດ້ ໂດຍ​ການ​ບັງ​ຄັບ​ໃຫ້​ໃສ່​​ຮູບ​ແບບ​ປົດ​ລັອກກ່ອນ​ເປີດ​ໃຊ້. ​ກ່ອນ​ການ​ເປີດ​ໃຊ້, ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ສາ​ມາດຮັບ​ໂທ​ລະ​ສັບ, ຂໍ້​ຄວາມ ຫຼື ການ​ແຈ້ງ​ເຕືອນ ຮວມ​ເຖິງ​ໂມງ​ປຸກ​ໄດ້. \n\n​ມັນ​ຈະ​ຊ່ວຍ​ປ້ອງ​ການ​ການ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ຫາກ​ອຸ​ປະ​ກອນ​ສູນ​ຫາຍ ຫຼື ຖືກ​ລັກ."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"ທ່ານ​ສາ​ມາດ​ເສີມ​ການ​ປ້ອງ​ກັນ​ໃຫ້​ອຸ​ປະ​ກອນ​ນີ້​ໄດ້ ໂດຍ​ການ​ບັງ​ຄັບ​ໃຫ້​ໃສ່​ລະ​ຫັດ​ກ່ອນ​ເປີດ​ໃຊ້. ​ກ່ອນ​ການ​ເປີດ​ໃຊ້, ອຸ​ປະ​ກອນ​ຈະ​ບໍ່​ສາ​ມາດຮັບ​ໂທ​ລະ​ສັບ, ຂໍ້​ຄວາມ ຫຼື ການ​ແຈ້ງ​ເຕືອນ ຮວມ​ເຖິງ​ໂມງ​ປຸກ​ໄດ້. \n\n​ມັນ​ຈະ​ຊ່ວຍ​ປ້ອງ​ການ​ການ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ຫາກ​ອຸ​ປະ​ກອນ​ສູນ​ຫາຍ ຫຼື ຖືກ​ລັກ."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"ນອກຈາກການໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານຍັງສາມາດປ້ອງກັນອຸປະກອນນີ້ ໂດຍການຮຽກຮ້ອງໃຫ້ມີ PIN ຂອງທ່ານກ່ອນທີ່ມັນຈະເລີ່ມຕົ້ນນຳໃຊ້. ມັນບໍ່ສາມາດຮັບສາຍການໂທ, ຂໍ້ຄວາມ ຫຼືການແຈ້ງເຕືອນ ຮວມທັງ ໃຊ້ໂມງປຸກໄດ້ຈົນກວ່າວ່າອຸປະກອນຈະເລີ່ມນຳໃຊ້.\n\nນີ້ຊ່ວຍປົກປ້ອງຂໍ້ມູນຢູ່ໃນອຸປະກອນທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"ນອກຈາກການໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານຍັງສາມາດປ້ອງກັນອຸປະກອນນີ້ ໂດຍການຮຽກຮ້ອງໃຫ້ມີຮູບແບບປົດລັອກຂອງທ່ານກ່ອນທີ່ມັນຈະເລີ່ມຕົ້ນນຳໃຊ້. ມັນບໍ່ສາມາດຮັບສາຍການໂທ, ຂໍ້ຄວາມ ຫຼືການແຈ້ງເຕືອນ ຮວມທັງ ໃຊ້ໂມງປຸກໄດ້ຈົນກວ່າວ່າອຸປະກອນຈະເລີ່ມນຳໃຊ້.\n\nນີ້ຊ່ວຍປົກປ້ອງຂໍ້ມູນຢູ່ໃນອຸປະກອນທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"ນອກຈາກການໃຊ້ລາຍນິ້ວມືຂອງທ່ານເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ຕື່ມອີກ ໂດຍການຮຽກຮ້ອງໃຫ້ມີລະຫັດຜ່ານຂອງທ່ານກ່ອນທີ່ມັນຈະເລີ່ມຕົ້ນນຳໃຊ້. ມັນບໍ່ສາມາດຮັບສາຍການໂທ, ຂໍ້ຄວາມ ຫຼື ການແຈ້ງເຕືອນ ຮວມທັງໃຊ້ໂມງປຸກໄດ້ຈົນກວ່າວ່າອຸປະກອນຈະເລີ່ມນຳໃຊ.\n\nນີ້ຊ່ວຍປົກປ້ອງຂໍ້ມູນຢູ່ໃນອຸປະກອນທີ່ເສຍ ຫຼື ຖືກລັກ."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"​ຕ້ອງ​ປ້ອນ​ລະ​ຫັດ PIN ເພື່ອ​ເລີ່ມ​ໃຊ້​ອຸ​ປະ​ກອນ"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"​ຕ້ອງ​ປ້ອນ​ຮູບ​ແບບ​ປົດ​ລັອກ​ເພື່ອ​ເລີ່ມ​ໃຊ້​ອຸ​ປະ​ກອນ"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"ຕ້ອງ​ປ້ອນ​ລະ​ຫັດ​ຜ່ານ​ເພື່ອ​ເລີ່ມ​ໃຊ້​ອຸ​ປະ​ກອນ"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"ບໍ່, ຂອບໃຈ"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"ບໍ່, ຂອບໃຈ"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"ບໍ່, ຂອບໃຈ"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໄດ້ເພີ່ມເຕີມໂດຍການໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນເປີດຂຶ້ນມາ. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້. \n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດ PIN ເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ່?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໄດ້ເພີ່ມເຕີມໂດຍການໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນເປີດຂຶ້ນມາ. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້. \n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ຮູບແບບປົດລັອກເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ່?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໄດ້ເພີ່ມເຕີມໂດຍການໃຫ້ລະບຸລະຫັດຜ່ານກ່ອນເປີດຂຶ້ນມາ. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້. \n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ລະບຸລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ່?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດ PIN ກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ລະຫັດ PIN ເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ຮູບແບບປົດລັອກກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ໃສ່ຮູບແບບປົດລັອກເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ນອກເໜືອໄປຈາກການໃຊ້ລາຍນິ້ວມືເພື່ອປົດລັອກອຸປະກອນຂອງທ່ານແລ້ວ, ທ່ານສາມາດປ້ອງກັນອຸປະກອນນີ້ໃຫ້ຍິ້ງຂຶ້ນໂດຍການໃຫ້ໃສ່ລະຫັດຜ່ານກ່ອນເລີ່ມຕົ້ນມັນໄດ້. ຫາກບໍ່ເປີດໃຫ້ເລີ່ມເຮັດວຽກແລ້ວ, ມັນຈະບໍ່ສາມາດຮັບສາຍ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ຫຼື ໂມງປຸກໄດ້.\n\nນີ້ຈະຊ່ວຍປ້ອງກັນຂໍ້ມູນເມື່ອອຸປະກອນເສຍ ຫຼື ຖືກລັກໄດ້. ຕ້ອງໃຫ້ລະບຸລະຫັດຜ່ານເພື່ອເລີ່ມຕົ້ນອຸປະກອນຂອງທ່ານບໍ?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ແມ່ນແລ້ວ"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"ບໍ່"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ຕ້ອງການລະຫັດ PIN ຫຼື​ບໍ່?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ຕ້ອງການຮູບແບບ​ປົດລັອກບໍ່?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ຕ້ອງການ​ລະຫັດຜ່ານຫຼື​ບໍ່?"</string>
@@ -3093,7 +3090,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"ການປັບແບັດເຕີຣີໃຫ້ເໝາະສົມ"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Usage alerts"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"ການແຈ້ງເຕືອນການນຳໃຊ້"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"ສະແດງແອັບທັງໝົດ"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"ເຊື່ອງແອັບເພີ່ມເຕີມ"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"ບໍ່ໄດ້ປັບໃຫ້ເໝາະສົມ"</string>
@@ -3103,7 +3100,7 @@
     <string name="high_power_desc" msgid="6283926163708585760">"ບໍ່ນໍາໃຊ້ການປັບແບັດເຕີຣີໃຫ້ເໝາະສົມ. ອາດຈະເຮັດໃຫ້ແບັດເຕີຣີຂອງທ່ານໝົດໄວ."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"ໃຫ້ແອັບເຮັດວຽກໃນພື້ນຫຼັງໄດ້ຕະຫຼອດເວລາບໍ?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"ການອະນຸຍາດໃຫ້ <xliff:g id="APP_NAME">%1$s</xliff:g> ເຮັດວຽກໃນພື້ນຫຼັງໄດ້ຕະຫຼອດເວລາອາດຫຼຸດອາຍຸແບັດເຕີຣີລົງ. \n\nທ່ານສາມາດປ່ຽນແປງຄ່ານີ້ໃນພາຍຫຼັງໄດ້ຈາກການຕັ້ງຄ່າ &gt; ແອັບ &amp; ການແຈ້ງເຕືອນ."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"ໃຊ້ໄປ <xliff:g id="PERCENTAGE">%1$s</xliff:g>%% ​ເທື່ອຕັ້ງ​ແຕ່​ການ​ສາກ​ໄຟ​ເຕັມ​ຫຼ້າສຸດ"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"ໃຊ້ໄປ <xliff:g id="PERCENTAGE">%1$s</xliff:g> ​ເທື່ອຕັ້ງ​ແຕ່​ການ​ສາກ​ໄຟ​ເຕັມ​ຫຼ້າສຸດ"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"ການຈັດການພະລັງງານ"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"ບໍ່​ມີ​ການ​ໃຊ້​ແບັດ​ເຕີ​ຣີ​ຕັ້ງ​ແຕ່​ການ​ສາກ​ໄຟ​ເຕັມ​ເທື່ອ​ສຸດ​ທ້າຍ"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"ການຕັ້ງຄ່າແອັບ"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"ແມ່ນແລ້ວ"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"ບໍ່"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"ອະນຸຍາດການຕິດຕັ້ງແອັບ"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"ອະນຸຍາດແລ້ວ"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"ບໍ່ອະນຸຍາດແລ້ວ"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ກົດ​ປຸ່ມ​ປິດ​ເປີດ​ສອງ​ຄັ້ງ​ສຳ​ລັບ​ກ້ອງ​ຖ່າຍ​ຮູບ"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"ເຊື່ອມຕໍ່ແລ້ວ"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Quick settings developer tiles"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"ພວກເຮົາຢູ່ນີ້ເພື່ອຊ່ວຍເຫຼືອ"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ຖຶືກປິດໄວ້ສຳລັບຜູ້ໃຊ້ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ບໍລິການຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ອັດຕະໂນມັດ, ຕື່ມຂໍ້ມູນ, ຕື່ມຂໍ້ມູນອັດຕະໂນມັດ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"ຕັ້ງໃຫ້ <xliff:g id="APP_NAME_0">%1$s</xliff:g> ເປັນແອັບຕື່ມຂໍ້ມູນອັດຕະໂນມັດຂອງທ່ານບໍ? <xliff:g id="APP_NAME_1">%1$s</xliff:g> ຈະສາມາດອ່ານໜ້າຈໍຂອງທ່ານ ແລະ ຕື່ມຂໍ້ມູນໃສ່ຊ່ອງງຂໍ້ມູນຕ່າງໆໃນແອັບອື່ນໄດ້."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ໃຫ້ກວດສອບວ່າທ່ານເຊື່ອແອັບນີ້&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ຈະໃຊ້ສິ່ງທີ່ຢູ່ໃນໜ້າຈໍຂອງທ່ານເພື່ອກວດເບິ່ງວ່າຈະຕື່ມຂໍ້ມູນຫຍັງອັດຕະໂນມັດ."</string>
     <string name="device_theme" msgid="4571803018917608588">"ຮູບແບບສີສັນອຸປະກອນ"</string>
     <string name="default_theme" msgid="7085644992078579076">"ຄ່າເລີ່ມຕົ້ນ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Storage Manager: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 5e5f34e..9b48cb7 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Nėra"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nėra"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index cd651ef..ad3a54b 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -111,7 +111,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Atsijungti?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Tai nutrauks ryšį su:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Neturite leidimo keisti „Bluetooth“ nustatymų."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ matomas netoliese esantiems įrenginiams, kai atidaryti „Bluetooth“ nustatymai."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"„<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“ matomas netoliese esantiems įrenginiams, kai įjungti „Bluetooth“ nustatymai."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Atjungti „<xliff:g id="DEVICE_NAME">%1$s</xliff:g>“?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transliavimas"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Neleisti profilio?"</string>
@@ -333,20 +333,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Paskyros"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vietovė"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Paskyros"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sauga ir vietovė"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifruotė ir prisijungimo duomenys"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefonas užšifruotas"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefonas užšifruotas"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Užrakinimo ekrano nuostatos"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, prisijungimo duomenų saugyklos užraktą"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privatumas"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Išjungė administratorius"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Saugos būsena"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Ekrano užraktas, kontrolinis kodas"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekrano užraktas"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kontr. kodo jutiklis"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Kontrolin. kodų tvark."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Kontrolinių kodų naud."</string>
@@ -369,7 +368,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Praleisti"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Pridėti piršto atsp."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio planšetinio kompiuterio, jei jį prarasite, jis bus pavogtas ar išvalytas."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Įrenginio apsaugos funkcija nebus suaktyvinta. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio įrenginio, jei jį prarasite, jis bus pavogtas ar išvalytas."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Įrenginio apsaugos funkcija nebus suaktyvinta. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio įrenginio, jei jį prarasite, jis bus pavogtas ar buvo išvalyti jo duomenys."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Įrenginio apsaugos funkcija nebus suaktyvinta. Negalėsite apsaugoti, kad kiti asmenys nenaudotų šio telefono, jei jį prarasite, jis bus pavogtas ar išvalytas."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite užtikrinti, kad kiti asmenys nesinaudotų planšetiniu kompiuteriu, jei jį prarasite ar jis bus pavogtas."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Įrenginio apsaugos funkcijos nebus suaktyvintos. Negalėsite užtikrinti, kad kiti asmenys nesinaudotų įrenginiu, jei jį prarasite ar jis bus pavogtas."</string>
@@ -714,6 +713,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Pranešti, kai pasiekiamas aukštos kokybės viešas tinklas"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automatiškai įjungti „Wi‑Fi“"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"„Wi‑Fi“ bus vėl įjungtas esant šalia išsaugotų aukštos kokybės tinklų, pvz., jūsų namų tinklo"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nepasiekiama, nes „Wi‑Fi“ nuskaitymas išjungtas"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vengti prasto ryšio"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nenaudoti „Wi-Fi“ tinklo, jei jo interneto ryšys nėra geras"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Naudoti tik tuos tinklus, kurių stiprus interneto ryšys"</string>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"„Wi‑Fi“ konfigūravimas"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Potinklio kaukė"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"„IPv6“ adresai"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Išsaugoti tinklai"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP nustatymai"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"„Wi‑Fi“ išplėstiniai nustatymai nepasiekiami šiam naudotojui"</string>
@@ -1041,13 +1039,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Išjungta"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Jei norite valdyti, kas vyksta, kai telefonas yra doke ir (arba) veikia miego režimu, įjunkite ekrano užsklandą."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kada paleisti"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Dabartinė ekrano užsklanda"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Pradėti dabar"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nustatymai"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatinis šviesumas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pakelti ir pažadinti"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Gaunamo pranešimo ekranas"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Aplinkos vaizdas"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Pažadinti ekraną, kai gaunamas pranešimas"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Padidinkite arba sumažinkite tekstą"</string>
@@ -1306,7 +1303,7 @@
     <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 nustatymų nustatymas iš naujo"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Tinklo nust. nustatymas iš naujo"</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>
@@ -1394,7 +1391,7 @@
     <string name="location_title" msgid="1029961368397484576">"Mano vieta"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Darbo profilio vieta"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Režimas"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Didelis tikslumas"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"didelis tikslumas"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Akumuliatoriaus tausojimas"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Tik įrenginys"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Vietovė išjungta"</string>
@@ -1645,6 +1642,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Parduotuvė"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Išsami programos informacija"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Programa įdiegta iš „<xliff:g id="APP_STORE">%1$s</xliff:g>“"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Daugiau informacijos apie „<xliff:g id="APP_STORE">%1$s</xliff:g>“"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Programos operacijos"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Vykdoma"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Niekada nenaudota)"</string>
@@ -1721,7 +1719,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Sparčiųjų klavišų pagalbos programa"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Pateikti pasiekiamus sparčiuosius klavišus"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Numatytasis"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Pelė / jutiklinis kilimėlis"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Žymiklio greitis"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Žaidimų valdiklis"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Naudoti vibravimą"</string>
@@ -1789,7 +1786,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Pritaikymas neįgaliesiems"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Pasiekiamumo nustatymai"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Ekrano skaitytuvai, vaizdo, sąveikos valdikliai"</string>
-    <string name="vision_settings_title" msgid="4204111425716868288">"Regėjimo nustatymai"</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="screen_reader_category_title" msgid="7739154903913400641">"Ekrano skaitytuvai"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Garsas ir tekstas ekrane"</string>
@@ -1957,8 +1954,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekrano naudojimas po paskutinio visiško įkrovimo"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrano suvartojama energija"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobiliojo ryšio tinklo nuskaitymas"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"prieš <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Programų naudojimas po visiško įkrovimo (prieš <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"prieš <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Programų naud. po visiško įkrovimo (prieš <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Kiek laiko ekranas buvo įjungtas po visiško įkrovimo"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Įrenginio naudojimas po visiško įkrovimo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumuliatoriaus naudojimas po to, kai buvo ištrauktas iš lizdo"</string>
@@ -1989,7 +1986,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparatas"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobilusis telefonas veikia laukimo režimu"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobiliojo ryšio tinklo budėjimo režimas"</string>
     <string name="power_phone" msgid="5392641106474567277">"Balso skambučiai"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetinis kompiuteris neveikos būsenos"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonas veikia laukimo režime"</string>
@@ -2049,7 +2046,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Akumuliatoriaus naudojimas apytiksliai atitinka energijos sunaudojimą. Jis neapima visų akumuliatoriaus eikvojimo šaltinių. Naudojimo įvairiais tikslais vertė yra skirtumas tarp apskaičiuoto apytikslio energijos sunaudojimo ir išmatuoto faktinio akumuliatoriaus išeikvojimo."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Per daug apskaičiuotos energijos naudojimas"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Naudota %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Naudojama <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> naudoja „<xliff:g id="APP">%2$s</xliff:g>“"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> visos akumuliatoriaus įkrovos"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Naudojimo nuo paskutinio visiško įkrovimo analizė"</string>
@@ -2121,7 +2118,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balso įvesties ir išvesties nustatymai"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Paieška balsu"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"„Android“ klaviatūra"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Kalba"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Įvesties balsu nustatymai"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Įvestis balsu"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Įvesties balsu paslaugos"</string>
@@ -2783,6 +2779,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Pranešimo garsumas"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Numatytasis pranešimo garsas"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Programos pateiktas garsas"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Numatytasis pranešimo garsas"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Numatytasis signalo garsas"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Taip pat vibruoti, kai skamb."</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Kiti garsai"</string>
@@ -2846,6 +2844,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kaip norite matyti profilio pranešimus, kai įrenginys užrakintas?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilio pranešimai"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Niekada nerodyti pranešimų"</string>
@@ -2853,10 +2852,10 @@
     <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_min_summary" msgid="8233873580287975662">"Maža: nėra garso ir vaizdas nepertraukiamas"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Vidutinė: nėra garso"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Didelė: skambėti"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Skubus: skambėti ir iššokti 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="6585849855452076626">"Leisti garsus"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Neskambėti, nevibruoti arba nerodyti šių pranešimų dabartiniame ekrane."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Pranešimų pagelbiklis"</string>
@@ -2892,6 +2891,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"„Android“ blokuoja šios programos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"„Android“ blokuoja šios kategorijos pranešimus, kad jie nebūtų rodomi šiame įrenginyje"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorijos"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Kita"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ši programa nepaskelbė jokių pranešimų"</string>
@@ -3033,18 +3034,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Išlaikyti esamą orientaciją"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Saugus paleidimas"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tęsti"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Galite papildomai apsaugoti įrenginį reikalaudami PIN kodo prieš jį paleidžiant. Kol įrenginys nepaleistas, negalima gauti skambučių ar pranešimų, įskaitant įspėjimus. \n\nTai padeda apsaugoti prarastų arba pavogtų įrenginių duomenis."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Galite papildomai apsaugoti įrenginį reikalaudami atrakinimo piešinio prieš jį paleidžiant. Kol įrenginys nepaleistas, negalima gauti skambučių ar pranešimų, įskaitant įspėjimus. \n\nTai padeda apsaugoti prarastų arba pavogtų įrenginių duomenis."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Galite papildomai apsaugoti įrenginį reikalaudami slaptažodžio prieš jį paleidžiant. Kol įrenginys nepaleistas, negalima gauti skambučių ar pranešimų, įskaitant įspėjimus. \n\nTai padeda apsaugoti prarastų arba pavogtų įrenginių duomenis."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Galite ne tik atrakinti įrenginį piršto atspaudu, bet ir dar labiau jį apsaugoti reikalaudami įvesti PIN kodą prieš paleidžiant įrenginį. Kol įrenginys nepaleistas, jame negausite skambučių ar pranešimų, įskaitant signalus.\n\nTaip apsaugomi prarastų ar pavogtų įrenginių duomenys."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Galite ne tik atrakinti įrenginį piršto atspaudu, bet ir dar labiau jį apsaugoti reikalaudami nupiešti atrakinimo piešinį prieš paleidžiant įrenginį. Kol įrenginys nepaleistas, jame negausite skambučių ar pranešimų, įskaitant signalus.\n\nTaip apsaugomi prarastų ar pavogtų įrenginių duomenys."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Galite ne tik atrakinti įrenginį piršto atspaudu, bet ir dar labiau jį apsaugoti reikalaudami įvesti slaptažodį prieš paleidžiant įrenginį. Kol įrenginys nepaleistas, jame negausite skambučių ar pranešimų, įskaitant signalus.\n\nTaip apsaugomi prarastų ar pavogtų įrenginių duomenys."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Paleidžiant įrenginį reikalauti PIN kodo"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Paleidžiant įrenginį reikalauti atrakinimo piešinio"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Paleidžiant įrenginį reikalauti slaptažodžio"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ne, ačiū"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ne, ačiū"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ne, ačiū"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Galite dar labiau apsaugoti šį įrenginį nustatę, kad prieš jį paleidžiat būtų prašoma įvesti slaptažodį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus. \n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti įvesti slaptažodį norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma įvesti PIN kodą. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti PIN kodo norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma nubrėžti atrakinimo piešinį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti atrakinimo piešinio norint paleisti jūsų įrenginį?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Be to, kad atrakinant įrenginį prašoma kontrolinio kodo, galite dar labiau apsaugoti šį įrenginį nustatę, kad jį paleidžiant būtų prašoma įvesti slaptažodį. Nepaleidus įrenginio juo nebus gaunami skambučiai ir pranešimai, įskaitant signalus.\n\nTaip bus apsaugoti pamestų ar pavogtų įrenginių duomenys. Reikalauti įvesti slaptažodį norint paleisti jūsų įrenginį&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Taip"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Reikalauti PIN kodo?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Reikalauti atr. piešinio?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Reikalauti slaptažodžio?"</string>
@@ -3148,7 +3145,7 @@
     <string name="default_app" msgid="6864503001385843060">"(Numatytoji)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Sistema)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Sistemos numatytasis nustatymas)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"Programų atmintis"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"Programų saugykla"</string>
     <string name="usage_access" msgid="5479504953931038165">"Naudojimo prieiga"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Leisti naudojimo prieigą"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Programos naudojimo nuostatos"</string>
@@ -3278,9 +3275,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Programai bus leidžiama keisti sistemos nustatymus."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Taip"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Taip"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ne"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Leisti diegti programas"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Leidžiama"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Neleidžiama"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Leisti iš šio šaltinio"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dukart pasukti, kad fotoap. pr. būtų at."</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Atidarykite fotoaparato programą dukart pasukę riešą"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Dukart pasp. mait. mygt. fotoap. atidar."</string>
@@ -3365,7 +3362,7 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Kad pritaikytumėte telefonijos stebėjimo priemonės pakeitimą, paleiskite įrenginį iš naujo"</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 duomenų naudojimas"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Mobiliojo ryšio duom. naud."</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"„Wi-Fi“ duomenų naudojimas"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Eterneto duomenų naudojimas"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3417,7 +3414,7 @@
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Atrakinkite naudodami kitą pirštą"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Įjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Išjungta / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Niekada neįjungti automatiškai"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"niekada neįjungti automatiškai"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Įjungti automatiškai, kai lieka %1$s akumuliatoriaus energijos"</string>
     <string name="not_battery_optimizing" msgid="5362861851864837617">"Akumuliatoriaus optimizavimas nenaudojamas"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Jei įrenginys užrakintas, neleisti įvesti atsakymų ar kito teksto pranešimuose"</string>
@@ -3474,7 +3471,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Prijungta prie"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Sparčiųjų nustatymų kūrėjo išklotinės elementai"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Esame pasiruošę padėti"</string>
@@ -3683,7 +3681,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(išjungta naudotojui <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Automatinio pildymo paslauga"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatinis, pildymas, automatinis pildymas"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Nustatyti „<xliff:g id="APP_NAME_0">%1$s</xliff:g>“ kaip automatinio pildymo programą? „<xliff:g id="APP_NAME_1">%1$s</xliff:g>“ galės skaityti ekrane pateikiamą informaciją ir užpildyti laukus kitose programose."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Įsitikinkite, kad pasitikite šia programa&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=„Google“ automatinis pildymas&gt;%1$s&lt;/xliff:g&gt; naudodamas informaciją ekrane nustato, ką gali užpildyti automatiškai."</string>
     <string name="device_theme" msgid="4571803018917608588">"Įrenginio tema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Numatytoji"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Saugyklos tvarkytuvė: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 9a5270d..94d6557 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Nav"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nav"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 3500635..b169e52 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -331,20 +331,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Atrašanās vieta"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Drošība un atrašanās vieta"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrēšana un akreditācijas dati"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Tālrunis ir šifrēts"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Tālrunis ir šifrēts"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Bloķēšanas ekrāna preferences"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Konfidencialitāte"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Atspējoja administrators"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Drošības statuss"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Ekrāna bloķēšana, pirksta nospiedums"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekrāna bloķēšana"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Pirkstu nospiedumi"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Nospiedumu pārvaldība"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Nospieduma lietošana"</string>
@@ -703,6 +702,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Paziņot, kad ir pieejams augstas kvalitātes publiskais tīkls"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Automātiski ieslēgt Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi tiks automātiski atkārtoti ieslēgts netālu no saglabātiem augstas kvalitātes tīkliem, piemēram, netālu no mājas tīkla."</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nav pieejama, jo ir izslēgta Wi‑Fi meklēšana"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Nelietot vājus savienojumus"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nelietot Wi-Fi tīklu, ja vien tam nav labs interneta savienojums"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Izmantot tikai tīklus ar labu interneta savienojumu"</string>
@@ -825,11 +825,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurēt Wi-Fi tīklu"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Apakštīkla maska"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adreses"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saglabātie tīkli"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP iestatījumi"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi papildu iestatījumi šim lietotājam nav pieejami."</string>
@@ -1029,13 +1027,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izslēgts"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Lai kontrolētu, kas notiek, kad tālrunis tiek dokots un/vai ir miega režīmā, ieslēdziet ekrānsaudzētāju."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kad sākt"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Pašreizējais ekrānsaudzētājs"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Sākt tūlīt"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Iestatījumi"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Pacelt, lai ieslēgtu"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Ienākoša paziņojuma ekrāns"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambients displejs"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivizēt ekrānu, kad tiek saņemts paziņojums"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Palielināt vai samazināt tekstu"</string>
@@ -1630,6 +1627,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Veikals"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Lietotnes informācija"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Lietotne instalēta, izmantojot <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Papildinformācija par <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Lietotnes darbības"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Darbojas"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nekad nav izmantots)"</string>
@@ -1706,7 +1704,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Tastatūras īsinājumtaustiņu palīgs"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Rādīt pieejamos īsinājumtaustiņus"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Noklusējums"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Pele/kursorplanšete"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Rādītāja ātrums"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Spēļu vadība"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Vibrosignāla izmantošana"</string>
@@ -1936,8 +1933,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ekrāna lietojums kopš pilnas uzlādes"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekrāna lietojuma patēriņš"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobilo tīklu meklēšana"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Pirms <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Jaudas patēriņš lietotnēs kopš pilnas uzlādes (pirms <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Pirms <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Jaudas patēriņš lietotnēs kopš pilnas uzlādes (pirms <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Cik ilgi ekrāns ir ieslēgts kopš pilnas uzlādes"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Ierīces lietojums kopš pilnas uzlādes"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Akumulatora lietojums kopš atslēgšanas"</string>
@@ -1957,7 +1954,7 @@
     <string name="awake" msgid="387122265874485088">"Ierīces nomoda laiks"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi uz laiku"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi uz laiku"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Papildu informācija par akumulatora lietojumu"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Dati par akum. lietojumu"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Vēstures dati"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Akumulatora lietojums"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Izmantot detaļas"</string>
@@ -1968,7 +1965,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobilā tālruņa gaidstāve"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilā tīkla gaidstāve"</string>
     <string name="power_phone" msgid="5392641106474567277">"Balss zvani"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planšetdators ir gaidstāvē"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Tālrunis dīkstāvē"</string>
@@ -2028,7 +2025,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Patērētā akumulatora jauda ir aptuvens enerģijas patēriņa aprēķins, un tajā nav ietverti visi avoti, kuri patērē akumulatora enerģiju. Dažādu avotu rādītājs nozīmē starpību starp aptuveno aprēķināto enerģijas patēriņu un faktiski novēroto patēriņu."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Par daudz uzskaitītais enerģijas patēriņš"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Izmantots: %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Izmantots šādu laiku: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> izmanto lietotne <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> no vispārējā akumulatora lietojuma"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Sadalījums kopš pēdējās pilnās uzlādes"</string>
@@ -2050,7 +2047,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Lietotnes optimizācija"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Akumulatora enerģijas taupīšanas režīms"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Enerģijas taupīšanas režīms"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Ieslēgt automātiski"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nekad"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ar akumulatora uzlādes līmeni <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
@@ -2100,7 +2097,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Balss ievades un izvades iestatījumi"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Balss meklēšana"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android tastatūra"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Runa"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Balss ievades iestatījumi"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Balss ievade"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Balss ievades pakalpojumi"</string>
@@ -2573,7 +2569,7 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Pieskarties un maksāt"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Plašāka informācija"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Maksājiet veikalos, izmantojot savu tālruni"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Noklusējuma lietotne maksājumu veikšanai"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Noklusējuma maksājumu lietotne"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Nav iestatīta"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> — <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Izmantot noklusējumu"</string>
@@ -2757,10 +2753,12 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Paziņojumu skaļums"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tālruņa zvana signāls"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Paziņojuma noklusējuma skaņa"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Lietotnes nodrošinātā skaņa"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Paziņojuma noklusējuma skaņa"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Signāla noklusējuma skaņa"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrācija zvaniem"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Citas skaņas"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Numura sastādīšanas tastatūras skaņas"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Numura sast. tastatūras skaņas"</string>
     <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekrāna bloķēšanas skaņas"</string>
     <string name="charging_sounds_title" msgid="1132272552057504251">"Uzlādes signāli"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Dokošanas skaņas"</string>
@@ -2779,7 +2777,7 @@
       <item quantity="one">Ieslēgta <xliff:g id="ON_COUNT">%d</xliff:g> automātiskā kārtula</item>
       <item quantity="other">Ieslēgtas <xliff:g id="ON_COUNT">%d</xliff:g> automātiskās kārtulas</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Režīma “Netraucēt” preferences"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"“Netraucēt” preferences"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Tikai prioritārie"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Autom. kārtulas"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"“Netraucēt” kārtulu iestatīšana"</string>
@@ -2819,6 +2817,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kā ierīcē rādīt profila paziņojumus, kad tā ir bloķēta?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profila paziņojumi"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Nekad nerādīt paziņojumus"</string>
@@ -2826,10 +2825,10 @@
     <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_min_summary" msgid="8233873580287975662">"Nav svarīgi: bez skaņas vai vizuāla signāla"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Vidēji svarīgi: bez skaņas"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Svarīgi: atskaņot skaņas signālu"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Ļoti svarīgi: atskaņot skaņas signālu un īslaicīgi parādīt 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="6585849855452076626">"Atļaut 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="default_notification_assistant" msgid="7631945224761430146">"Paziņojumu palīgs"</string>
@@ -2864,6 +2863,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android neatļauj šīs lietotnes paziņojumu rādīšanu šajā ierīcē"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android neatļauj šīs kategorijas paziņojumu rādīšanu šajā ierīcē"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorijas"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Cits"</string>
     <string name="no_channels" msgid="3077375508177744586">"Šai lietotnei nav neviena paziņojuma."</string>
@@ -3001,18 +3002,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Saglabāt pašreizējo virzienu"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Drošā palaišana"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Turpināt"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus vai paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība pazaudētās vai nozagtās ierīcēs."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta grafiskā atslēga. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus vai paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība pazaudētās vai nozagtās ierīcēs."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus vai paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība pazaudētās vai nozagtās ierīcēs."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Papildus atbloķēšanai ar pirkstu nospiedumu varat iestatīt, lai pirms ierīces palaišanas tiktu pieprasīts PIN kods. Šādi jūs uzlabosiet ierīces aizsardzību. Ja ierīce nav palaista, netiek saņemti zvani, īsziņas, paziņojumi, tostarp signāli.\n\nTādējādi tiek aizsargāti ierīces dati, ja tā tiek pazaudēta vai nozagta."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Papildus atbloķēšanai ar pirkstu nospiedumu varat iestatīt, lai pirms ierīces palaišanas tiktu pieprasīta kombinācija. Šādi jūs uzlabosiet ierīces aizsardzību. Ja ierīce nav palaista, netiek saņemti zvani, īsziņas, paziņojumi, tostarp signāli.\n\nTādējādi tiek aizsargāti ierīces dati, ja tā tiek pazaudēta vai nozagta."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Papildus atbloķēšanai ar pirkstu nospiedumu varat iestatīt, lai pirms ierīces palaišanas tiktu pieprasīta parole. Šādi jūs uzlabosiet ierīces aizsardzību. Ja ierīce nav palaista, netiek saņemti zvani, īsziņas, paziņojumi, tostarp signāli.\n\nTādējādi tiek aizsargāti ierīces dati, ja tā tiek pazaudēta vai nozagta."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Sāknējot ierīci, pieprasīt PIN kodu"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Sāknējot ierīci, pieprasīt kombināciju"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Sāknējot ierīci, pieprasīt paroli"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nē, paldies"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nē, paldies"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nē, paldies"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt PIN pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta kombinācija. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt kombināciju pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Varat uzlabot šīs ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Papildus ierīces atbloķēšanai ar pirksta nospiedumu varat uzlabot ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīts PIN. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt PIN pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Papildus ierīces atbloķēšanai ar pirksta nospiedumu varat uzlabot ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta kombinācija. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt kombināciju pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Papildus ierīces atbloķēšanai ar pirksta nospiedumu varat uzlabot ierīces drošības līmeni, iestatot, lai pirms ierīces palaišanas tiktu pieprasīta parole. Kamēr ierīce nav palaista, nevar saņemt zvanus, ziņojumus un paziņojumus, tostarp modinātāja signālus.\n\nTādējādi tiek uzlabota datu aizsardzība nozaudētās vai nozagtās ierīcēs. Vai pieprasīt paroli pirms ierīces palaišanas?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Jā"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nē"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vai pieprasīt PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vai pieprasīt atslēgu?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vai pieprasīt paroli?"</string>
@@ -3024,7 +3021,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Ar IMEI saistīta informācija"</string>
     <string name="slot_number" msgid="3762676044904653577">"(<xliff:g id="SLOT_NUM">%1$d</xliff:g>. slots)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Atvērt pēc noklusējuma"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Saišu atvēršana"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Palaišanas saites"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Atbalstīto saišu atvēršana"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Atvērt bez vaicāšanas"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Atbalstītās saites"</string>
@@ -3083,7 +3080,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Lietotnes, kuras izmanto: <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Pieskarieties, lai aktivizētu"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Lai aktivizētu ierīci, veiciet dubultskārienu jebkurā ekrāna vietā."</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Saišu atvēršana"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Palaišanas saites"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Neatvērt atbalstītās saites"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Atvērt: <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Atvērt <xliff:g id="DOMAIN">%s</xliff:g> un citus vietrāžus URL"</string>
@@ -3227,7 +3224,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Lietotnes ar atļauju"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Jā"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Nē"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Instalēt nezināmas lietotnes"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Instalēt nez. lietotnes"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalēt lietotnes nezināmi avoti"</string>
     <string name="write_settings" msgid="4797457275727195681">"Iestatījumu pārveidošana"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"rakstīt, pārveidot sistēmas iestatījumus"</string>
@@ -3241,9 +3238,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Ar šo atļauju lietotnes var pārveidot sistēmas iestatījumus."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Jā"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nē"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Jā"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nē"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Atļaut instalēt lietotnes"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Atļauts"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nav atļauts"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Atļaut no šī avota"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Pagriešana divreiz kameras atvēršanai"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Atvērt kameras lietotni, divreiz pagriežot plaukstas locītavu"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera, divreiz nospiežot barošanas pogu"</string>
@@ -3433,7 +3430,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Izveidots savienojums ar:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Izstrādātāja ātro iestatījumu elementi"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Esam gatavi jums palīdzēt"</string>
@@ -3506,13 +3504,13 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Dubultskāriens, lai skatītu planšetdatora paziņojumus"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Dubultskāriens, lai skatītu ierīces paziņojumus"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Lai ātri skatītu paziņojumus, veiciet dubultskārienu ekrānam."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tālruņa pacelšana, lai skatītu paziņojumus"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Tālruņa pārbaude paceļot"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Planšetdatora pacelšana, lai skatītu paziņojumus"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Ierīces pacelšana, lai skatītu paziņojumus"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Lai ātri skatītu paziņojumus, paņemiet tālruni."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Lai ātri skatītu paziņojumus, paņemiet planšetdatoru."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Lai ātri skatītu paziņojumus, paņemiet ierīci."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Pirksta nospieduma vilkšana, lai skatītu paziņojumus"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Ziņu skatīšana ar pirksta nospiedumu"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru tālruņa aizmugurē."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru planšetdatora aizmugurē."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Lai skatītu paziņojumus, velciet uz leju pār pirksta nospieduma sensoru ierīces aizmugurē."</string>
@@ -3630,9 +3628,9 @@
     <string name="audio_files_title" msgid="4777048870657911307">"Audio faili"</string>
     <string name="webview_uninstalled_for_user" msgid="1819903169194420983">"(atinstalēts lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(atspējots lietotājam <xliff:g id="USER">%s</xliff:g>)"</string>
-    <string name="autofill_app" msgid="7338387238377914374">"Automātiskās aizpildes pakalpojums"</string>
+    <string name="autofill_app" msgid="7338387238377914374">"Automātiskā aizpilde"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automātiskā aizpilde"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Vai izvēlaties automātiskās aizpildes lietotni <xliff:g id="APP_NAME_0">%1$s</xliff:g>? <xliff:g id="APP_NAME_1">%1$s</xliff:g> varēs lasīt ekrāna saturu un aizpildīt laukus citās lietotnēs."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Pārliecinieties, ka šī lietotne ir uzticama&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google automātiskā aizpilde&gt;%1$s&lt;/xliff:g&gt; izmanto ekrānā redzamo, lai noteiktu, kādu informāciju aizpildīt automātiski."</string>
     <string name="device_theme" msgid="4571803018917608588">"Ierīces motīvs"</string>
     <string name="default_theme" msgid="7085644992078579076">"Noklusējums"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Krātuves pārvaldnieks: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 0732038..6f1a4f4 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ниеден"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ниеден"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -348,7 +350,7 @@
     <item msgid="2098976479485046797">"Основна јачина на звук"</item>
     <item msgid="5660213838861789350">"Јачина на звук на глас"</item>
     <item msgid="7983336752371254444">"Јачина на звук на ѕвонење"</item>
-    <item msgid="7878027809189330917">"Јачина на звук на медиуми"</item>
+    <item msgid="7878027809189330917">"Јачина на аудио/видео звук"</item>
     <item msgid="7260546305036218513">"Јачина на звук на аларм"</item>
     <item msgid="9103719301075748925">"Јачина на звук на известување"</item>
     <item msgid="7025966722295861512">"Јачина на звук на Bluetooth"</item>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index da309a9..459a51c 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Сметки"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Сметки"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Безбедност и локација"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрирање и акредитиви"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Телефонот е шифриран"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефонот е шифриран"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Поставки за заклучен екран"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Постави „Моја локација“, отклучување на екран, заклучување на СИМ картичка, заклучување на меморија со акредитиви"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Постави „Моја локација“, отклучување на екран, заклучување на меморија за акредитиви"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Приватност"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Оневозможено од администраторот"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Безбедносен статус"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Управување отпечатоци"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Користи отпечатоци за"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недостапно бидејќи скенирањето преку Wi-Fi е исклучено"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Конфигурирање на Wi‑Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ИП адреса"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска на подмрежа"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адреси"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Зачувани мрежи"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Поставки на ИП"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Напредни поставки за Wi‑Fi не се достапни за корисников"</string>
@@ -963,7 +961,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"Осветленост"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Приспособи ја осветленоста на екранот"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"Приспособлива осветленост"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизирање ниво на осветленост за достапното светло"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизирање ниво на осветленост според достапното светло"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Исклучена"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Претпочитаната осветленост е многу мала"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"Претпочитаната осветленост е мала"</string>
@@ -1001,7 +999,7 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Ќе се исклучи автоматски на изгрејсонце."</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>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Исклучено"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"За да контролирате што се случува кога телефонот е приклучен на полнач и/или е во мирување, вклучете го заштитникот на екранот."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Кога да започне"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Тековен заштитник на екранот"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Започни сега"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Поставки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматска осветленост"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигнете да се активира"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Екран за дојдовни известувања"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Амбиентален екран"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Разбудете го екранот кога ќе примите известувања"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Големина на фонт"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Намалете го или зголемете го текстот"</string>
@@ -1239,7 +1236,7 @@
     <string name="battery_status_title" msgid="9159414319574976203">"Статус на батеријата"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Ниво на батерија"</string>
     <string name="apn_settings" msgid="3743170484827528406">"Поставки на APN"</string>
-    <string name="apn_edit" msgid="1354715499708424718">"Уреди пристапна точка"</string>
+    <string name="apn_edit" msgid="1354715499708424718">"Измени пристапна точка"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Не е подесено"</string>
     <string name="apn_name" msgid="4115580098369824123">"Име"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Никогаш не е користена)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Помош за кратенки на тастатура"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Прикажи ги достапните кратенки на тастатурата"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Стандардно"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Глувче"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Брзина на покажувач"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Контролор на игра"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Користи вибрации"</string>
@@ -1714,8 +1711,8 @@
     <string name="user_dict_settings_add_locale_option_name" msgid="5696358317061318532">"Јазик:"</string>
     <string name="user_dict_settings_add_word_hint" msgid="5725254076556821247">"Внеси збор"</string>
     <string name="user_dict_settings_add_shortcut_hint" msgid="7333763456561873445">"Кратенка по избор"</string>
-    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Уреди збор"</string>
-    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Уреди"</string>
+    <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Измени збор"</string>
+    <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Измени"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Избриши"</string>
     <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Немате зборови во корисничкиот речник. За да додадете збор, допрете го копчето Додај (+)."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"За сите јазици"</string>
@@ -1788,7 +1785,7 @@
     <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>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Копче за прекин на телефонски повик"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Прекини повик со копче за вклучување"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Голем покажувач на глувчето"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Моно аудио"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Комбинирај канали кога се пушта аудио"</string>
@@ -1864,7 +1861,7 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да го потврдите PIN-кодот."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Со оглед на тоа што вклучувањето <xliff:g id="SERVICE">%1$s</xliff:g> влијае врз шифрирањето податоци, треба да ја потврдите лозинката."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Ги набљудува вашите активности"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Прима известувања кога сте во интеракција со некоја апликација."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Примајте известувања кога сте во интеракција со некоја апликација."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Запри <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Допри „Во ред“ и <xliff:g id="SERVICE">%1$s</xliff:g> ќе запре."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Нема инсталирано услуги"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Употреба на екранот по целосно полнење"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошувачка на екранот"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилна мрежа"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"пред <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Употреба на апликациите по целосно полнење (пред <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"пред <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Употреба на апликациите по целосно полнење (пред <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Време на активен екран по целосно полнење"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Употреба на уредот по целосно полнење"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Употреба на батеријата од исклучување"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Мобилен во режим на подготвеност"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Мобилна мрежа во мирување"</string>
     <string name="power_phone" msgid="5392641106474567277">"Говорни повици"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет во мирување"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон во мирување"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Користење на батеријата е приближното користење на напојувањето на батеријата и не ги вклучува сите извори што ја трошат. Разнообразно е разликата помеѓу пресметаното приближно користење на батеријата и вистинското трошење што се забележува кај батеријата."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Надмината употреба на напојување"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Користена е %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Користење <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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Поставки на влез и излез на глас"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Барај со глас"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Тастатура за Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Говор"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Поставки за гласовен запис"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Гласовен запис"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Услуги на гласовен запис"</string>
@@ -2398,7 +2394,7 @@
     <string name="vpn_save" msgid="4233484051644764510">"Зачувај"</string>
     <string name="vpn_connect" msgid="8469608541746132301">"Поврзи се"</string>
     <string name="vpn_replace" msgid="5442836256121957861">"Замени"</string>
-    <string name="vpn_edit" msgid="8647191407179996943">"Уреди VPN профил"</string>
+    <string name="vpn_edit" msgid="8647191407179996943">"Измени VPN профил"</string>
     <string name="vpn_forget" msgid="3684651372749415446">"Заборави"</string>
     <string name="vpn_connect_to" msgid="5965299358485793260">"Поврзи се со <xliff:g id="PROFILE">%s</xliff:g>"</string>
     <string name="vpn_disconnect_confirm" msgid="3743970132487505659">"Да се исклучи оваа VPN?"</string>
@@ -2416,7 +2412,7 @@
     <string name="vpn_cant_connect_message" msgid="1352832123114214283">"Апликацијава не поддржува постојано вклучена VPN"</string>
     <string name="vpn_title" msgid="6317731879966640551">"Виртуелна приватна мрежа (VPN)"</string>
     <string name="vpn_create" msgid="5628219087569761496">"Додај VPN профил"</string>
-    <string name="vpn_menu_edit" msgid="408275284159243490">"Уреди профил"</string>
+    <string name="vpn_menu_edit" msgid="408275284159243490">"Измени профил"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Избриши профил"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"VPN секогаш вклучена"</string>
     <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Не се додадени виртуелни приватни мрежи"</string>
@@ -2450,10 +2446,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="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Повторно внесете ја вашата нова целосна резервна лозинка овде"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Постави резервна лозинка"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Внесете ја лозинката за целосен бекап овде"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Внесете нова лозинка за целосен бекап тука"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Повторно внесете ја новата лозинка за целосен бекап овде"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Постави лозинка за бекап"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Откажи"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Дополнителни ажурирања на системот"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Оневозможено"</string>
@@ -2725,12 +2721,14 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Ѕвонењето е поставено на вибрации"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Ѕвонењето е поставено на безгласен режим"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Јачината на звукот на ѕвонењето е на 80%"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Јачина на звук на медиуми"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Јачина на аудио/видео звук"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Јачина на звук на аларм"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Јачина на звук на ѕвонење"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Јачина на звук на известување"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодија на телефон"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Стандарден звук за известување"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Звук што го дава апликацијата"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Стандарден звук за известување"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Стандарден звук за аларм"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрации и за повици"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Други звуци"</string>
@@ -2779,7 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Известувања"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Напредни"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Известувања за работен профил"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"Трепкаво светло"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Трепкај со сијаличката"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заклучениот екран"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи ја целата содржина од известувањето"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Сокриј содржина на чувствителни известувања"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Никогаш не прикажувај известувања"</string>
@@ -2799,14 +2798,14 @@
     <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_min_summary" msgid="8233873580287975662">"Ниска: без звук или визуелен прекин"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Средна: без звук"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Висока: испушти звук"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Итна: испушти звук и прикажи на екранот"</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="6585849855452076626">"Дозволете звук"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Прикажувај ги овие апликации на тековниот екран без звук, вибрации или ѕиркање."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Помошник за известувања"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Пристап кон известување"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Пристап до известување"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апликациите не можат да читаат известувања"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="one">%d апликација може да чита известувања</item>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Пристап до „Не вознемирувај“"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ниту една од инсталираните апликации не побарала пристап до „Не вознемирувај“"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Вчитување апликации…"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android го блокира појавувањето на известувањата за апликацијава на уредов"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android го блокира појавувањето на оваа категорија известувања на уредов"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категории"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Друго"</string>
     <string name="no_channels" msgid="3077375508177744586">"Апликацијава не објави ниедно известување"</string>
@@ -2866,7 +2867,7 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Чувствителна"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Важност"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"Трепкаво светло"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Трепкај со сијаличката"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"Вибрации"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Звук"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Избриши"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Остани во тековната ориентација"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Безбедно стартување"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжи"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Може дополнително да го заштитите уредот ако го побарате PIN-кодот пред да се стартува. Сè додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Може дополнително да го заштитите уредот ако ја побарате шемата пред да се стартува. Сè додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Може дополнително да го заштитите уредот ако ја побарате лозинката пред да се стартува. Сè додека уредот не се стартува, не може да прима повици, пораки или известувања, како и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако бара PIN пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, вклучувајќи и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, вклучувајќи и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, вклучувајќи и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Барај PIN за стартување на уредот"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Барај шема за стартување на уредот"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Барај лозинка за стартување на уредот"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Не, фала"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Не, фала"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Не, фала"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Може дополнително да го заштитите уредот ако го бара PIN-кодот пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Може дополнително да го заштитите уредот ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Може дополнително да го заштитите уредот ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми. \n\nОва помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако бара ПИН пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара PIN за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара шемата пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара шема за стартување на уредот?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Освен користењето на отпечатокот од прст за отклучување на уредот, може да го заштитите уредот дополнително ако ја бара лозинката пред да се стартува. Сѐ додека уредот не се стартува, не може да прима повици, пораки или известувања, што опфаќа и аларми.\n\nТоа помага да се заштитат податоците на загубени или украдени уреди. Да се бара лозинка за стартување на уредот?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Барајте PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Барајте шема?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Барајте лозинка?"</string>
@@ -2992,7 +2989,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Информации во врска со IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Отвор<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Отвори стандардно"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Линкови за отворање"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"За отворање линкови"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Отвори поддржани врски"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Отвори без прашање"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Поддржани врски"</string>
@@ -3048,7 +3045,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Апликации што користат <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Допрете за будење"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Допрете двапати каде било на екранот за да го разбудите уредот"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Линкови за отворање"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"За отворање линкови"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Не отворај поддржани врски"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Отвори <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Отворете <xliff:g id="DOMAIN">%s</xliff:g> и други УРЛ-адреси"</string>
@@ -3070,7 +3067,7 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Се согласувам"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Не се согласувам"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Изберете гласовен запис"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Апликација на прелистувачот"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Прелистувач"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Нема стандарден прелистувач"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Апликација за телефон"</string>
     <string name="default_app" msgid="6864503001385843060">"(Стандардно)"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Апликации со дозвола"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Да"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Не"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Инсталирање непознати апликации"</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>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"Да"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Не"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Дозволи инсталирање апликации"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Дозволено"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Не е дозволено"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Прит. копче за напој. двапати за камера"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Се поврзавте со"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочки на програмерот за брзи поставки"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Тука сме за да ви помогнеме"</string>
@@ -3454,7 +3452,7 @@
     <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_title" msgid="64716226816032800">"Скокнете до камерата"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"За брзо отворање на камерата, притиснете го копчето за вклучување двапати. Работи од секој екран."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Превртете ја камерата"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(оневозможено за корисникот <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Услуга за автоматско пополнување"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматско, пополнување, автоматско пополнување"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Да се направи <xliff:g id="APP_NAME_0">%1$s</xliff:g> како апликација за автоматско пополнување? <xliff:g id="APP_NAME_1">%1$s</xliff:g> ќе може да го чита екранот и да пополнува полиња во други апликации."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Проверете дали е ова апликација на која ѝ верувате&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=„Автоматско пополнување на Google“&gt;%1$s&lt;/xliff:g&gt; го користи она што е на екранот за да утврди што може автоматски да се пополни."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема на уредот"</string>
     <string name="default_theme" msgid="7085644992078579076">"Стандардно"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"„Управник со меморија“: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index bfc943e..428a516 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ഒന്നുമില്ല"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"സിം"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ഒന്നുമില്ല"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 7459678..15b5c2f 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"അക്കൗണ്ടുകൾ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ലൊക്കേഷൻ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"അക്കൗണ്ടുകൾ"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"സുരക്ഷയും ലൊക്കേഷനും"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"എൻക്രിപ്‌ഷനും ക്രെഡന്‍ഷ്യലുകളും"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ഫോൺ എൻക്രിപ്‌റ്റ് ചെയ്‌തു"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ഫോൺ എൻക്രിപ്‌റ്റ് ചെയ്‌തു"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ലോക്ക് സ്‌ക്രീൻ മുൻഗണനകൾ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, സിം കാർഡ് ലോക്ക്, ക്രഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"എന്റെ ലൊക്കേഷൻ, സ്‌ക്രീൻ അൺലോക്ക്, ക്രെഡൻഷ്യൽ സംഭരണ ലോക്ക് എന്നിവ സജ്ജീകരിക്കുക"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"സ്വകാര്യത"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"അഡ്‌മിൻ പ്രവർത്തനരഹിതമാക്കി"</string>
     <string name="security_status_title" msgid="5848766673665944640">"സുരക്ഷാ നില"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"വിരലടയാളങ്ങൾ നിയന്ത്രിക്കുക"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ഇതിനായി വിരലടയാളം ഉപയോഗിക്കുക"</string>
@@ -570,7 +569,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"റദ്ദാക്കുക"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"അടുത്തത്"</string>
     <string name="lock_setup" msgid="3355847066343753943">"സജ്ജീകരണം പൂർത്തിയായി."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"ഉപകരണ അഡ്‌മിൽ ആപ്പുകൾ"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"ഉപകരണ അഡ്‌മിൻ ആപ്പുകൾ"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"സജീവ ആപ്‌സൊന്നും ഇല്ല"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ആപ്‌സ് സജീവമാണ്</item>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"ഉയർന്ന നിലവാരമുള്ള പബ്ലിക് നെറ്റ്‌വർക്ക് ലഭ്യമാകുമ്പോൾ അറിയിക്കുക"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"വൈ-ഫൈ സ്വയം ഓണാക്കുക"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"നിങ്ങളുടെ വീട്ടിലെ നെറ്റ്‌വർക്ക് പോലെയുള്ള, സംരക്ഷിച്ചതും ഉയർന്ന ഗുണമേന്മയുള്ളതുമായ നെറ്റ്‍വർക്കുകൾക്ക് അരികിലായിരിക്കുമ്പോൾ വൈഫൈ തിരികെ സ്വയമേവ ഓണാകും"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"വൈഫൈ സ്‌കാനിംഗ് ഓഫുചെ‌യ്‌തിരിക്കുന്നതിനാൽ ‌ലഭ്യമല്ല"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"മോശം കണക്ഷനുകൾ ഒഴിവാക്കുക"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"മികച്ച ഇന്റർനെറ്റ് കണക്ഷൻ ഉണ്ടാകുന്നതുവരെ വൈഫൈ നെറ്റ്‌വർക്ക് ഉപയോഗിക്കരുത്"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"മികച്ച ഇന്റർനെറ്റ് കണക്ഷനുള്ള നെറ്റ്‌വർക്കുകൾ മാത്രം ഉപയോഗിക്കുക"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"വൈഫൈ കോൺഫിഗർ ചെയ്യുക"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC വിലാസം"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP വിലാസം"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"സബ്‌നെറ്റ് മാസ്‌ക്"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 വിലാസങ്ങൾ"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"സംരക്ഷിച്ച നെറ്റ്‌വർക്ക്"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ക്രമീകരണങ്ങൾ"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"ഈ ഉപയോക്താവിന് വൈഫൈ വിപുല ക്രമീകരണം ലഭ്യമല്ല"</string>
@@ -919,7 +917,7 @@
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"ഡയൽ പാഡ് ടച്ച് ടോണുകൾ"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"ടാപ്പ് ശബ്ദങ്ങൾ"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"സ്‌ക്രീൻ ലോക്ക് ശബ്ദം"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ടാപ്പിൽ വൈബ്രേറ്റുചെയ്യുക"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"ടാപ്പുചെയ്യുമ്പോൾ വൈബ്രേറ്റുചെയ്യൂ"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"നോയ്‌സ് റദ്ദാക്കൽ"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"സംഗീതം, വീഡിയോ, ഗെയിമുകൾ, മറ്റ് മീഡിയ എന്നിവ"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"റിംഗ്‌ടോണും അറിയിപ്പുകളും"</string>
@@ -1007,7 +1005,7 @@
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"ഇഷ്‌ടാനുസൃതം"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"വാൾപേപ്പർ മാറ്റുക"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"നിങ്ങളുടെ സ്ക്രീൻ വ്യക്തിഗതമാക്കുക"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ഇതിൽ നിന്ന് വാൾപേപ്പർ തിരഞ്ഞെടുക്കുക"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ഇവിടെനിന്ന് വാൾപേപ്പർ തിരഞ്ഞെടുക്കൂ"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"സ്ക്രീൻ സേവർ"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"ചാർജ് ചെയ്യുമ്പോൾ അല്ലെങ്കിൽ ഡോക്ക് ചെയ്യുമ്പോൾ"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"ഏതിലെങ്കിലും"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ഓഫ്"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ഫോൺ ഡോക്കുചെയ്തിരിക്കുമ്പോൾ ഒപ്പം/അല്ലെങ്കിൽ സുഷുപ്തിയിലായിരിക്കുമ്പോൾ ഫോണിൽ നടക്കുന്നതെല്ലാം നിയന്ത്രിക്കുന്നതിന് സ്ക്രീൻ സേവർ ഓണാക്കുക."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"എപ്പോൾ തുടങ്ങണം"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"നിലവിലെ സ്‌ക്രീൻ സേവർ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ഇപ്പോൾ ആരംഭിക്കുക"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ക്രമീകരണം"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"യാന്ത്രിക തെളിച്ചം"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"സജീവമാക്കാൻ ലിഫ്റ്റുചെയ്യുക"</string>
-    <string name="doze_title" msgid="5389406335828323273">"ഇൻകമിംഗ് അറിയിപ്പ് സ്‌ക്രീൻ"</string>
+    <string name="doze_title" msgid="2259176504273878294">"അറിയിപ്പിനു സ്ക്രീൻ ഓണാക്കുക"</string>
     <string name="doze_summary" msgid="3846219936142814032">"നിങ്ങൾക്ക് അറിയിപ്പുകൾ ലഭിക്കുന്ന സമയത്ത് സ്ക്രീൻ സജീവമാക്കുക"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ഫോണ്ട് വലുപ്പം"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ടെക്സ്റ്റ് ചെറുതോ വലുതോ ആക്കുക"</string>
@@ -1469,7 +1466,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"സ്‌ക്രീൻ അൺലോക്കുചെയ്യുന്നതിന് പാറ്റേൺ വര‌യ്ക്കണം"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"പാറ്റേൺ ദൃശ്യമാക്കുക"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"പ്രൊഫൈൽ പാറ്റേൺ ദൃശ്യമാക്കുക"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ടാപ്പിൽ വൈബ്രേറ്റുചെയ്യുക"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"ടാപ്പുചെയ്യുമ്പോൾ വൈബ്രേറ്റുചെയ്യൂ"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"പവർബട്ടൺ ഉടൻ ലോക്കാകുന്നു"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> അൺലോക്കുചെയ്‌തിരിക്കുമ്പോൾ ഒഴികെ"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"അൺലോക്ക് പാറ്റേൺ സജ്ജീകരിക്കുക"</string>
@@ -1548,7 +1545,7 @@
     <string name="filter" msgid="2018011724373033887">"ഫിൽട്ടർ ചെയ്യുക"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"ഫിൽട്ടർ ഓപ്ഷനുകൾ തിരഞ്ഞെടുക്കുക"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"എല്ലാ ആപ്പുകളും"</string>
-    <string name="filter_apps_disabled" msgid="5862632369555319938">"പ്രവർത്തനരഹിതമാക്കിയ ആപ്പുകൾ"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"നിഷ്ക്രിയമാക്കിയ ആപ്പുകൾ"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"ഡൗൺലോഡുചെയ്തു"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"പ്രവര്‍ത്തിക്കുന്നു"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB സ്റ്റോറേജ്"</string>
@@ -1615,6 +1612,7 @@
     <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="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> സംബന്ധിച്ച കൂടുതൽ ‌വിവരങ്ങൾ"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"പ്രവര്‍ത്തിക്കുന്നു"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ഒരിക്കലും ഉപയോഗിക്കരുത്)"</string>
@@ -1673,7 +1671,7 @@
     <string name="auto_caps" msgid="6379232078052591265">"സ്വയം വലിയക്ഷരമാക്കുക"</string>
     <string name="auto_caps_summary" msgid="6358102538315261466">"വാക്യങ്ങളിലെ ആദ്യ അക്ഷരം വലിയക്ഷരമാക്കുക"</string>
     <string name="auto_punctuate" msgid="4595367243950425833">"സ്വയമേവ ചിഹ്നമിടൽ"</string>
-    <string name="hardkeyboard_category" msgid="5957168411305769899">"ഭൗതിക കീബോർഡ് ക്രമീകരണങ്ങൾ"</string>
+    <string name="hardkeyboard_category" msgid="5957168411305769899">"ഫിസിക്കൽ കീബോർഡ് ക്രമീകരണങ്ങൾ"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" ചേർക്കുന്നതിന് സ്‌പേസ് കീ രണ്ടുതവണ അമർത്തുക"</string>
     <string name="show_password" msgid="4837897357002495384">"പാസ്‌വേ‌ഡുകൾ കാണിക്കുക"</string>
     <string name="show_password_summary" msgid="3365397574784829969">"ടൈപ്പുചെയ്യുന്നതിനൊപ്പം അൽപ്പസമയം പ്രതീകം പ്രദർശിപ്പിക്കുക"</string>
@@ -1685,13 +1683,12 @@
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"ലഭ്യമായ വെർച്വൽ കീബോർഡ്"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"കീബോർഡുകൾ മാനേജുചെയ്യുക"</string>
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"കീബോർഡ് സഹായം"</string>
-    <string name="physical_keyboard_title" msgid="8285149877925752042">"ഭൗതിക കീബോർഡ്"</string>
+    <string name="physical_keyboard_title" msgid="8285149877925752042">"ഫിസിക്കൽ കീബോർഡ്"</string>
     <string name="show_ime" msgid="2658582193437188227">"വെർച്വൽ കീബോർഡ് കാണിക്കുക"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"ഭൗതിക കീബോർഡ് സജീവമായിരിക്കുമ്പോൾ സ്ക്രീനിൽ നിലനിർത്തുക"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"ഫിസിക്കൽ കീബോർഡ് സജീവമായിരിക്കുമ്പോൾ സ്ക്രീനിൽ നിലനിർത്തുക"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"കീബോഡ് കുറുക്കുവഴി സഹായി"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ലഭ്യമായ കുറുക്കുവഴികൾ പ്രദർശിപ്പിക്കുക"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ഡിഫോൾട്ട്"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"മൗസ്/ട്രാക്ക്പാഡ്"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"പോയിന്റർ വേഗത"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ഗെയിം കൺട്രോളർ"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"വൈബ്രേറ്റർ ഉപയോഗിക്കുക"</string>
@@ -1736,8 +1733,8 @@
     <string name="input_methods_settings_label_format" msgid="6002887604815693322">"<xliff:g id="IME_NAME">%1$s</xliff:g> ക്രമീകരണം"</string>
     <string name="input_methods_and_subtype_enabler_title" msgid="4421813273170250462">"സജീവ ടൈപ്പുചെയ്യൽ രീതികൾ തിരഞ്ഞെടുക്കുക"</string>
     <string name="onscreen_keyboard_settings_summary" msgid="5841558383556238653">"ഓൺ സ്ക്രീൻ കീബോർഡ് ക്രമീകരണങ്ങൾ"</string>
-    <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"ഭൗതിക കീബോർഡ്"</string>
-    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"ഭൗതിക കീബോർഡ് ക്രമീകരണങ്ങൾ"</string>
+    <string name="builtin_keyboard_settings_title" msgid="7688732909551116798">"ഫിസിക്കൽ കീബോർഡ്"</string>
+    <string name="builtin_keyboard_settings_summary" msgid="2392531685358035899">"ഫിസിക്കൽ കീബോർഡ് ക്രമീകരണങ്ങൾ"</string>
     <string name="gadget_picker_title" msgid="98374951396755811">"ഗാഡ്ജറ്റ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="widget_picker_title" msgid="9130684134213467557">"വിജറ്റ് തിരഞ്ഞെടുക്കുക"</string>
     <string name="allow_bind_app_widget_activity_allow_bind_title" msgid="2538303018392590627">"വിജറ്റ് സൃഷ്ടിച്ച് ആക്‌സസ്സ് അനുവദിക്കണോ?"</string>
@@ -1772,8 +1769,8 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"നിങ്ങളുടെ സ്‌ക്രീനിലെ ഇനങ്ങൾ ഉറക്കെ വായിക്കുന്നതുകേൾക്കാൻ അവ ടാപ്പുചെയ്യുക"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"അടിക്കുറിപ്പുകൾ"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"മാഗ്നിഫിക്കേഷൻ"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"3 തവണ ടാപ്പുചെയ്‌ത് മാഗ്നിഫൈ ചെയ്യുക"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"ബട്ടൺ ഉപയോഗിച്ച് മാഗ്നിഫൈ ചെയ്യുക"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"3 ടാപ്പുചെയ്‌ത് മാഗ്നിഫൈചെയ്യൂ"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"ബട്ടണുപയോഗിച്ച് മാഗ്നിഫൈചെയ്യൂ"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"ബട്ടണും 3 തവണ ടാപ്പും ഉപയോഗിച്ച് മാഗ്നിഫൈ ചെയ്യുക"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"സ്ക്രീനിൽ സൂം ഇൻ ചെയ്യുക"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"സൂം ചെയ്യാൻ മൂന്ന് തവണ ടാപ്പുചെയ്യുക"</string>
@@ -1781,7 +1778,7 @@
     <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="6752037184140789970">"ഉപയോഗസഹായി കുറുക്കുവഴി"</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>
@@ -1795,7 +1792,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"സ്‌പർശിച്ച് കുറെനേരം അമർത്തിപ്പിടിക്കൂ"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"വർണ്ണവൈപരീത്യം"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"പ്രകടനത്തെ ബാധിച്ചേക്കാം"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"പോയിന്റർ നിന്നതിനുശേഷം ക്ലിക്കുചെയ്യുക"</string>
+    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"പോയിന്റർ നിന്നശേഷം ക്ലിക്കുചെയ്യൂ"</string>
     <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"ക്ലിക്കിന് മുമ്പുള്ള കാലതാമസം"</string>
     <string name="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>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"പൂർണ്ണമായി ചാർജ്ജുചെയ്തത് മുതലുള്ള സ്‌ക്രീൻ ഉപയോഗം"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"സ്‌ക്രീൻ ഉപഭോഗം"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"മൊബൈൽ നെറ്റ്‌വർക്ക് സ്‌കാൻ ചെയ്യൽ"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> മുമ്പ്"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"പൂർണ്ണമായി ചാർജ്ജുചെയ്‌തത് മുതലുള്ള ആപ്പ് ഉപയോഗം (<xliff:g id="TIME">%1$s</xliff:g> മുമ്പ്)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> മുമ്പ്"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"ഫുൾ ചാർജുചെയ്തശേഷമുള്ള ആപ്പ് ഉപയോഗം (<xliff:g id="TIME">^1</xliff:g> മുമ്പ്)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"പൂർണ്ണമായി ചാർജ് ചെയ്‌തത് മുതൽ സ്‌ക്രീൻ ഓണായിരുന്ന സമയം"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"പൂർണ്ണമായി ചാർജ്ജുചെയ്തത് മുതലുള്ള ഉപകരണ ഉപയോഗം"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"അൺപ്ലഗ്ഗുചെയ്‌തതിനുശേഷമുള്ള ബാറ്ററി ഉപയോഗം"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"ക്യാമറ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"വൈഫൈ"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ബ്ലൂടൂത്ത്"</string>
-    <string name="power_cell" msgid="6596471490976003056">"സെൽ സ്റ്റാൻഡ്ബൈ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"മൊബൈൽ നെറ്റ്‍വര്‍ക്ക് സ്‌റ്റാൻഡ്‌ബൈ"</string>
     <string name="power_phone" msgid="5392641106474567277">"വോയ്‌സ് കോളുകൾ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ടാബ്‌ലെറ്റ് നിഷ്‌ക്രിയ സമയം"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ഫോൺ നിഷ്‌ക്രിയ സമയം"</string>
@@ -2007,11 +2004,11 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"പവർ ഉപയോഗത്തിന്റ ഏകദേശ കണക്കാണ് ബാറ്ററി ഉപയോഗം ഒപ്പം ബാറ്ററി കുറയുന്നതിന്റെ എല്ലാ കാരണവും അതിൽ ഉൾപ്പെടുകയുമില്ല. കണക്കാക്കിയ ഏകദേശ പവർ ഉപയോഗവും ബാറ്ററിയിൽ നിന്ന് ഉപയോഗിച്ച പവറും എന്നിവ തമ്മിലുള്ള വ്യത്യാസമാണ് ബഹുവിധ പവർ ഉപയോഗം എന്നത്."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"കണക്കാക്കിയ പവർ ഉപയോഗം"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s ഉപയോഗിച്ചു"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> സമയം ഉപയോഗിച്ചു"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ആപ്പ് <xliff:g id="PERCENT">%1$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_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_detail_foreground" msgid="3350401514602032183">"സജീവ ഉപയോഗത്തിൽ ആയിരിക്കുമ്പോൾ"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"പശ്ചാത്തലത്തിൽ ആയിരിക്കുമ്പോൾ"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"വോയ്‌സ് ഇൻപുട്ട്, ഔട്ട് പുട്ട് ക്രമീകരണങ്ങൾ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ശബ്ദതിരയൽ"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android കീബോർഡ്"</string>
-    <string name="voice_category" msgid="1430370497125803904">"സംഭാഷണം"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"വോയ്‌സ് ഇൻപുട്ട് ക്രമീകരണങ്ങൾ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"വോയ്‌സ് ഇൻപുട്ട്"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"വോയ്‌സ് ഇൻപുട്ട് സേവനങ്ങൾ"</string>
@@ -2146,7 +2142,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>
@@ -2545,16 +2541,16 @@
     <string name="global_change_warning" product="tablet" msgid="8045013389464294039">"ഈ ടാബ്‌ലെറ്റിലെ എല്ലാ ഉപയോക്താക്കളെയും ഈ ക്രമീകരണം ബാധിക്കുന്നു."</string>
     <string name="global_change_warning" product="default" msgid="2461264421590324675">"ഈ ഫോണിലെ എല്ലാ ഉപയോക്താക്കളെയും ഈ ക്രമീകരണം ബാധിക്കുന്നു."</string>
     <string name="global_locale_change_title" msgid="5956281361384221451">"ഭാഷ മാറ്റുക"</string>
-    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"മൊബൈൽ തൊടീച്ച് പണമടയ്ക്കുക"</string>
+    <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ടാപ്പുചെയ്‌ത് പണമടയ്‌ക്കുക"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"ഇത് എങ്ങനെ പ്രവർത്തിക്കുന്നു"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"സ്റ്റോറുകളിൽ നിങ്ങളുടെ ഫോൺ ഉപയോഗിച്ച് പണമടയ്ക്കുക"</string>
     <string name="nfc_payment_default" msgid="8648420259219150395">"സ്ഥിര പേയ്‌മെന്റ് അപ്ലിക്കേഷൻ"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"സജ്ജീകരിച്ചിട്ടില്ല"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <string name="nfc_payment_use_default" msgid="3234730182120288495">"സ്ഥിരസ്ഥിതിയായി ഉപയോഗിക്കുക"</string>
+    <string name="nfc_payment_use_default" msgid="3234730182120288495">"ഡിഫോൾട്ടായി ഉപയോഗിക്കുക"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"എല്ലായ്പ്പോഴും"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"മറ്റൊരു പണമടയ്ക്കൽ ആപ്പ് തുറന്നിരിക്കുമ്പോൾ ഒഴികെ"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"\'മൊബൈൽ തൊടീച്ച് പണമടയ്ക്കുക\' ടെർമിനലിൽ, ഇതുപയോഗിച്ച് പണമടയ്‌ക്കുക:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"\'ടാപ്പുചെയ്‌ത് പണമടയ്‌ക്കുക\' ടെർമിനലിൽ, ഇങ്ങനെ പണമടയ്ക്കൂ:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"ടെർമിനലിൽ പണമടയ്ക്കൽ"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"ഒരു പണമടക്കൽ ആപ്പ് സജ്ജീകരിക്കുക. തുടർന്ന് കോൺടാക്റ്റ് രഹിത അടയാളമുള്ള ഏത് ടെർമിനലിലേക്കും നിങ്ങളുടെ ഫോണിന്റെ പിൻവശം തൊടുവിക്കുക."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"മനസ്സിലായി"</string>
@@ -2658,11 +2654,11 @@
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"നെറ്റ്‌വർക്കും ഇന്റർനെറ്റും"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"വൈ-ഫൈ, മൊബൈൽ, ഡാറ്റ ഉപഭോഗം, ഹോട്ട്‌സ്‌പോട്ട്"</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">"Bluetooth, കാസ്റ്റ്, NFC"</string>
     <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"ആപ്‌സും അറിയിപ്പുകളും"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"അനുമതികൾ, ‌ഡിഫോൾട്ട് ആപ്പുകൾ"</string>
-    <string name="account_dashboard_title" msgid="4936890821712178853">"ഉപയോക്താക്കളും അക്കൗണ്ടുകളും"</string>
+    <string name="account_dashboard_title" msgid="4936890821712178853">"ഉപയോക്താക്കളും അക്കൗണ്ടും"</string>
     <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>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"അറിയിപ്പ് വോളിയം"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ഫോൺ റിംഗ്ടോൺ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ഡിഫോൾട്ട് അറിയിപ്പ് ശബ്‌ദം"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ആപ്പ് നൽകുന്ന ശബ്‌ദം"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"ഡിഫോൾട്ട് അറിയിപ്പ് ശബ്‌ദം"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ഡിഫോൾട്ട് അലാറം ശബ്ദം"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"കോളുകൾക്കും വൈബ്രേറ്റ്"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"മറ്റു ശബ്‌ദങ്ങൾ"</string>
@@ -2739,7 +2737,7 @@
     <string name="charging_sounds_title" msgid="1132272552057504251">"ചാർജ്ജിംഗ് ശബ്‌ദം"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"ഡോക്ക് ചെയ്യൽ ശബ്‌ദങ്ങൾ"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"സ്‌പർശന ശബ്ദം"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"ടാപ്പുചെയ്യുമ്പോൾ വൈബ്രേറ്റുചെയ്യുക"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"ടാപ്പുചെയ്യുമ്പോൾ വൈബ്രേറ്റുചെയ്യൂ"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"ഡോക്ക് സ്‌പീക്കർ പ്ലേ ചെയ്യുന്നു"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"എല്ലാ ഓഡിയോയും"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"മീഡിയ ഓഡിയോ മാത്രം"</string>
@@ -2752,7 +2750,7 @@
       <item quantity="other"><xliff:g id="ON_COUNT">%d</xliff:g> സ്വയമേവയുള്ള നയങ്ങൾ ഓണാക്കി</item>
       <item quantity="one">1 സ്വയമേവയുള്ള നയം ഓണാക്കി</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'ശല്യപ്പെടുത്തരുത്\' മുൻഗണനകൾ"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"\'ശല്യപ്പെടുത്തരുത്\' മുൻഗണന"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"മുൻഗണനയുള്ളവ മാത്രം"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"സ്വയമേയുള്ള നയങ്ങൾ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"\'ശല്യപ്പെടുത്തരുത്\' നിയമങ്ങൾ സജ്ജമാക്കുക"</string>
@@ -2761,7 +2759,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"അലാറങ്ങൾ മാത്രം"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"പൂർണ്ണ നിശബ്‌ദത"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ദൃശ്യപര തടസങ്ങൾ ബ്ലോക്കുചെയ്യൂ"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"ദൃശ്യതടസങ്ങൾ ബ്ലോക്കുചെയ്യൂ"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"ഔദ്യോഗിക പ്രൊഫൈൽ ശബ്ദങ്ങൾ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"സ്വകാര്യ പ്രൊഫൈൽ ശബ്ദങ്ങൾ ഉപയോഗിക്കുക"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"ഔദ്യോഗിക പ്രൊഫൈലുകൾക്കും വ്യക്തിഗത പ്രൊഫൈലുകൾക്കുമുള്ള ശബ്ദങ്ങൾ ഒന്നുതന്നെ ആയിരിക്കും"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"അറിയിപ്പുകൾ ഒരിക്കലും കാണിക്കരുത്"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"കുറവ്: ശബ്ദപരമോ ദൃശ്യപരമോ ആയ തടസ്സമില്ല"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"ഇടത്തരം: ശബ്‌ദമില്ല"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ഉയർന്നത്: ശബ്‌ദമുണ്ടാക്കുക"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"അടിയന്തരം: ശബ്ദമുണ്ടാക്കുക, സ്ക്രീനിൽ പോപ്പ് ചെയ്യുക"</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="6585849855452076626">"ശ‌ബ്‌ദം അനുവദിക്കുക"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ഈ അറിയിപ്പുകൾ ശബ്ദമുണ്ടാക്കുകയോ വൈബ്രേറ്റുചെയ്യുകയോ നിലവിലെ സ്ക്രീനിലെ കാഴ്ചയിൽ കാണിക്കുകയോ അരുത്."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"അറിയിപ്പ് സഹായി"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\'ശല്യപ്പെടുത്തരുത്\' ആക്‌സസ്സ്"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ഇൻസ്റ്റാളുചെയ്‌തവയൊന്നും \'ശല്യപ്പെടുത്തരുത്\' മോഡിൽ പ്രവേശിക്കാൻ അഭ്യർത്ഥിച്ചിട്ടില്ല"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"അപ്ലിക്കേഷനുകൾ ലോഡുചെയ്യുന്നു..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"ഈ ഉപകരണത്തിൽ ഈ ആപ്പിന്റെ അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്കുചെയ്യുന്നു"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"ഈ ഉപകരണത്തിൽ ഈ വിഭാഗത്തിൽ പെട്ട അറിയിപ്പുകൾ ദൃശ്യമാകുന്നത് Android ബ്ലോക്കുചെയ്യുന്നു"</string>
     <string name="notification_channels" msgid="5346841743182627500">"വിഭാഗങ്ങള്‍"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"മറ്റുള്ളവ"</string>
     <string name="no_channels" msgid="3077375508177744586">"ഈ ആപ്പ് അറിയിപ്പുകളൊന്നും പോസ്‌റ്റുചെയ്‌തിട്ടില്ല"</string>
@@ -2939,9 +2940,9 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> വരെ മാത്രം അലാറങ്ങളിലേക്ക് മാറ്റുക"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"\'എല്ലായ്‌പ്പോഴും തടസ്സപ്പെടുത്തുക\' എന്നതിലേക്ക് മാറ്റുക"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"സ്ക്രീൻ ഓണായിരിക്കുമ്പോൾ ബ്ലോക്കുചെയ്യുക"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"ഓണായിരിക്കുമ്പോൾ ബ്ലോക്കുചെയ്യുക"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"സ്ക്രീനിൽ എത്തിനോക്കുന്നതിൽ നിന്നോ പ്രത്യക്ഷപ്പെടുന്നതിൽ നിന്നോ, \'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്ദമാക്കപ്പെടുന്ന അറിയിപ്പുകളെ തടയുക"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"സ്ക്രീൻ ഓഫായിരിക്കുമ്പോൾ ബ്ലോക്കുചെയ്യുക"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"ഓഫായിരിക്കുമ്പോൾ ബ്ലോക്കുചെയ്യുക"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"സ്ക്രീൻ ഓണാക്കുന്നതിൽ നിന്നോ തുടിപ്പായി അറിയിപ്പ് വെളിച്ചം മാറുന്നതിൽ നിന്നോ, \'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്ദമാക്കപ്പെടുന്ന അറിയിപ്പുകളെ തടയുക"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"സ്ക്രീൻ ഓണാക്കുന്നതിൽ നിന്ന്, \'ശല്യപ്പെടുത്തരുത്\' വഴി നിശബ്ദമാക്കപ്പെടുന്ന അറിയിപ്പുകളെ തടയുക"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ഓഫ്"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"നിലവിലുള്ള ഓറിയന്റേഷനിൽ തുടരുക"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"സുരക്ഷിത തുടക്കം"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"തുടരുക"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"ഉപകരണം ആരംഭിക്കുന്നതിനു‌മുമ്പ്, നിങ്ങളുടെ PIN ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, ഇതിന് അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടമാകുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"ഉപകരണം ആരംഭിക്കുന്നതിനു‌മുമ്പ്, നിങ്ങളുടെ പാറ്റേൺ ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, ഇതിന് അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടമാകുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"ഉപകരണം ആരംഭിക്കുന്നതിനു‌മുമ്പ്, നിങ്ങളുടെ പാസ്‌വേഡ് ആവശ്യപ്പെടുന്നതിലൂടെ ഈ ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാനാവും. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, ഇതിന് അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടമാകുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ ഡാറ്റ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, PIN ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടമാകുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാറ്റേൺ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടമാകുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാസ്‌വേഡ് ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടമാകുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"ഉപകരണം ആരംഭിക്കാൻ പിൻ ആവശ്യമാണ്"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"ഉപകരണം ആരംഭിക്കാൻ പാറ്റേൺ ആവശ്യപ്പെടുക"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"ഉപകരണം ആരംഭിക്കാൻ പാസ്‌വേഡ് ആവശ്യമാണ്"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"വേണ്ട, നന്ദി"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"വേണ്ട, നന്ദി"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"വേണ്ട, നന്ദി"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പിൻ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പിൻ ആവശ്യമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാറ്റേൺ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാറ്റേൺ ആവശ്യമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാസ്‌വേഡ് ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാസ്‌വേഡ് ആവശ്യമാക്കണോ&gt;"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പിൻ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെട്ടതോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പിൻ ആവശ്യമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാറ്റേൺ ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാറ്റേൺ ആവശ്യമാക്കണോ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ഉപകരണം അൺലോക്കുചെയ്യാൻ വിരലടയാളം ഉപയോഗിക്കുന്നതിന് പുറമെ, ഉപകരണം ആരംഭിക്കുന്നതിന് ‌മുമ്പ്, പാസ്‌വേഡ് ആവശ്യപ്പെടുന്ന തരത്തിൽ സജ്ജീകരിച്ചുകൊണ്ട് നിങ്ങൾക്ക് ഉപകരണത്തിന് അധിക പരിരക്ഷ നൽകാവുന്നതാണ്. ഉപകരണം ആരംഭിക്കുന്നതുവരെ, അലാറങ്ങൾ ഉൾപ്പെടെ കോളുകളോ സന്ദേശങ്ങളോ അറിയിപ്പുകളോ ഇതിന് സ്വീകരിക്കാനാകില്ല.\n\nനഷ്‌‌ടപ്പെടുകയോ മോഷ്‌ടിക്കപ്പെടുകയോ ചെയ്‌ത ഉപകരണങ്ങളിലെ വിവരങ്ങൾ പരിരക്ഷിക്കാൻ ഇത് സഹായിക്കുന്നു. നിങ്ങളുടെ ഉപകരണം ആരംഭിക്കുന്നതിന് പാസ്‌വേഡ് ആവശ്യമാക്കണോ&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"അതെ"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"ഇല്ല"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN ആവശ്യമാണോ?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"പാറ്റേൺ ആവശ്യമാണോ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"പാസ്‌വേഡ് ആവശ്യമാണോ?"</string>
@@ -3070,9 +3067,9 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"അംഗീകരിക്കുക"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"അംഗീകരിക്കുന്നില്ല"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"വോയ്‌സ് ഇൻപുട്ട് ഉപയോഗിക്കുക"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"ബ്രൗസർ അപ്ലിക്കേഷൻ"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ബ്രൗസർ ആപ്പ്"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"സ്ഥിര ബ്രൗസറൊന്നുമില്ല"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"ഫോൺ അപ്ലിക്കേഷൻ"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"ഫോൺ ആപ്പ്"</string>
     <string name="default_app" msgid="6864503001385843060">"(സ്ഥിരമായത്)"</string>
     <string name="system_app" msgid="9068313769550747372">"(സിസ്‌റ്റം)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(സിസ്റ്റം ഡിഫോൾട്ട്)"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"അനുമതിയുള്ള ആപ്സ്"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"ഉണ്ട്"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"ഇല്ല"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"തിരിച്ചറിയാനാകാത്ത ആപ്‌സ് ഇൻസ്റ്റാൾ ചെയ്യുക"</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>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"അതെ"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"അല്ല"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"ആപ്പ് ഇൻസ്റ്റാളുകൾ അനുവദിക്കുക"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"അനുവദനീയം"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"അനുവദിച്ചിട്ടില്ല"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ക്യാമറയ്ക്ക് പവർബട്ടൺ രണ്ടുതവണയമർത്തൂ"</string>
@@ -3321,7 +3318,7 @@
       <item quantity="one">ഡാറ്റ സേവർ ഓണായിരിക്കുമ്പോൾ, പരിമിതിയില്ലാതെ ഡാറ്റ ഉപയോഗിക്കുന്നത് ഒരു ആപ്പിനെ അനുവദിച്ചു</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ഡാറ്റ സേവർ"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"പരിധിയില്ലാതെ ഡാറ്റ ആക്സസ്"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ഇഷ്ടം പോലെ ഡാറ്റ"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"പശ്ചാത്തല ഡാറ്റ ഓഫാക്കി"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ഓൺ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ഓഫ്"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"ഇതിലേക്ക് ബന്ധിപ്പിച്ചു"</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>
@@ -3462,7 +3460,7 @@
     <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="2521630136233865893">"അറിയിപ്പുകൾ വേഗത്തിൽ പരിശോധിക്കുന്നതിന്, സ്ക്രീനിൽ രണ്ടുതവണ ടാപ്പുചെയ്യുക."</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="8696432220086951466">"അറിയിപ്പുകൾ വേഗത്തിൽ പരിശോധിക്കുന്നതിന്, നിങ്ങളുടെ ഫോൺ കയ്യിലെടുക്കുക."</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> എന്നയാൾക്ക് കാണാനാവില്ല)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"സ്വയമേവ പൂരിപ്പിക്കൽ സേവനം"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"സ്വയമേവ, പൂരിപ്പിക്കൽ, സ്വയമേവ പൂരിപ്പിക്കൽ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> എന്നതിനെ നിങ്ങളുടെ സ്വയമേവ പൂരിപ്പിക്കുന്ന ആപ്പ് ആക്കണോ? <xliff:g id="APP_NAME_1">%1$s</xliff:g> എന്നതിന് നിങ്ങളുടെ സ്ക്രീൻ ‌വായിക്കാനും മറ്റ് ആപ്പുകളിലെ ഫീൽഡുകൾ പൂരിപ്പിക്കാനും കഴിയും."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ഈ ആപ്പിനെ നിങ്ങൾ വിശ്വസിക്കുന്നുണ്ടെന്ന് ഉറപ്പുവരുത്തുക&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; സ്വയമേവ പൂരിപ്പിക്കേണ്ടത് എന്താണെന്ന് നിർണ്ണയിക്കുന്നതിന് നിങ്ങളുടെ സ്‌ക്രീനിൽ ഉള്ളത് ഉപയോഗിക്കുന്നു."</string>
     <string name="device_theme" msgid="4571803018917608588">"ഉപകരണത്തിന്റെ തീം"</string>
     <string name="default_theme" msgid="7085644992078579076">"ഡിഫോൾട്ട്"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"സ്റ്റോറേജ് മാനേജര്‍: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 0f1decd..32550f5 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Аль нь ч биш"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"СИМ"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Байхгүй"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -271,7 +273,7 @@
     <item msgid="2320577158869025503">"тохиргоог өөрчлөх"</item>
     <item msgid="1545733463471924009">"дээр нь нээх"</item>
     <item msgid="3609046903962454582">"мэдэгдэлд хандах"</item>
-    <item msgid="4671646036128214513">"камера"</item>
+    <item msgid="4671646036128214513">"камер"</item>
     <item msgid="1097324338692486211">"аудио бичих"</item>
     <item msgid="5031552983987798163">"аудио тоглуулах"</item>
     <item msgid="8374996688066472414">"түр санах ойг унших"</item>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index d9d2675..34d680c3 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Бүртгэл"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Байршил"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Бүртгэл"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Аюулгүй байдал, байршил"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифр, мандат үнэмлэх"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Утсыг кодолсон"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Түгжигдсэн дэлгэцийн сонголт"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Утсыг кодолсон"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Дэлгэц түгжих сонголт"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Миний Байршил, дэлгэц тайлах, жуухын сангийн түгжээ зэргийг тохируулах"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Нууцлал"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Админ цуцалсан"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Аюулгүй байдлын төлөв"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Хурууны хээ удирдах"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Хурууны хээг дараах зорилгоор ашиглах"</string>
@@ -368,7 +367,7 @@
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ тaблетыг алга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг таблетийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ төхөөрөмжийг алга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг төхөөрөмжийг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Төхөөрөмжийн хамгаалалтын тохиргоо идэвхжихгүй. Энэ утсыг aлга болгосон, эсвэл хулгайд алдсан тохиолдолд та уг утсыг бусад этгээд ашиглахаас сэргийлж чадахгүй."</string>
-    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ямар ч үед алгасах"</string>
+    <string name="skip_anyway_button_label" msgid="2323522873558834513">"Хэдийд ч алгасах"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Буцах"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Мэдрэгч хай"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Утасныхаа ард хурууны хээ мэдрэгчийг байршуул"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi-н сканыг унтраасан тул боломжгүй байна"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet маск"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 хаяг"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Хадгалагдсан сүлжээ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP тохиргоо"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Энэ хэрэглэгчид Wi-Fi дэлгэрэнгүй тохиргоо боломжгүй байна"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Идэвхгүй"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Утсыг суурилуулсан ба/эсвэл идэвхгүй үед хэрхэхийг удирдахын тулд дэлгэц амраагчийг асаана уу."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Эхлэх үе"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Одоогийн дэлгэц амраагч"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Одоо эхлүүлэх"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Тохиргоо"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автомат гэрэлтүүлэг"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Сэрээхийн тулд өргөх"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Ирж буй мэдэгдлийн дэлгэц"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Орчинтой тохирсон дэлгэц"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Дэлгэцийг мэдэгдэл авсан үедээ сэрээх"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Фонтын хэмжээ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Текстийг том эсвэл жижиг болгох"</string>
@@ -1152,7 +1149,7 @@
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Салгаж байна"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Салгалт явагдаж байна"</string>
     <string name="storage_low_title" msgid="1388569749716225155">"Сангийн хэмжээ дутагдаж байна"</string>
-    <string name="storage_low_summary" msgid="7737465774892563129">"Синк хийх гэх мэт системийн зарим функц зөв ажиллахгүй байж магадгүй. Апп-ууд эсвэл медиа контент зэрэг зүйлсийг устгах буюу суллах замаар сул зай гаргахыг хичээнэ үү."</string>
+    <string name="storage_low_summary" msgid="7737465774892563129">"Синклэх гэх мэт системийн зарим функц зөв ажиллахгүй байж магадгүй. Аппууд эсвэл медиа контент зэрэг зүйлсийг устгах буюу суллах замаар сул зай гаргахыг хичээнэ үү."</string>
     <string name="storage_menu_rename" msgid="7141058657592615390">"Нэр өөрчлөх"</string>
     <string name="storage_menu_mount" msgid="1014683672493425425">"Залгах"</string>
     <string name="storage_menu_unmount" msgid="681485356885955898">"Салгах"</string>
@@ -1169,7 +1166,7 @@
     <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 дээр ашиглах боломж олгоно (www.android.com/filetransfer харна уу)"</string>
-    <string name="usb_ptp_title" msgid="3852760810622389620">"Камера (PTP)"</string>
+    <string name="usb_ptp_title" msgid="3852760810622389620">"Камер (PTP)"</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>
@@ -1192,7 +1189,7 @@
     <string name="storage_dialog_unsupported" msgid="4503128224360482228">"Энэ төхөөрөмж нь <xliff:g id="NAME_0">^1</xliff:g>-г дэмждэггүй. \n\n<xliff:g id="NAME_1">^1</xliff:g>-г энэ төхөөрөмжтэй ашиглахын тулд эхлээд тохируулна уу."</string>
     <string name="storage_internal_format_details" msgid="4018647158382548820">"Хэлбэршүүлэлт хийсний дараа та <xliff:g id="NAME_0">^1</xliff:g>-ыг бусад төхөөрөмжүүдэд энэ ашиглаж болно. \n\nЭнэ <xliff:g id="NAME_1">^1</xliff:g> дээрх бүх өгөгдөл арчигдаж болно. Тиймээс өгөгдлөө нөөцлөн авна уу. \n\n"<b>"Зураг болон бусад медиаг нөөцлөх "</b>\n"Энэ төхөөрөмж дээрх өөр санах ойд медиаг зөөх эсвэл USB кабель ашиглан компьютер уруу шилжүүлэх. \n\n"<b>"Апп нөөцлөх"</b>\n"Энэ <xliff:g id="NAME_6">^1</xliff:g> дээрх бүх апп болон тэдгээрийн өгөгдөл нь устгагдах тул төхөөрөмж дээрх өөр санах ойд зөөвөрлөн нөөцөлнө үү."</string>
     <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"<xliff:g id="NAME_0">^1</xliff:g>-ийг салгах үед суулгасан апп-ууд ажиллахаа больж, хадгалсан файлыг дахин оруулахаас нааш нээх боломжгүй болно."</b>" \n\n <xliff:g id="NAME_1">^1</xliff:g>-ийг зөвхөн энэ төхөөрөмж дээр ажиллахаар форматалсан бөгөөд бусад төхөөрөмж дээр ажиллахгүй."</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g>-ийн агуулж байгаа апп, зураг, өгөгдлийг ашиглахын тулд дахин оруулна уу. \n\nТөхөөрөмжийг ашиглах боломжгүй байгаа тохиолдолд санах ойг мартах энэхүү сонголтыг хийж болно. \n\nМартах сонголт хийсэн бол төхөөрөмжийн агуулж буй өгөгдөл бүгд устах болно. \n\nДараа нь апп-ыг дахин суулгаж болох ч төхөөрөмжид хадгалсан өгөгдөл устахыг анхаарна уу."</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"<xliff:g id="NAME">^1</xliff:g>-ийн агуулж байгаа апп, зураг, өгөгдлийг ашиглахын тулд дахин оруулна уу. \n\nТөхөөрөмжийг ашиглах боломжгүй байгаа тохиолдолд санах ойг мартах энэхүү сонголтыг хийж болно. \n\nМартах сонголт хийсэн бол төхөөрөмжийн агуулж буй өгөгдөл бүгд устах болно. \n\nДараа нь аппыг дахин суулгаж болох ч төхөөрөмжид хадгалсан өгөгдөл устахыг анхаарна уу."</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"<xliff:g id="NAME">^1</xliff:g>-г мартах уу?"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"<xliff:g id="NAME">^1</xliff:g> дээр хадгалсан бүх апп, зураг, өгөгдөл тэр чигтээ устах болно."</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"Апп"</string>
@@ -1231,7 +1228,7 @@
     <string name="storage_wizard_ready_external_body" msgid="2879508114260597474">"Таны <xliff:g id="NAME">^1</xliff:g>-ыг зураг болон бусад медиатай хэрэглэхэд зориулан тохируулсан."</string>
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"Таны шинэ <xliff:g id="NAME">^1</xliff:g> ажиллаж байна. \n\nТохиргоо ба Санах ой хэсгээс энэ төхөөрөмжид зураг, файл, апп зэргийн өгөгдлийг зөөвөрлөнө үү."</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"<xliff:g id="APP">^1</xliff:g>-ыг зөөх"</string>
-    <string name="storage_wizard_move_confirm_body" msgid="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_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>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Зөөвөрлөх явцад <xliff:g id="NAME">^1</xliff:g>-ыг хөдөлгөхгүй байна уу. \n\n Энэ төхөөрөмж дээрх <xliff:g id="APP">^2</xliff:g> апп нь зөөвөрлөж дуусах хүртэл ажиллахгүй."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Зөөвөрлөлтийг цуцлах"</string>
@@ -1307,7 +1304,7 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"SD карт дээрх хөгжим, зураг гэх мэт бүх өгөгдлүүдийг арчих"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"Таблетыг дахин шинэчлэх"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"Утсыг дахин шинэчлэх"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"Бүх хувийн мэдээллээ устгаад, апп-ыг татаж авмаар байна уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"Бүх хувийн мэдээллээ устгаад, аппыг татаж авмаар байна уу? Энэ үйлдлийг буцаах боломжгүй!"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"Бүгдийг устгах"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"Системийг Цэвэрлэх үйлчилгээг ашиглах боломжгүй байгаа учраас дахин шинэчлэх үйлдлийг гүйцэтгээгүй."</string>
     <string name="master_clear_confirm_title" msgid="7572642091599403668">"Дахин шинэчлэх үү?"</string>
@@ -1542,7 +1539,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>
@@ -1605,16 +1602,17 @@
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Апп-г зөөж чадсангүй. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Суулгах давуу байршил"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Шинэ апп-уудыг суулгах тохиромжтой байршлыг өөрчлөх."</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Суурилагдсан апп-ыг идэвхгүйжүүлэх үү?"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"Суурилагдсан аппыг идэвхгүйжүүлэх үү?"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Aпп-ийг идэвхгүй болгох"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"Та энэ аппыг идэвхгүй болгосон тохиолдолд Андройд болон бусад аппын хэвийн ажиллагаа тасалдаж болзошгүй."</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Өгөгдлийг устгаж апп-ыг идэвхгүйжүүлэх үү?"</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Өгөгдлийг устгаж аппыг идэвхгүйжүүлэх үү?"</string>
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Хэрэв та энэ аппыг идэвхгүй болговол бусад аппын хэвийн ажиллагаа тасалдаж болзошгүй. Таны өгөгдөл мөн устах болно."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Мэдэгдлийг унтраах уу?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Хэрэв та энэ апп-н мэдэгдлийг унтраавал чухал сануулгууд болон шинэчлэлтүүдийг алгасаж магадгүй."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Дэлгүүр"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Апп-н дэлгэрэнгүй мэдээлэл"</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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Хэзээ ч ашиглаагүй)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Гарын товчлолын туслагч"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Боломжтой товчлолыг харуулах"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Өгөгдмөл"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Хулгана/тракпад"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Заагчийн хурд"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Тоглоом Контроллер"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Чичиргээ ашиглах"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Бүрэн цэнэглэснээс хойших дэлгэц ашиглалт"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Дэлгэцийн хэрэглээ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Мобайл сүлжээний скан"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g>-н өмнө"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Бүрэн цэнэглэснээс хойших апп ашиглалт (<xliff:g id="TIME">%1$s</xliff:g>-н өмнө)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>-н өмнө"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Бүрэн цэнэглэснээс хойших апп ашиглалт (<xliff:g id="TIME">^1</xliff:g>-н өмнө)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Бүрэн цэнэглэснээс хойших дэлгэцийг асаалттай байлгасан хугацаа"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Бүрэн цэнэглэснээс хойших төхөөрөмжийн ашиглалт"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Салгаснаас хойшхи зайны ашиглалт"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Камер"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Үүрэн хүлээлт"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Мобайл сүлжээний түр горим"</string>
     <string name="power_phone" msgid="5392641106474567277">"Дуугаар залгах"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет идэвхгүй"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Утас идэвхгүй"</string>
@@ -2007,9 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Батерейны ашиглалт нь цэнэг зарцуулалтын ойролцоо хэмжүүр бөгөөд батерей зарцуулдаг бүх сурвалжийг багтаахгүй. Бусад цахилгаан хэрэглээ гэдэг нь тооцоолсон ашиглалт болон бодит цэнэг зарцуулалтын зөрүү юм."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Хэтрүүлэн тооцсон цахилгаан ашиглалт"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <!-- String.format failed for translation -->
-    <!-- no translation found for battery_used_for (4383512863007718804) -->
-    <skip />
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>-д ашигласан"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$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>
@@ -2081,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Дуугаар оруулах &amp; гарах тохиргоо"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Дуут хайлт"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Андройд гар"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Яриа"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Дуун оруулалтын тохиргоо"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Дуугаар оруулах"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Дуун оруулгын үйлчилгээ"</string>
@@ -2232,7 +2226,7 @@
     <string name="work_mode_summary" msgid="1620246003886940776">"Ажлын профайлд апп, дэвсгэр синк хийх болон бусад холбоотой тохиргоог ажиллахыг зөвшөөрөх"</string>
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"Ажлын профайлыг арилгах"</string>
     <string name="background_data" msgid="5779592891375473817">"Далд өгөгдөл"</string>
-    <string name="background_data_summary" msgid="8328521479872763452">"Апп-ууд өгөгдлийг ямар ч үед синк хийж, илгээж, хүлээж авч болно"</string>
+    <string name="background_data_summary" msgid="8328521479872763452">"Аппууд өгөгдлийг ямар ч үед синк хийж, илгээж, хүлээж авч болно"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Далд өгөгдлийг идэвхгүйжүүлэх үү?"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"Далд өгөгдлийг идэвхгүйжүүлэх нь зайны цэнэг зарцуулалтыг багасгаж дата ашиглалтыг бууруулна. Зарим апп-ууд далд өгөгдлийн холболтыг ашиглаж байж магадгүй."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"Апп өгөгдлийг автоматаар синк хийх"</string>
@@ -2343,7 +2337,7 @@
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Автоматаар синк хийх өгөгдлийг унтраах уу?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Энэ нь дата болон зайны цэнэг ашиглалтыг хэмнэх боловч та сүүлийн үеийн мэдээллийг цуглуулахын тулд бүртгэл бүрийг гарааг синк хийх шаардлагатай болно. Мөн шинэчлэлт хийгдсэн үед танд мэдэгдэл ирэхгүй."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Ашиглалтын циклийг шинэчлэх огноо"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Сар бүрийн дата:"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Сар бүрийн өдөр::"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Тохируулах"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Дата ашиглалтын анхааруулга тогтоох"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Дата ашиглалтын хязгаар тогтоох"</string>
@@ -2556,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Өгөгдмөлийг ашиглах"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Байнга"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Өөр төлбөрийн апп нээлттэй байхаас бусад үед"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"\"Tap &amp; төл\" машин дээр төлөх:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"\"Товшиж төлөх\" дээр төлөх:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Tерминалаар тооцоо хийж байна"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Төлбөрийн апп-г тохируулаарай. Холбоoгүй тэмдэг бүхий терминалд утасныхаа ард талыг бариарай."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Ойлголоо"</string>
@@ -2733,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Мэдэгдлийн дууны хэмжээ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Утасны хонхны ая"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Мэдэгдлийн хонхны дуу"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Аппын санал болгосон дуу"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Мэдэгдлийн өгөгдмөл ая"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Сэрүүлгийн үндсэн ая"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Дуудлагад бас чичрэх"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Бусад ая"</string>
@@ -2745,7 +2741,7 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Док чанга яригчаар тоглуулах"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Бүх аудио"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Зөвхөн медиа аудио"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Чимээгүй"</string>
+    <string name="emergency_tone_silent" msgid="1067515631635824291">"Дуугүй"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Сэрэмжлүүлэг"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Чичиргээ"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Дууны чадал"</string>
@@ -2794,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Мэдэгдлийг хэзээ ч харуулахгүй"</string>
@@ -2801,15 +2798,15 @@
     <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_min_summary" msgid="8233873580287975662">"Бага: Дуугүй эсвэл үзэхэд саадгүй"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Дунд зэрэг: Дуугүй"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Өндөр: Дуу гаргах"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Яаралтай: Дуу гаргаж, дэлгэцэд гэнэт гаргах"</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="6585849855452076626">"Дууг зөвшөөрөх"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Эдгээр мэдэгдлүүдийг одоогийн дэлгэцэд харахдаа дуугүй, чичиргээгүй болон яаралтай гаргаж ирэхгүй болгож тохируулна уу."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Мэдэгдлийн туслагч"</string>
     <string name="manage_notification_access_title" msgid="7510080164564944891">"Мэдэгдлийн хандалт"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апп-ууд мэдэгдлийг уншиж чадахгүй"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Аппууд мэдэгдлийг уншиж чадахгүй"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for manage_notification_access_summary_nonzero (7930130030691218387) -->
     <string name="no_notification_listeners" msgid="3487091564454192821">"Суулгасан апп-аас мэдэгдлийн хандалт хүссэн апп байхгүй байна."</string>
@@ -2836,6 +2833,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"\"Бүү саад бол\" хандалт"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Суулгасан апп-аас \"Бүү саад бол\" хандалтыг хүссэн апп байхгүй байна."</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Андройд энэ аппын мэдэгдлийг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Андройд энэ мэдэгдлийн ангиллыг энэ төхөөрөмжид харуулахыг хориглож байна"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Ангилал"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Бусад"</string>
     <string name="no_channels" msgid="3077375508177744586">"Энэ апп ямар ч мэдэгдэл нийтлээгүй"</string>
@@ -2969,18 +2968,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Одоогийн байрлалаар хадгалах"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Аюулгүй эхлэл"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Үргэлжлүүлэх"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Та энэ төхөөрөмжийг эхлүүлэхийн өмнө PIN шаардагддаг болгон хамгаалалтыг сайжруулах боломжтой. Төхөөрөмж асахаас өмнө дуудлага, зурвас, мэдэгдэл, сэрүүлэг хүлээн авах боломжгүй. \n\nЭнэ нь гээсэн буюу хулгайд алдсан төхөөрөмжийн датаг хамгаалахад шаардлагатай."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Та энэ төхөөрөмжийг эхлүүлэхийн өмнө хээ шаардагддаг болгон хамгаалалтыг сайжруулах боломжтой. Төхөөрөмж асахаас өмнө дуудлага, зурвас, мэдэгдэл, сэрүүлэг хүлээн авах боломжгүй. \n\nЭнэ нь гээсэн буюу хулгайд алдсан төхөөрөмжийн датаг хамгаалахад шаардлагатай."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Та энэ төхөөрөмжийг эхлүүлэхийн өмнө нууц үг шаардагддаг болгон хамгаалалтыг сайжруулах боломжтой. Төхөөрөмж асахаас өмнө дуудлага, зурвас, мэдэгдэл, сэрүүлэг хүлээн авах боломжгүй. \n\nЭнэ нь гээсэн буюу хулгайд алдсан төхөөрөмжийн датаг хамгаалахад шаардлагатай."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Та төхөөрөмжийн түгжээг хурууны хээ ашиглан нээхээс гадна төхөөрөмжөө хамгаалахын тулд асаах үед нь нууц үг оруулж байхаар тохируулах боломжтой. Төхөөрөмж асаагүй тохиолдолд дуудлага, зурвас сэрүүлэг гэх мэт мэдэгдлийг авах боломжгүй.\n\nИнгэснээр алга болсон болон хулгайд алдсан төхөөрөмжийн өгөгдлийг хамгаалах боломжтой."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Та төхөөрөмжийн түгжээг хурууны хээ ашиглан нээхээс гадна төхөөрөмжөө хамгаалахын тулд асаах үед нь нууц үг оруулж байхаар тохируулах боломжтой. Төхөөрөмж асаагүй тохиолдолд дуудлага, зурвас, сэрүүлэг гэх зэрэг мэдэгдлийг авах боломжгүй.\n\nИнгэснээр алга болсон болон хулгайд алдсан төхөөрөмжийн өгөгдлийг хамгаалах боломжтой."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Та төхөөрөмжийн түгжээг хурууны хээ ашиглан нээхээс гадна төхөөрөмжөө хамгаалахын тулд асаах үед нь нууц үг оруулж байхаар тохируулах боломжтой. Төхөөрөмж асаагүй тохиолдолд дуудлага, зурвас, сэрүүлэг гэх зэрэг мэдэгдлийг авах боломжгүй.\n\nИнгэснээр алга болсон болон хулгайд алдсан төхөөрөмжийн өгөгдлийг хамгаалах боломжтой."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Төхөөрөмжийг асаахад ПИН шаардана"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Төхөөрөмжийг асаахад хээ оруулахыг шаардах"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Төхөөрөмжийг асаахад нууц үг шаардах"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Үгүй"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Үгүй"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Үгүй"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө ПИН шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө зурган түгжээ шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Та цаашид энэ төхөөрөмжийг хамгаалахын тулд эхлүүлэхээс нь өмнө нууц үг шаардах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө ПИН шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд ПИН шаардах уу?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурууны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө зурган түгжээ шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд зурган хээ шаардах уу?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Төхөөрөмжийнхөө түгжээг тайлахын тулд хурааны хээгээ ашиглах бол та цаашид төхөөрөмжийг эхлүүлэхээс өмнө нууц үг шаардаж хамгаалах боломжтой. Төхөөрөмжийг эхлүүлэх хүртэл дуудлага, зурвас, сэрүүлэг зэрэг мэдэгдэл авах боломжгүй. \n\nЭнэ нь гээсэн эсвэл алдсан төхөөрөмжийн өгөгдлийг хамгаалдаг. Төхөөрөмжөө эхлүүлэхийн тулд нууц үг шаардах уу?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Тийм"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Үгүй"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN шаардах уу?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Загварыг шаардах уу?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Нууц үг шаардах уу?"</string>
@@ -3009,7 +3004,7 @@
     <string name="notifications_enabled" msgid="6983396130566021385">"Идэвхтэй"</string>
     <string name="notifications_disabled" msgid="334416731283131597">"Бүгдийг унтраасан"</string>
     <string name="notifications_partly_blocked" msgid="592071133950126656">"<xliff:g id="COUNT_1">%2$d</xliff:g> категорийн <xliff:g id="COUNT_0">%1$d</xliff:g>-г унтраасан"</string>
-    <string name="notifications_silenced" msgid="4728603513072110381">"Чимээгүй болгосон"</string>
+    <string name="notifications_silenced" msgid="4728603513072110381">"Дуугүй болгосон"</string>
     <string name="notifications_redacted" msgid="4493588975742803160">"Түгжигдсэн дэлгэцэд нууцлалтай агуулга байхгүй"</string>
     <string name="notifications_hidden" msgid="3619610536038757468">"Түгжигдсэн дэлгэцэд байхгүй"</string>
     <string name="notifications_priority" msgid="1066342037602085552">"Бүү Саад Бол тохиргоог хүчингүй болгосон"</string>
@@ -3204,11 +3199,11 @@
     <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_trusted" msgid="6857780460845250885">"Тийм"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Үгүй"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Апп суулгахыг зөвшөөрөх"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Зөвшөөрсөн"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Зөвшөөрөөгүй"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Энэ эх сурвалжаас зөвшөөрөх"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Камер нээхийн тулд бугуйгаа 2 удаа эргүүлэх"</string>
-    <string name="camera_gesture_desc" msgid="1831390075255870960">"Бугуйгаа 2 удаа эргүүлэн камерын апп-ыг нээгээрэй"</string>
+    <string name="camera_gesture_desc" msgid="1831390075255870960">"Бугуйгаа 2 удаа эргүүлэн камерын аппыг нээгээрэй"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камер нээхийн тулд асаах/унтраах товчлуурыг 2 удаа дараарай"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Камерыг дэлгэцийн түгжээ тайлалгүйгээр төвөггүй нээх"</string>
     <string name="screen_zoom_title" msgid="5233515303733473927">"Харагдах хэмжээ"</string>
@@ -3392,7 +3387,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Холбогдсон"</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>
@@ -3581,7 +3577,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> хэрэглэгчид идэвхгүй болгосон)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Автоматаар бөглөх үйлчилгээ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"авто, бөглөх, автоматаар бөглөх"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>-г автоматаар бөглөх апп болгох уу? <xliff:g id="APP_NAME_1">%1$s</xliff:g> таны дэлгэцийг уншиж, бусад апп-д талбар бөглөх боломжтой болно."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Энэ апп-д итгэдэг эсэхээ шалгана уу&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google автоматаар бөглөх&gt;%1$s&lt;/xliff:g&gt; таны дэлгэцэд автоматаар бөглөх зүйлийг илрүүлэхийн тулд ашигладаг."</string>
     <string name="device_theme" msgid="4571803018917608588">"Төхөөрөмжийн загвар"</string>
     <string name="default_theme" msgid="7085644992078579076">"Өгөгдмөл"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Сангийн менежер: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index a652487..d7d49c0 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"काहीही नाही"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"सिम"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"काहीही नाही"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -287,7 +289,7 @@
     <item msgid="6700305533746877052">"ब्लूटुथ व्हॉल्यूम"</item>
     <item msgid="2029227495214047094">"सक्रिय ठेवा"</item>
     <item msgid="26109888160231211">"स्थानाचे परीक्षण करा"</item>
-    <item msgid="5753382310468855812">"उच्च उर्जा स्थानाचे परीक्षण करा"</item>
+    <item msgid="5753382310468855812">"उच्च पॉवर स्थानाचे परीक्षण करा"</item>
     <item msgid="3356591542543137332">"वापर आकडेवारी मिळवा"</item>
     <item msgid="3073734345226842233">"मायक्रोफोन निःशब्द/सशब्द करा"</item>
     <item msgid="2111767435887685265">"टोस्ट दर्शवा"</item>
@@ -379,7 +381,7 @@
     <item msgid="9039213578110332702">"प्रवेशयोग्यता आकारमान"</item>
   </string-array>
   <string-array name="long_press_timeout_selector_titles">
-    <item msgid="3511504869290423954">"लहान"</item>
+    <item msgid="3511504869290423954">"लघु"</item>
     <item msgid="2560532955514699713">"मध्‍यम"</item>
     <item msgid="2372711992605524591">"दीर्घ"</item>
   </string-array>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 7b34827..476a7e0 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -322,27 +322,26 @@
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"प्रशासकाने अक्षम केलेले"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"काहीही नाही"</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">"उदा. जोचे Android."</string>
+    <string name="owner_info_settings_edit_text_hint" msgid="7591869574491036360">"उदा. Joe चे Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"वापरकर्ता माहिती"</string>
     <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"लॉक स्क्रीनवर प्रोफाईलची माहिती दर्शवा"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफाईल माहिती"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाती"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाती"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"सुरक्षितता आणि स्थान"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"कूटबद्धीकरण आणि क्रेडेन्शियल"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"फोन कूटबद्ध केला"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फोन कूटबद्ध केला"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"लॉक स्क्रीन प्राधान्ये"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"माझे स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"माझे स्थान, स्क्रीन लॉक, क्रेडेन्शियल संचयन लॉक सेट करा"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"गोपनीयता"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"प्रशासकाने अक्षम केलेले"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षितता स्थिती"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"फिंगरप्रिंट व्यवस्‍थापित करा"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"फिंगरप्रिंट यासाठी वापरा"</string>
@@ -364,10 +363,10 @@
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"फिंगरप्रिंट जोडा"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा टॅबलेट गहाळ झाल्यास, चोरी झाल्यास किंवा पुसला गेल्यास, तो वापरण्यापासून इतरांना प्रतिबंधित करण्यात आपण सक्षम असणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हे डिव्हाइस गहाळ झाल्यास, चोरी झाल्यास किंवा पुसले गेल्यास, ते वापरण्यापासून इतरांना प्रतिबंधित करण्यात आपण सक्षम असणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा फोन गहाळ झाल्यास, चोरी झाल्यास किंवा पुसला गेल्यास, तो वापरण्यापासून इतरांना प्रतिबंधित करण्यात आपण सक्षम असणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा फोन हरवल्यास, चोरी झाल्यास किंवा पुसला गेल्यास, तो वापरण्यापासून आपण इतरांना प्रतिबंधित करू शकणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा टॅबलेट गहाळ किंवा चोरी झाल्यास तो वापरण्यापासून आपण इतरांना प्रतिबंधित करण्यात सक्षम असणार नाही."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हे डिव्हाइस गहाळ किंवा चोरी झाल्यास ते वापरण्यापासून आपण इतरांना प्रतिबंधित करण्यात सक्षम असणार नाही."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा फोन गहाळ किंवा चोरी झाल्यास तो वापरण्यापासून आपण इतरांना प्रतिबंधित करण्यात सक्षम असणार नाही."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"डिव्हाइस संरक्षण वैशिष्ट्ये सक्रिय केली जाणार नाहीत. हा फोन हरवल्यास किंवा चोरी झाल्यास तो वापरण्यापासून आपण इतरांना प्रतिबंधित करू शकणार नाही."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"तरीही वगळा"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"परत जा"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"सेन्सर शोधा"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"उच्च गुणवत्तेचे सार्वजनिक नेटवर्क उपलब्ध असताना सूचित करा"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"वाय-फाय स्वयंचलितपणे चालू करा"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"आपल्या होम नेटवर्कसारख्या उच्च दर्जाच्या जतन केलेल्या नेटवर्कजवळ वाय-फाय स्वयंचलितपणे परत चालू होईल"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"वाय-फाय स्कॅनिंग बंद केल्यामुळे उपलब्ध नाही"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"खराब कनेक्शन टाळा"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"वाय-फाय नेटवर्कचे चांगले इंटरनेट कनेक्शन नसल्यास त्याचा वापर करु नका"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"केवळ चांगले इंटरनेट कनेक्शन असलेली नेटवर्क वापरा"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"वाय‑फाय कॉन्फिगर करा"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC पत्ता"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP पत्ता"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 पत्‍ते"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"जतन केलेली नेटवर्क"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP सेटिंग्ज"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"वाय‑फाय प्रगत सेटिंग्ज या वापरकर्त्यासाठी उपलब्ध नाहीत"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बंद"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"फोन डॉक केलेला असताना आणि/किंवा निष्क्रिय असताना काय होते हे नियंत्रित करण्यासाठी स्क्रीन सेव्हर चालू करा."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"कधी सुरू करायचे"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"वर्तमान स्क्रीन सेव्हर"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"आता प्रारंभ करा"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिंग्ज"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वयंचलित चकाकी"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"सक्रिय करण्‍यासाठी लिफ्‍ट"</string>
-    <string name="doze_title" msgid="5389406335828323273">"येणार्‍या सूचना स्क्रीन"</string>
+    <string name="doze_title" msgid="2259176504273878294">"अँबियन्ट प्रदर्शन"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचना प्राप्त केल्यावर स्क्रीन सक्रिय करा"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फॉन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"मजकूर आणखी मोठा किंवा आणखी लहान करा"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"सिस्टीम"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> एक्सप्लोर करा"</string>
     <string name="storage_detail_dialog_other" msgid="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_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_wizard_init_title" msgid="5085400514028585772">"आपले <xliff:g id="NAME">^1</xliff:g> सेट करा"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल संचयन म्हणून वापरा"</string>
@@ -1470,7 +1467,7 @@
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"नमुना दृश्यमान बनवा"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"प्रोफाईल नमुना दृश्यमान बनवा"</string>
     <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"टॅप केल्यावर कंपन करा"</string>
-    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"उर्जा बटण तात्काळपणे लॉक करते"</string>
+    <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"पॉवर बटण तात्काळपणे लॉक करते"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> द्वारे अनलॉक केलेले ठेवले असते ते वगळून"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"अनलॉक नमुना सेट करा"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"अनलॉक नमुना बदला"</string>
@@ -1615,6 +1612,7 @@
     <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="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> ची अधिक माहिती"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"अ‍ॅप ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"चालू आहे"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(कधीही न वापरलेले)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"कीबोर्ड शॉर्टकट मदतनीस"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"उपलब्ध शॉर्टकट प्रदर्शित करा"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"डीफॉल्ट"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"माउस/ट्रॅकपॅड"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"पॉइंटर गती"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"गेम नियंत्रक"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"व्हायब्रेटर वापरा"</string>
@@ -1788,10 +1785,10 @@
     <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>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"उर्जा बटण कॉल समाप्त करते"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"पॉवर बटण कॉल समाप्त करते"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"मोठा माऊस पॉईंटर"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"मोनो ऑडिओ"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ऑडिओ खेळताना चॅनेल एकत्र करा"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"ऑडिओ प्ले करताना चॅनेल एकत्र करा"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"स्पर्श आणि धरण्याचा विलंब"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"रंग व्युत्क्रम"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"कार्यप्रदर्शन प्रभावित करू शकते"</string>
@@ -1912,11 +1909,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"अ‍ॅप वापरात नसताना ते पार्श्वभूमीत चालू शकते"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"अ‍ॅप वापरात नसताना त्याचा पार्श्वभूमी क्रियाकलाप मर्यादित असतो"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"अॅपला पार्श्वभूमीमध्ये चालण्याची अनुमती नाही"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्जपासून स्क्रीन वापर"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज झाल्यानंतर स्क्रीन वापर"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रीन उपयोग"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्कॅनिंग"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> पूर्वी"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्जपासून अॅप वापर (<xliff:g id="TIME">%1$s</xliff:g> पूर्वी)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पूर्वी"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्ज झाल्यापासून अॅप वापर (<xliff:g id="TIME">^1</xliff:g> पूर्वी)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्जपासून स्क्रीन चालू असण्याच्या वेळाचे प्रमाण"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"शेवटच्या पूर्ण चार्जपासून डिव्हाइस वापर"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग केल्यापासून बॅटरी वापर"</string>
@@ -1940,14 +1937,14 @@
     <string name="history_details_title" msgid="3608240585315506067">"इतिहास तपशील"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"बॅटरी वापर"</string>
     <string name="details_subtitle" msgid="32593908269911734">"तपशील वापरा"</string>
-    <string name="controls_subtitle" msgid="390468421138288702">"उर्जा वापर समायोजित करा"</string>
+    <string name="controls_subtitle" msgid="390468421138288702">"पॉवर वापर समायोजित करा"</string>
     <string name="packages_subtitle" msgid="4736416171658062768">"समाविष्ट पॅकेज"</string>
     <string name="power_screen" msgid="3023346080675904613">"स्क्रीन"</string>
     <string name="power_flashlight" msgid="7794409781003567614">"फ्लॅशलाइट"</string>
     <string name="power_camera" msgid="4976286950934622605">"कॅमेरा"</string>
     <string name="power_wifi" msgid="1135085252964054957">"वाय-फाय"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ब्लूटुथ"</string>
-    <string name="power_cell" msgid="6596471490976003056">"सेल स्टँडबाय"</string>
+    <string name="power_cell" msgid="3392999761958982492">"मोबाइल नेटवर्क स्टँडबाय"</string>
     <string name="power_phone" msgid="5392641106474567277">"व्हॉइस कॉल"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"टॅबलेट निष्क्रिय"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"फोन निष्क्रिय"</string>
@@ -1976,8 +1973,8 @@
     <string name="usage_type_on_time" msgid="3351200096173733159">"वेळ चालू"</string>
     <string name="usage_type_no_coverage" msgid="3797004252954385053">"सिग्नलशिवायची वेळ"</string>
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"एकूण बॅटरी क्षमता"</string>
-    <string name="usage_type_computed_power" msgid="5862792259009981479">"गणना केलेला उर्जा वापर"</string>
-    <string name="usage_type_actual_power" msgid="7047814738685578335">"निरीक्षण केलेला उर्जा वापर"</string>
+    <string name="usage_type_computed_power" msgid="5862792259009981479">"गणना केलेला पॉवर वापर"</string>
+    <string name="usage_type_actual_power" msgid="7047814738685578335">"निरीक्षण केलेला पॉवर वापर"</string>
     <string name="battery_action_stop" msgid="649958863744041872">"सक्तीने थांबवा"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"अॅप माहिती"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"अ‍ॅप सेटिंग्ज"</string>
@@ -1988,7 +1985,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"टॅबलेट निष्क्रिय असताना वापरलेली बॅटरी"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"फोन निष्क्रिय असताना वापरलेली बॅटरी"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"सेल रेडिओद्वारे वापरलेली बॅटरी"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"सेल कव्हरेज नसलेल्या क्षेत्रांमध्ये उर्जा वाचविण्यासाठी विमान मोड वर स्विच करा"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"सेल कव्हरेज नसलेल्या क्षेत्रांमध्ये पॉवर वाचविण्यासाठी विमान मोड वर स्विच करा"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"फ्‍लॅशलाइट द्वारे वापरलेली बॅटरी"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"कॅमेर्‍याद्वारे वापरलेली बॅटरी"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"प्रदर्शन आणि बॅकलाइटद्वारे वापरलेली बॅटरी"</string>
@@ -2003,14 +2000,14 @@
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"बॅटरी बचत मोड निवडा"</string>
     <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"बॅटरी वापर कमी करण्यासाठी अॅप सेटिंग्ज ऑफर करू शकतो"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"वापरकर्त्याद्वारे वापरलेली बॅटरी"</string>
-    <string name="battery_desc_unaccounted" msgid="7404256448541818019">"किरकोळ उर्जा वापर"</string>
-    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"बॅटरी वापर हा उर्जा वापराचा अंदाज आहे आणि बॅटरी निचर्‍याचा प्रत्येक स्त्रोत समाविष्‍ट करीत नाही. गणना केलेला अंदाजे उर्जा वापर आणि बॅटरीवर निरीक्षण केलेला वास्‍तविक निचरा यांमधील फरक म्‍हणजे किरकोळ होय."</string>
-    <string name="battery_desc_overcounted" msgid="5481865509489228603">"जास्त प्रमाणात उर्जा वापर"</string>
+    <string name="battery_desc_unaccounted" msgid="7404256448541818019">"किरकोळ पॉवर वापर"</string>
+    <string name="battery_msg_unaccounted" msgid="1963583522633067961">"बॅटरी वापर हा पॉवर वापराचा अंदाज आहे आणि बॅटरी निचर्‍याचा प्रत्येक स्त्रोत समाविष्‍ट करीत नाही. गणना केलेला अंदाजे पॉवर वापर आणि बॅटरीवर निरीक्षण केलेला वास्‍तविक निचरा यांमधील फरक म्‍हणजे किरकोळ होय."</string>
+    <string name="battery_desc_overcounted" msgid="5481865509489228603">"जास्त प्रमाणात पॉवर वापर"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s साठी वापरले"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>साठी वापरले"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ने <xliff:g id="PERCENT">%1$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_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_detail_foreground" msgid="3350401514602032183">"सक्रिय वापरात असताना"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"आवाज इनपुट आणि आउटपुट सेटिंग्ज"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"व्हॉइस शोध"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android कीबोर्ड"</string>
-    <string name="voice_category" msgid="1430370497125803904">"भाषण"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"व्‍हॉइस इनपुट सेटिंग्‍ज"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"व्हॉइस इनपुट"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"व्‍हॉइस इनपुट सेवा"</string>
@@ -2098,7 +2094,7 @@
     <string name="tts_install_voices_cancel" msgid="4711492804851107459">"रद्द करा"</string>
     <string name="tts_reset" msgid="2661752909256313270">"रीसेट करा"</string>
     <string name="tts_play" msgid="2628469503798633884">"प्ले करा"</string>
-    <string name="gadget_title" msgid="5519037532720577836">"उर्जा नियंत्रण"</string>
+    <string name="gadget_title" msgid="5519037532720577836">"पॉवर नियंत्रण"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"वाय-फाय सेटिंग अद्ययावत करीत आहे"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ब्लूटुथ सेटिंग्ज अद्यतनित करत आहे"</string>
     <string name="gadget_state_template" msgid="5156935629902649932">"<xliff:g id="ID_1">%1$s</xliff:g> <xliff:g id="ID_2">%2$s</xliff:g>"</string>
@@ -2681,7 +2677,7 @@
     <string name="keywords_display_font_size" msgid="3404655440064726124">"मजकूर आकार"</string>
     <string name="keywords_display_cast_screen" msgid="7684618996741933067">"प्रोजेक्ट, कास्‍ट करा"</string>
     <string name="keywords_storage" msgid="3299217909546089225">"स्थान, डिस्क, हार्ड ड्राइव्ह, डिव्‍हाइस वापर"</string>
-    <string name="keywords_battery" msgid="1173830745699768388">"उर्जा वापर, चार्ज"</string>
+    <string name="keywords_battery" msgid="1173830745699768388">"पॉवर वापर, चार्ज"</string>
     <string name="keywords_spell_checker" msgid="1399641226370605729">"शब्दलेखन, शब्दकोश, शब्दलेखन-तपासक, स्वयं-दुरुस्ती"</string>
     <string name="keywords_voice_input" msgid="769778245192531102">"ओळखकर्ता, इनपुट, उच्चारण, बोलणे, भाषा, हँड्सफ्री, हँड फ्री, ओळख, चीड आणणारे, शब्द, ऑडिओ, इतिहास, ब्लूटुथ हेडसेट"</string>
     <string name="keywords_text_to_speech_output" msgid="5150660047085754699">"रेट करा, भाषा, डीफॉल्ट, बोला, बोलणे, tts, प्रवेशयोग्यता, स्क्रीन रीडर, दृष्‍टीहीन"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"सूचना व्हॉल्यूम"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फोन रिंगटोन"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"डीफॉल्ट सूचना ध्वनी"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"अॅपने प्रदान केलेला ध्वनी"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"डीफॉल्ट सूचना ध्वनी"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"डीफॉल्ट अलार्म ध्वनी"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कॉल साठी कंपन देखील"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"इतर ध्वनी"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"सूचना कधीही दर्शवू नका"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"कमी: कोणताही ध्वनी किंवा व्हिज्युअल व्यत्यय नाही"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"मध्यम: ध्वनी नाही"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"उच्च: ध्वनी करा"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"तातडीचे: ध्वनी करा आणि स्क्रीनवर पॉप करा"</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="6585849855452076626">"ध्वनीला अनुमती द्या"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ध्वनी, कंपन करू नका किंवा वर्तमान स्क्रीनवर दृश्यामध्ये या सूचना दर्शवू नका."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहाय्यक"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"व्यत्यय आणू नका प्रवेश"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कोणत्याही स्थापित केलेल्या अॅप्सने व्यत्यय आणू नका प्रवेशाची विनंती केली नाही"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अॅप्स लोड करीत आहे..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android या अ‍ॅपच्या सूचना या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android या प्रकारच्या सूचना या डिव्हाइसवर दिसणे ब्लॉक करत आहे"</string>
     <string name="notification_channels" msgid="5346841743182627500">"श्रेण्या"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
     <string name="no_channels" msgid="3077375508177744586">"या अॅपने कोणत्याही सूचना पोस्ट केल्या नाहीत"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"चालू"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"बंद"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"स्‍क्रीन पिन करणे"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"हे सेटिंग चालू केले असते तेव्हा, आपण अनपिन करेपर्यंत वर्तमान स्क्रीन दृश्यामध्ये ठेवण्यासाठी आपण स्क्रीन पिन करणे वापरू शकता.\n\nस्क्रीन पिन करणे वापरण्यासाठी हे करा:\n\n1. स्क्रीन पिन करणे चालू केले आहे याची खात्री करा.\n\n2. आपण पिन करू इच्छित असलेली स्क्रीन उघडा.\n\n3. विहंगावलोकन टॅप करा.\n\n4. स्वाइप करा आणि नंतर पिन चिन्ह टॅप करा."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"हे सेटिंग चालू केले असते तेव्हा, आपण अनपिन करेपर्यंत वर्तमान स्क्रीन पाहण्यासाठी आपण स्क्रीन पिन करणे वापरू शकता.\n\nस्क्रीन पिन करणे वापरण्यासाठी हे करा:\n\n1. स्क्रीन पिन करणे चालू केले आहे याची खात्री करा.\n\n2. आपण पिन करू इच्छित असलेली स्क्रीन उघडा.\n\n3. विहंगावलोकन टॅप करा.\n\n4. वर स्वाइप करा आणि नंतर पिन चिन्ह टॅप करा."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"अनपिन करण्‍यापूर्वी अनलॉक नमुन्यासाठी विचारा"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"अनपिन करण्‍यापूर्वी पिन साठी विचारा"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"अनपिन करण्‍यापूर्वी संकेतशब्दासाठी विचारा"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखतेमध्ये रहा"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"सुरक्षित प्रारंभ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"सुरु ठेवा"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"आपण या डिव्हाइसचा प्रारंभ करण्यापूर्वी आपला पिन आवश्यक करून हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइसचा प्रारंभ होईपर्यंत, ते अलार्मसह, कॉल, संदेश किंवा सूचना प्राप्त करू शकत नाही.\n\nयामुळे गहाळ किंवा चोरी झालेल्या डिव्हाइसेसवरील डेटा संरक्षित करण्यात मदत होते."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"आपण हे डिव्हाइस प्रारंभ करण्यापूर्वी आपला नमुना आवश्यक करून ते अधिक संरक्षित करू शकता. डिव्हाइस प्रारंभ होईपर्यंत, ते अलार्मसह, कॉल, संदेश किंवा सूचना प्राप्त करू शकत नाही.\n\nहे हरवलेल्या किंवा चोरी झालेल्या डिव्हाइसेसवरील डेटा संरक्षित करण्यात मदत करते."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"आपण या डिव्हाइसचा प्रारंभ करण्यापूर्वी आपला संकेतशब्द आवश्यक करून हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइसचा प्रारंभ होईपर्यंत, ते अलार्मसह, कॉल, संदेश किंवा सूचना प्राप्त करू शकत नाही.\n\nयामुळे गहाळ किंवा चोरी झालेल्या डिव्हाइसेसवरील डेटा संरक्षित करण्यात मदत होते."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"आपले डिव्‍हाइस अनलॉक करण्‍यासाठी आपले फिंगरप्रिंट वापरण्‍याव्यतिरिक्त, त्याचा प्रारंभ होण्‍यापूर्वी आपण आपला पिन आवश्‍यक करून हे डिव्‍हाइस आणखी सुरक्षित करू शकता. डिव्‍हाइसचा प्रारंभ होईपर्यंत, ते अलार्मसह कॉल, संदेश किंवा सूचना प्राप्त करू शकत नाही. \n\nहे गहाळ किंवा चोरी झालेल्‍या डिव्‍हाइसेस वरील डेटा संरक्षित करण्‍यात मदत करते."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"आपले डिव्‍हाइस अनलॉक करण्‍यासाठी आपले फिंगरप्रिंट वापरण्‍याव्यतिरिक्त, ते प्रारंभ होण्‍यापूर्वी आपण आपला नमुना आवश्‍यक करून हे डिव्‍हाइस अधिक सुरक्षित करू शकता. डिव्‍हाइस प्रारंभ होईपर्यंत, ते अलार्मसह कॉल, संदेश किंवा सूचना प्राप्त करू शकत नाही. \n\nहे हरवलेल्या किंवा चोरी झालेल्‍या डिव्‍हाइसेस वरील डेटा संरक्षित करण्‍यात मदत करते."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"आपले डिव्‍हाइस अनलॉक करण्‍यासाठी आपले फिंगरप्रिंट वापरण्‍याव्यतिरिक्त, त्याचा प्रारंभ होण्‍यापूर्वी आपण आपला संकतेशब्द आवश्‍यक करून हे डिव्‍हाइस आणखी सुरक्षित करू शकता. डिव्‍हाइसचा प्रारंभ होईपर्यंत, ते अलार्मसह कॉल, संदेश किंवा सूचना प्राप्त करू शकत नाही. \n\nहे गहाळ किंवा चोरी झालेल्‍या डिव्‍हाइसेस वरील डेटा संरक्षित करण्‍यात मदत करते."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"डिव्हाइस प्रारंभ करण्यासाठी पिन आवश्यक"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"डिव्हाइस प्रारंभ करण्यासाठी नमुना आवश्यक"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"डिव्हाइस प्रारंभ करण्यासाठी संकेतशब्द आवश्यक"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"नाही धन्यवाद"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"नाही धन्यवाद"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"नाही धन्यवाद"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"सुरू होण्यापूर्वी आपला पिन आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"सुरू होण्यापूर्वी आपला नमुना आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी नमुना हवा?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"सुरू होण्यापूर्वी आपला संकेतशब्द आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही. \n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी संकेतशब्द हवा?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"आपले डिव्हाइस अनलॉक करण्यासाठी आपले फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी आपला पिन आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी पिन हवा?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"आपले डिव्हाइस अनलॉक करण्यासाठी आपले फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी आपला नमुना आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी नमुना हवा?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"आपले डिव्हाइस अनलॉक करण्यासाठी आपले फिंगरप्रिंट वापरण्याव्यतिरिक्त, सुरू होण्यापूर्वी आपला संकेतशब्द आवश्यक करून आपण हे डिव्हाइस अधिक संरक्षित करू शकता. डिव्हाइस सुरू होईपर्यंत, ते कॉल, संदेश किंवा अलार्मसह सूचना प्राप्त करू शकत नाही.\n\nयामुळे हरवलेल्या किंवा चोरीला गेलेल्या डिव्हाइसवरील डेटाचे संरक्षण करण्यात मदत होते. आपले डिव्हाइस सुरू करण्यासाठी संकेतशब्द हवा?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"होय"</string>
+    <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>
@@ -3118,7 +3115,7 @@
     <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>
-    <string name="usb_use_power_only" msgid="6426550616883919530">"उर्जा पुरवठा करा"</string>
+    <string name="usb_use_power_only" msgid="6426550616883919530">"पॉवर पुरवठा करा"</string>
     <string name="usb_use_power_only_desc" msgid="3461232831015575152">"कनेक्ट केलेले डिव्हाइस चार्ज करा. केवळ USB चार्जिंग समर्थित करणार्‍या डिव्हाइससह कार्य करते."</string>
     <string name="usb_use_file_transfers" msgid="7409600791007250137">"फायली स्थानांतरित करा"</string>
     <string name="usb_use_file_transfers_desc" msgid="4235764784331804488">"दुसऱ्या डिव्हाइसवर फायली स्थानांतरित करा"</string>
@@ -3204,15 +3201,15 @@
     <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_trusted" msgid="6857780460845250885">"होय"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"नाही"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"अ‍ॅप स्थापनांना अनुमती द्या"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"अनुमती आहे"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"अनुमती नाही"</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>
-    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कॅमेर्‍यासाठी उर्जा बटण दोनदा दाबा"</string>
+    <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"कॅमेर्‍यासाठी पॉवर बटण दोनदा दाबा"</string>
     <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_short_summary" msgid="7291960817349834688">"स्क्रीन वरील आयटम आणखी मोठे किंवा आणखी लहान करा"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"प्रदर्शन घनता, स्क्रीन झूम, मापन, मापन करीत आहे"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"आपल्या स्क्रीन वरील आयटम आणखी लहान किंवा आणखी मोठे करा. आपल्या स्क्रीन वरील काही अॅप्स स्थान बदलू शकतात."</string>
     <string name="screen_zoom_preview_title" msgid="4680671508172336572">"पूर्वावलोकन"</string>
@@ -3221,8 +3218,8 @@
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"हाय पीट!"</string>
-    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"अहो, आज कॉफी घ्यायची आणि काही चर्चा करायची?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"चांगली गोष्ट आहे. मला येथून दूर नसलेले एक चांगले ठिकाण माहित आहे."</string>
+    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"अरे, आज कॉफी प्यायला चलायचं?"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"हो नक्की. मला जवळचे एक चांगले ठिकाण माहित आहे."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"छान!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"मंगळवारी 6:00PM वाजता"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"मंगळवारी 6:01PM वाजता"</string>
@@ -3307,7 +3304,7 @@
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> निर्बंध</item>
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> निर्बंध</item>
     </plurals>
-    <string name="operator_warning" msgid="1862988028996859195">"वाहक डेटा लेखा हा डिव्हाइसच्या लेखापेक्षा वेगळा असू शकतो"</string>
+    <string name="operator_warning" msgid="1862988028996859195">"वाहक डेटा गणना आपल्या डिव्हाइसपेक्षा भिन्न असू शकते"</string>
     <string name="data_used_template" msgid="3245919669966296505">"<xliff:g id="ID_1">%1$s</xliff:g> वापरला"</string>
     <string name="set_data_warning" msgid="6115364758236594593">"डेटा चेतावणी सेट करा"</string>
     <string name="data_warning" msgid="209133958008062117">"डेटा चेतावणी"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"याच्याशी कनेक्ट केले"</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>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> वापरकर्त्‍यासाठी अक्षम केले)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"स्वयं-भरण सेवा"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"स्वयं, भरा, स्वयंभरण"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ला आपले स्वयंभरण अॅप बनवायचे आहे का? <xliff:g id="APP_NAME_1">%1$s</xliff:g> आपली स्क्रीन वाचू शकते आणि इतर अॅप्समधील फील्ड भरु शकते."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;आपला या अॅपवर विश्वास असल्याचे सुनिश्चित करा&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ऑटोफिल काय होऊ शकते हे ठरवण्यासाठी आपल्या स्क्रीनवर काय आहे याचा वापर करते."</string>
     <string name="device_theme" msgid="4571803018917608588">"डिव्हाइस थीम"</string>
     <string name="default_theme" msgid="7085644992078579076">"डीफॉल्ट"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"संचय व्यवस्थापक: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index fc74daa..45beac6 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Tiada"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Tiada"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 144735f..d6468c5 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akaun"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaun"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Keselamatan &amp; Lokasi"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Penyulitan &amp; bukti kelayakan"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon disulitkan"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon disulitkan"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Pilihan skrin kunci"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privasi"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Dilumpuhkan oleh pentadbir"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Status keselamatan"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Kunci skrin, cap jari"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Kunci skrin"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Cap jari"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Urus cap jari"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gunakan cap jari untuk"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Beritahu apabila rangkaian awam berkualiti tinggi tersedia"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Hidupkan Wi-Fi secara automatik"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi akan dihidupkan kembali berdekatan dengan rangkaian disimpan yang berkualiti tinggi, seperti rangkaian rumah"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Tidak tersedia kerana pengimbasan Wi-Fi dimatikan"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Elakkan sambungan lemah"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Jangan gunakan rangkaian Wi-Fi melainkan jika rangkaian itu mempunyai sambungan internet yang baik"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Guna rangkaian dengan sambungan Internet yang stabil sahaja"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurasikan Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Tapisan subrangkaian"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Alamat IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Rangkaian yg dsimpan"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Tetapan IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Tetapan terperinci Wi-Fi tidak tersedia untuk pengguna ini"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dimatikan"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Untuk mengawal perkara yang berlaku semasa telefon didok dan/atau tidur, hidupkan penyelamat skrin."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Masa untuk mulakan"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Penyelamat skrin semasa"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Mulakan sekarang"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Tetapan"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angkat untuk bangunkan"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Skrin pemberitahuan masuk"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Paparan ambien"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktifkan skrin apabila anda menerima pemberitahuan"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Besarkan atau kecilkan teks"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Gedung"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Butiran apl"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Apl dipasang daripada <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Maklumat lanjut di <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Pengendalian apl"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Dijalankan"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Tidak pernah digunakan)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pembantu pintasan papan kekunci"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Paparkan pintasan yang tersedia"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Lalai"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Tetikus/Pad jejak"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kelajuan penuding"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Pengawal Permainan"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Gunakan penggetar"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Penggunaan skrin sejak cas penuh"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Penggunaan skrin"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pengimbasan rangkaian mudah alih"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> yang lalu"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan apl sejak cas penuh (<xliff:g id="TIME">%1$s</xliff:g> yang lalu)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> yang lalu"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Penggunaan apl sejak cas penuh (<xliff:g id="TIME">^1</xliff:g> yang lalu)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Jumlah masa skrin dihidupkan sejak cas penuh"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Penggunaan peranti sejak cas penuh"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateri digunakan sejak palam dicabut"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Sel tunggu sedia"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Kuasa tunggu sedia rangkaian mudah alih"</string>
     <string name="power_phone" msgid="5392641106474567277">"Panggilan suara"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet melahu"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon melahu"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Penggunaan bateri adalah anggaran penggunaan kuasa dan tidak termasuk setiap sumber penyusutan bateri. Pelbagai adalah perbezaan antara penggunaan kuasa anggaran yang dikira dan penyusutan sebenar yang diperhatikan pada bateri."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Penggunaan kuasa terlebih kira"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Digunakan untuk %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Digunakan selama <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> digunakan oleh <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> daripada keseluruhan bateri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Pecahan sejak cas penuh terakhir"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Tetapan input &amp; output suara"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Carian suara"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Papan kekunci Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Pertuturan"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Tetapan input suara"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Input suara"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Perkhidmatan input suara"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Storan bukti kelayakan tidak boleh dipadamkan."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Storan bukti klykn didayakan."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Anda perlu menetapkan PIN atau kata laluan kunci skrin sebelum anda boleh menggunakan storan bukti kelayakan."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Apl dengan akses penggunaan"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apl dgn akses guna"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nada kecemasan"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Tetapkan tingkah laku semasa membuat panggilan kecemasan"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sandaran"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Kelantangan pemberitahuan"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Bunyi pemberitahuan lalai"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Bunyi yang disediakan oleh apl"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Bunyi pemberitahuan lalai"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Bunyi penggera lalai"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Juga bergetar untuk panggilan"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Bunyi lain"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Apabila peranti anda dikunci, bagaimanakah pemberitahuan profil harus dipaparkan?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Pemberitahuan profil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Pemberitahuan"</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_blocked" msgid="7938180808339386300">"Jangan sekali-kali tunjukkan pemberitahuan"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Rendah: Tiada bunyi atau gangguan visual"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Sederhana: Tiada bunyi"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Tinggi: Berbunyi"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Segera: Berbunyi dan 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Pembantu pemberitahuan"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android menyekat pemberitahuan apl ini daripada muncul pada peranti ini"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android menyekat kategori pemberitahuan ini daripada muncul pada peranti ini"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategori"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Lain-lain"</string>
     <string name="no_channels" msgid="3077375508177744586">"Apl ini belum menyiarkan sebarang pemberitahuan"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Kekal dalam orientasi semasa"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Permulaan selamat"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Teruskan"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Anda boleh melindungi peranti ini selanjutnya dengan meminta PIN anda sebelum peranti dimulakan. Sehingga peranti dimulakan, peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera. \n\nIni membantu melindungi data pada peranti yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Anda boleh melindungi peranti ini selanjutnya dengan meminta corak anda sebelum peranti dimulakan. Sehingga peranti dimulakan, peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera. \n\nIni membantu melindungi data pada peranti yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Anda boleh melindungi peranti ini selanjutnya dengan meminta kata laluan anda sebelum peranti dimulakan. Sehingga peranti dimulakan, peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera. \n\nIni membantu melindungi data pada peranti yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Selain menggunakan cap jari untuk membuka kunci peranti anda, anda boleh melindungi peranti ini selanjutnya dengan menghendaki PIN anda sebelum peranti itu dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nCara ini membantu melindungi data pada peranti yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Selain menggunakan cap jari untuk membuka kunci peranti anda, anda boleh melindungi peranti ini selanjutnya dengan menghendaki corak anda sebelum peranti itu dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nCara ini membantu melindungi data pada peranti yang hilang atau dicuri."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Selain menggunakan cap jari untuk membuka kunci peranti anda, anda boleh melindungi peranti ini selanjutnya dengan menghendaki kata laluan anda sebelum peranti itu dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nCara ini membantu melindungi data pada peranti yang hilang atau dicuri."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"PIN diperlukan untuk memulakan peranti"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Corak diperlukan untuk memulakan peranti"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Kata laluan diperlukan untuk memulakan peranti"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Tidak"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Tidak"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Tidak"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Anda boleh melindungi peranti ini selanjutnya dengan meminta PIN sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan. \n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta PIN untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Anda boleh melindungi peranti ini selanjutnya dengan meminta corak sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan. \n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta corak untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Anda boleh melindungi peranti ini selanjutnya dengan meminta kata laluan sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan. \n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Di samping penggunaan cap jari untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta PIN sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta PIN untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Di samping penggunaan cap jari untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta corak sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta corak untuk memulakan peranti anda?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Di samping penggunaan cap jari untuk membuka peranti, anda boleh melindungi peranti ini selanjutnya dengan meminta kata laluan sebelum peranti dimulakan. Peranti tidak boleh menerima panggilan, mesej atau pemberitahuan, termasuk penggera, sehingga dimulakan.\n\nTindakan ini melindungi data pada peranti yang hilang atau dicuri. Minta kata laluan untuk memulakan peranti anda&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ya"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Tidak"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Memerlukan PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Memerlukan corak?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Memerlukan kata laluan?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Kebenaran ini membolehkan apl mengubah suai tetapan sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ya"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Tidak"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ya"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Tidak"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Benarkan pemasangan apl"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Dibenarkan"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Tidak dibenarkan"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Benarkan daripada sumber ini"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Pusing dua kali untuk membuka kamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Buka apl kamera dengan memusingkan pergelangan tangan anda dua kali"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tekan butang kuasa dua kali untuk kamera"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Disambungkan ke"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Jubin pembangun tetapan pantas"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Kami bersedia membantu anda"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dilumpuhkan untuk pengguna <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Perkhidmatan autolengkap"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, lengkap, autolengkap"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Jadikan <xliff:g id="APP_NAME_0">%1$s</xliff:g> apl autolengkap anda? <xliff:g id="APP_NAME_1">%1$s</xliff:g> akan dapat membaca skrin anda dan mengisi medan dalam apl lain."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Pastikan anda mempercayai apl ini&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; menggunakan item yang terdapat pada skrin anda untuk menentukan perkara yang boleh dilengkapkan secara automatik."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema peranti"</string>
     <string name="default_theme" msgid="7085644992078579076">"Lalai"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Pengurus Storan: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index e3d337d..1b3731c 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -34,9 +34,9 @@
     <item msgid="8881760709354815449">"၃၀ စက္ကန့်"</item>
     <item msgid="7589406073232279088">"၁ မိနစ်"</item>
     <item msgid="7001195990902244174">"၂ မိနစ်"</item>
-    <item msgid="7489864775127957179">"၅မိနစ်"</item>
+    <item msgid="7489864775127957179">"၅ မိနစ်"</item>
     <item msgid="2314124409517439288">"၁၀ မိနစ်"</item>
-    <item msgid="6864027152847611413">"၃၀မိနစ်"</item>
+    <item msgid="6864027152847611413">"၃၀ မိနစ်"</item>
   </string-array>
   <string-array name="dream_timeout_entries">
     <item msgid="3149294732238283185">"ဘယ်တော့မှ"</item>
@@ -44,9 +44,9 @@
     <item msgid="5892295237131074341">"၃၀ စက္ကန့်"</item>
     <item msgid="3538441365970038213">"၁ မိနစ်"</item>
     <item msgid="412343871668955639">"၂ မိနစ်"</item>
-    <item msgid="5076853889688991690">"၅မိနစ်"</item>
+    <item msgid="5076853889688991690">"၅ မိနစ်"</item>
     <item msgid="1903860996174927898">"၁၀ မိနစ်"</item>
-    <item msgid="6415509612413178727">"၃၀မိနစ်"</item>
+    <item msgid="6415509612413178727">"၃၀ မိနစ်"</item>
   </string-array>
   <string-array name="lock_after_timeout_entries">
     <item msgid="8929270399652145290">"ချက်ချင်း"</item>
@@ -55,12 +55,12 @@
     <item msgid="1822002388249545488">"၃၀ စက္ကန့်"</item>
     <item msgid="8538071621211916519">"၁ မိနစ်"</item>
     <item msgid="5663439580228932882">"၂ မိနစ်"</item>
-    <item msgid="49888496216106852">"၅မိနစ်"</item>
+    <item msgid="49888496216106852">"၅ မိနစ်"</item>
     <item msgid="9002737361305019353">"၁၀ မိနစ်"</item>
-    <item msgid="4322676235684793329">"၃၀မိနစ်"</item>
+    <item msgid="4322676235684793329">"၃၀ မိနစ်"</item>
   </string-array>
   <string-array name="entries_font_size">
-    <item msgid="8166647333858618801">"သေးငယ်သော"</item>
+    <item msgid="8166647333858618801">"သေး"</item>
     <item msgid="6986443533756848935">"မူရင်း"</item>
     <item msgid="38373998008112077">"အကြီးစား"</item>
     <item msgid="7635254317531872272">"အကြီးဆုံး"</item>
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"တစ်ခုမျှ မဟုတ်ပါ"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"ဆင်းမ်ကဒ်"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"တစ်ခုမှမဟုတ်ပါ"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -396,7 +398,7 @@
   </string-array>
   <string-array name="captioning_font_size_selector_titles">
     <item msgid="4800919809575254054">"အလွန်သေးရန်"</item>
-    <item msgid="6781094565687692782">"သေးငယ်ရန်"</item>
+    <item msgid="6781094565687692782">"သေး"</item>
     <item msgid="8222123259497646551">"ပုံမှန်"</item>
     <item msgid="5813217276778560466">"အကြီးစား"</item>
     <item msgid="9044232017390975191">"အလွန်ကြီးရန်"</item>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index 785fe68..c0c9a19 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -235,7 +235,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"မီဒီယာအတွက် SDကဒ်ကို စကင်ပြုလုပ်နေသည်"</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB ကိုဖတ်ရန်သပ်သပ်အတွက်သာ တပ်ထားပြီး"</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SDကဒ်ကို ဖတ်ရန်သပ်သပ်အတွက်သာ တပ်ထားပြီး။"</string>
-    <string name="skip_label" msgid="47510779345218297">"ကျော်"</string>
+    <string name="skip_label" msgid="47510779345218297">"ကျော်ရန်"</string>
     <string name="next_label" msgid="4693520878012668114">"ရှေ့သို့"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"ဘာသာစကားများ"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"ဘာသာစကားဆိုင်ရာ မိမိစိတ်ကြိုက်ဆက်တင်များ"</string>
@@ -271,7 +271,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"ဆက်တင်များ"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ဆက်တင်အတိုကောက်"</string>
     <string name="activity_list_empty" msgid="6428823323471264836">"ကိုက်ညီမှုရှိသည့် လုပ်ဆောင်ချက်ကို မတွေ့ပါ။"</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"လေယာဉ်ပေါ်သုံးစနစ်"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"လေယာဉ်ပျံမုဒ်"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"နောက်ထပ်"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ကြိုးမဲ့နှင့် ကွန်ယက်များ"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi ၊ ဘလူးတုသ်၊ လေယာဉ်ပေါ်အသုံးပြုစနစ်၊ မိုဘိုင်းလ်ကွန်ရက်များနှင့် VPN များကို စီမံခန့်ခွဲရန်"</string>
@@ -296,7 +296,7 @@
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"ရက်စွဲ အချိန် အချိန်ဇုန်နှင့် ပုံစံများအား သတ်မှတ်ရန်"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"ရက်စွဲနှင့် အချိန်အားအလိုအလျောက်ထည့်ခြင်း"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"ကွန်ယက်မှပေးပို့သောအချိန်ကို အသုံးပြုမည်"</string>
-    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ကွန်ယက်မှပေးပို့သောအချိန်ကို အသုံးပြုမည်"</string>
+    <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"ကွန်ရက်က ဖော်ပြသောအချိန်ကို အသုံးပြုမည်"</string>
     <string name="zone_auto" msgid="334783869352026648">"အလိုအလျောက်အချိန်ဇုန်နယ်"</string>
     <string name="zone_auto_summaryOn" msgid="6142830927278458314">"ကွန်ရက်က ဖော်ပြသောအချိန်ကို အသုံးပြုမည်"</string>
     <string name="zone_auto_summaryOff" msgid="2597745783162041390">"ကွန်ရက်က ဖော်ပြသောအချိန်ကို အသုံးပြုမည်"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"အကောင့်များ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"တည်နေရာ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"အကောင့်များ"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"လုံခြုံရေးနှင့် တည်နေရာ"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"အသွင်ဝှက်ခြင်းနှင့် အထောက်အထားများ"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ဖုန်းကို အသွင်ဝှက်ထားသည်"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ဖုန်းကို အသွင်ဝှက်ထားသည်"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"လော့ခ်မျက်နှာပြင် စိတ်ကြိုက်ရွေးချယ်မှုများ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ကျွန်ုပ်၏တည်နေရာ စကရင်ကိုသော့ဖွင့်ခြင်း ဆင်းမ်ကဒ်သော့ချခြင်း ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့ကို သတ်မှတ်မည်"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ကျွန်ုပ်၏တည်နေရာ၊ စကရင်ပြန်ဖွင့်ခြင်း၊ ယုံကြည်စိတ်ချရသောသိုလှောင်ရာနေရာတို့အား သတ်မှတ်မည်"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ကန့်သတ်ရန် ဆက်တင်"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"စီမံခန့်ခွဲသူက ပိတ်ထားသည်"</string>
     <string name="security_status_title" msgid="5848766673665944640">"လုံခြုံရေး အခြေအနေ"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"လက်ဗွေရာများ စီမံရန်"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"လက်ဗွေရာအား သုံးရန်"</string>
@@ -367,7 +366,7 @@
     <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင်၊ အခိုးခံရလျှင် သို့မဟုတ် ရှင်းလင်းလိုက်လျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤတက်ဘလက်ကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤစက်ပစ္စည်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"စက်ပစ္စည်းကာကွယ်မှု ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"စက်ပစ္စည်းကာကွယ်ရန် ဝန်ဆောင်မှုများကို အသက်သွင်းမည် မဟုတ်ပါ။ ပျောက်ဆုံးသွားလျှင် သို့မဟုတ် အခိုးခံရလျှင် ဤဖုန်းကို အခြားသူများအသုံးပြုခြင်းမှ ကာကွယ်နိုင်မည် မဟုတ်ပါ။"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"မည်သို့ပင်ဖြစ်စေ ကျော်ပါ"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"နောက်သို့ သွားပါ"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"အာရုံခံကိရိယာ ရှာရန်"</string>
@@ -466,10 +465,10 @@
     <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="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>
@@ -480,7 +479,7 @@
     <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">"ဖုန်းမျက်နှာပြင်လော့ချမှုစလုပ်သည့်အခါ ပြင်ဆင်ရွေးချယ်ရေးနှင့်လုံခြံရေးတွင် သင့်လက်ဗွေဖြင့်လည်းလော့ချနိုင်သည်။"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"မျက်နှာပြင်သော့ပိတ်မည်"</string>
     <string name="unlock_disable_frp_warning_title" msgid="264008934468492550">"ကိရိယာအား ကာကွယ်မှုကို ဖယ်ရှားမလား။"</string>
@@ -570,7 +569,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"မလုပ်တော့"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"ရှေ့သို့"</string>
     <string name="lock_setup" msgid="3355847066343753943">"အစီအမံ ပြီးပါပြီ"</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"စက်ပစ္စည်း စီမံခန့်ခွဲသူအတွက် အက်ပ်များ"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"စက်စီမံခန့်ခွဲသည့် အက်ပ်များ"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"ပွင့်နေသည့်အက်ပ် မရှိပါ"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other">ဖွင့်ထားသည့်အက်ပ် <xliff:g id="COUNT_1">%d</xliff:g> ခု</item>
@@ -650,7 +649,7 @@
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ဆက်တင်များအားမှတ်မိစေရန်"</string>
     <string name="wifi_display_settings_title" msgid="8740852850033480136">"Cast"</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_no_devices_found" msgid="1382012407154143453">"အနီးတဝိုက်တွင် စက်ပစ္စည်းများ ရှာမတွေ့ပါ။"</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>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi စကင်ဖတ်ခြင်းကို ပိတ်ထားသောကြောင့် မရနိုင်ပါ"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"အားနည်းသော ချိတ်ဆက်မှုများကို ရှောင်ကြဉ်ရန်"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"ကောင်းမွန်သော အင်တာနက် ချိတ်ဆက်မှု မရှိသော ဝိုင်ဖိုင်ကွန်ရက်အား မသုံးပါနှင့်"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"အင်တာနက် ချိတ်ဆက်မှု ကောင်းသည့် ကွန်ရက်များကိုသာ အသုံးပြုရန်"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"ကြိုးမဲ့ကွန်ရက်ကို စီဖွဲ့ပါ"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC လိပ်စာ"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"အိုင်ပီလိပ်စာ"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet ကွင်းဆက်နံပါတ်"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 လိပ်စာများ"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"သိမ်းထား ကွန်ရက်များ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ဆက်တင်များ"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi အဆင့်မြှင့်ဆက်တင်များ ဤအသုံးပြုသူအတွက် မရပါ။"</string>
@@ -856,7 +854,7 @@
     <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">"ခရီးဆောင် Wi-Fi  ဟော့စပေါ့ မှားယွင်းချက်"</string>
-    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"ဝိုင်ဖိုင်ဟော့စပေါ့ စီမံသည်"</string>
+    <string name="wifi_tether_configure_ap_text" msgid="7974681394041609308">"Wi-Fi ဟော့စပေါ့ သတ်မှတ်ရန်"</string>
     <string name="wifi_hotspot_configure_ap_text" msgid="5478614731464220432">"ကြိုးမဲ့ ဟော့စပေါ့ စဖွင့်သတ်မှတ်ရန်"</string>
     <string name="wifi_hotspot_configure_ap_text_summary" msgid="5560680057727007011">"AndroidAP WPA2 PSK ဟော့စပေါ့"</string>
     <string name="wifi_tether_configure_subtext" msgid="2050196439900426456">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> <xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> ဟော့စပေါ့"</string>
@@ -954,7 +952,7 @@
     <string name="search_settings_summary" msgid="9205656546570654169">"ရှာဖွေခြင်းဆက်တင်နှင့် မှတ်တမ်းအား စီမံမည်"</string>
     <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="accelerometer_title" msgid="7854608399547349157">"မျက်နှာပြင်ကို အော်တိုလှည့်ရန်"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"ဖုန်းကိုလှည့်သည့်အခါတွင် အနေအထားအား အလိုအလျောက်ပြောင်းရန်"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်"</string>
@@ -1001,13 +999,13 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"နေထွက်ချိန်တွင် အလိုအလျောက်ပိတ်ပါမည်။"</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>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"နောက်ခံပုံပြောင်းပါ"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"သင့်မျက်နှာပြင်ကို မိမိစိတ်ကြိုက်ပြင်ပါ"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"နောက်ခံကို ဒီထဲမှာ ရွေးချယ်ရန်"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"နောက်ခံကို အောက်ပါတို့မှရွေးချယ်ရန်"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"ဖန်သားပြင်အသုံးပြုမှု ချွေတာမှုစနစ်"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"အားသွင်းနေစဉ် သို့မဟုတ် တပ်ဆင်ထားစဉ်"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"နှစ်မျိုးအနက် တမျိုးရွေးချယ်ရန်"</string>
@@ -1017,29 +1015,28 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ပိတ်ပါ"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ဖုန်းကို အထိုင်တွင် တပ်ဆင်လိုက်ချိန် နှင့်/သို့မဟုတ် အနားယူနေချိန်တွင် လုပ်ဆောင်မည့်အရာများကို ထိန်းချုပ်ရန်၊ ဖန်သားပြင်အသုံးပြုမှု ချွေတာမှုစနစ်ကို ဖွင့်ပါ။"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"စတင်ရန်အချိန်"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"လက်ရှိ ဖန်သားပြင်သုံးစွဲခြင်းချွေတာမှု စနစ်"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ယခုအချိန်မှစတင်ပါ"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ဆက်တင်များ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"အလိုအလျောက်အလင်းချိန်ခြင်း။"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"နှိုးပေးဖို့ မ’ယူရန်"</string>
-    <string name="doze_title" msgid="5389406335828323273">"အဝင်အကြောင်းကြားမှုမျက်နှာပြင်"</string>
+    <string name="doze_title" msgid="2259176504273878294">"ဝန်းကျင်ကို ပြကွက်"</string>
     <string name="doze_summary" msgid="3846219936142814032">"အကြောင်းကြားချက်များ သင်လက်ခံရရှိချိန်တွင် ဖန်သားပြင်ကို ဖွင့်ခိုင်းပါ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"စာလုံးအရွယ်အစား"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"စာလုံးကို ပိုကြီးအောင် သို့မဟုတ် ပိုသေးအောင်ပြုလုပ်ပါ"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"ဆင်းကဒ် သော့ချရန်ဆက်တင်များ"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"ဆင်းမ်ကဒ် လော့ခ်ဆက်တင်များ"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"ဆင်းမ်ကဒ် လော့ခ်"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"ပိတ်ထားသည်"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"လော့ခ်ချထားသည်"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"ဆင်းကဒ် သော့ချခြင်း"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"ဆင်းကဒ် သော့ချခြင်း"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"ဆင်းမ်ကဒ် လော့ခ်ချခြင်း"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"တက်ဘလက်ကိုအသုံးပြုရန် ပင်နံပါတ်လိုအပ်သည်"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ဖုန်းကိုအသုံးပြုရန် ပင်နံပါတ်လိုအပ်သည်"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"တက်ဘလက်ကိုအသုံးပြုရန် ပင်နံပါတ်လိုအပ်သည်"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"ဖုန်းကိုအသုံးပြုရန် ပင်နံပါတ်လိုအပ်သည်"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"ဆင်းကဒ် ပင်နံပါတ်ပြောင်းမည်"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"ဆင်းမ်ကဒ် ပင်နံပါတ်ပြောင်းရန်"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"ဆင်းကဒ် ပင်နံပါတ်"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"ဆင်းမ်ကဒ် သော့ချခြင်း"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"ဆင်းမ်ကဒ် လော့ခ်ချခြင်း"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"ဆင်းမ်ကဒ်ကို သော့ဖွင့်ရန်"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"ဆင်းကဒ် ပင်နံပါတ်အဟောင်း"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"ဆင်းကဒ် ပင်နံပါတ် အသစ်"</string>
@@ -1246,7 +1243,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>
@@ -1279,12 +1276,12 @@
     <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="4412694650600342973">"ပြန်လည်သတ်မှတ်ခြင်း"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"ကွန်ရက်ဆက်တင်များ ပြန်လည်သတ်မှတ်ရန်"</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_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>
@@ -1320,7 +1317,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"ရွေ့လျားနိုင်သောဟော့စပေါ့"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"ဘလူးတုသ်တဆင့်ပြန်ချိတ်ဆက်"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"တဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"ဟော့စပေါ့နှင့် မိုဘိုင်းကို မိုဒမ်အဖြစ် သုံးခြင်း"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"ဟော့စပေါ့နှင့် မိုဘိုင်းမိုဒမ်"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ဟော့စပေါ့ကို ဖွင့်ထားသည်။ မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ် အသုံးပြုနေသည်"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ဟော့စပေါ့ကို ဖွင့်ထားသည်"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"မိုဘိုင်းဖုန်းကို မိုဒမ်အဖြစ် အသုံးပြုခြင်း"</string>
@@ -1333,7 +1330,7 @@
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USBအား ချိတ်ဆက်မထားပါ"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"ဖွင့်ပေးရန် ချိတ်ဆက်ပါ"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USBမှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း အမှား"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ဘလူးတုသ်မှတဆင့်ပြန်လည်ချိတ်ဆက်ခြင်း"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"ဘလူးတုသ်ဖြင့်ကွန်ရက်ချိတ်ခြင်း"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"ဤတက်ဘလက်၏ အင်တာနက်ကို ဘလူးတုသ်မှတစ်ဆင့် မျှဝေပါသည်"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"ဤဖုန်း၏ အင်တာနက်ကို ဘလူးတုသ်မှတစ်ဆင့် မျှဝေပါသည်"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"ဤတက်ဘလက်၏အင်တာနက်ကို စက် ၁ ခုသို့ဘလူးတုသ်မှတစ်ဆင့်မျှဝေနေသည်"</string>
@@ -1350,7 +1347,7 @@
     <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="sms_application_title" msgid="4903928270533250448">"SMS အပ်ဖ်"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"SMS အက်ပ်"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"စာတိုပို့ရန် အက်ပ်ပြောင်းမလား။"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"သင့်စာတိုပို့ရန် အပလီကေးရှင်းအတွက် <xliff:g id="NEW_APP">%1$s</xliff:g> ကို <xliff:g id="CURRENT_APP">%2$s</xliff:g> အစား သုံးမည်လား?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> ကို သင်၏စာတိုပို့ရန် အပလီကေးရှင်းအဖြစ် သုံးမည်လား ?"</string>
@@ -1366,9 +1363,9 @@
     <string name="location_title" msgid="1029961368397484576">"ကျွန်ုပ်၏တည်နေရာ"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"အလုပ်ပရိုဖိုင်အတွက် တည်နေရာ"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"စနစ်"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"တိကျမှုအမြင့်ဆုံး"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"တိကျမှုမြင့်မားခြင်း"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ဘက်ထရီအသုံးပြုမှု ချွေတာရန်"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"စက်ပစ္စည်းသပ်သပ်သာ"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"စက်ပစ္စည်းသာလျှင်"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"တည်နေရာပိတ်ရန်"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"အက်ပ်အဆင့် ခွင့်ပြုချက်များ"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"လတ်တလောတည်နေရာ တောင်းခံမှုများ"</string>
@@ -1379,7 +1376,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"တည်နေရာပြစနစ်"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"တည်နေရာကို ဆုံးဖြတ်ရန် GPS၊ Wi-Fi၊ ဘလူးတုသ် သို့မဟုတ် မိုဘိုင်းကွန်ရက်များကို အသုံးပြုပါ"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"တည်နေရာကို ဆုံးဖြတ်ရန် Wi-Fi၊ ဘလူးတုသ် သို့မဟုတ် မိုဘိုင်းကွန်ရက်များကို အသုံးပြုပါ"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"တည်နေရာကို ဆုံးဖြတ်ရန် ဂျီပီအက်စ်ကို သုံးပါ။"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"တည်နေရာကို သိရှိရန် GPS ကို သုံးပါ။"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ကြည့်ရှုနေပါသည်"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi ရှာဖွေနေသည်"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"စနစ်၏ အက်ပ်များနှင့် ဝန်ဆောင်မှုများအား Wi-Fi စက်ပစ္စည်းများကို အချိန်မရွေး ရှာဖွေခွင့်ပေးခြင်းဖြင့် တည်နေရာရှာဖွေခြင်းကို ပို၍ကောင်းမွန်စေမည်။"</string>
@@ -1418,11 +1415,11 @@
     <string name="settings_manual_activity_unavailable" msgid="4752403782883814898">"လမ်းညွှန်ကို ဖတ်တင်ရန် ပြသနာရှိနေပါသည်"</string>
     <string name="settings_license_activity_title" msgid="8525014571806471216">"ပြင်ပကုမ္ပဏီလိုင်စင်များ"</string>
     <string name="settings_license_activity_unavailable" msgid="4210539215951487627">"လိုင်စင်များကို ဖတ်တင်ရန် ပြသနာရှိနေပါသည်"</string>
-    <string name="settings_license_activity_loading" msgid="3337535809093591740">"ဖွင့်နေစဉ်"</string>
+    <string name="settings_license_activity_loading" msgid="3337535809093591740">"ဖွင့်နေဆဲ…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"လုံခြုံမှုဆိုင်ရာအချက်အလက်များ"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"လုံခြုံမှုဆိုင်ရာအချက်အလက်များ"</string>
     <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"သင့်တွင်ဒေတာဆက်သွယ်မှုမရှိပါ။ ဤကြောင်းကြားချက်ကိုကြည့်ရန်အတွက် အင်တာနက်ဆက်သွယ်မှုရှိသည့် မည်သည့်ကွန်ပြုတာမှမဆို %sထံသွားပါ။"</string>
-    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ဖွင့်နေစဉ်"</string>
+    <string name="settings_safetylegal_activity_loading" msgid="8059022597639516348">"ဖွင့်နေဆဲ…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"သင့်စကားဝှက်ကိုရွေးချယ်ပါ"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"သင့်ပုံစံအား ရွေးပါ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"သင့်ပင်နံပါတ်အား ရွေးပါ"</string>
@@ -1556,7 +1553,7 @@
     <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>
+    <string name="no_applications" msgid="7336588977497084921">"အက်ပ် မရှိပါ။"</string>
     <string name="internal_storage" msgid="1584700623164275282">"စက်တွင်း သိုလှောင်ထားမှု"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"စက်အတွင်းသိမ်းဆည်းရန်နေရာ"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USBသိုလှောင်မှု"</string>
@@ -1599,8 +1596,8 @@
     <string name="invalid_location" msgid="4354595459063675191">"ထည့်သွင်းသည့်နေရာ မမှန်ကန်ပါ"</string>
     <string name="system_package" msgid="1352722848400644991">"ပြင်ပမီဒီယာတွင် စနစ်တိုးမြင့်ခြင်းအား မပြုလုပ်နိုင်ပါ"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"ပြင်ပမီဒီယာတွင် စက်ပစ္စည်းကို စီမံခန့်ခွဲရန်အက်ပ်ကို ထည့်သွင်း၍မရပါ"</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"မဖြစ်မနေ ရပ်ခိုင်းမည်လား?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"အကယ်၍အပ်ပလီကေးရှင်းအား မဖြစ်မနေရပ်ခိုင်းလျှင် အမှားအယွင်းဖြစ်နိုင်သည်"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"မဖြစ်မနေ ရပ်ခိုင်းမလား။"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"အကယ်၍ အက်ပ်အားမဖြစ်မနေရပ်ခိုင်းလျှင် အမှားအယွင်းဖြစ်နိုင်သည်။"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"အပ်ပလီကေးရှင်းရွေ့မရပါ <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"ပိုမိုလိုလားသောထည့်သွင်းမည့်နေရာ"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(တစ်ခါမှမသုံးပါ)"</string>
@@ -1634,7 +1632,7 @@
     <skip />
     <string name="running_process_item_user_label" msgid="3129887865552025943">"သုံးစွဲသူ၊ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="running_process_item_removed_user_label" msgid="8250168004291472959">"သုံးစွဲသူကိုဖယ်လိုက်သညိ"</string>
-    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
+    <string name="running_processes_item_description_s_s" msgid="5790575965282023145">"လုပ်ဆောင်မှု <xliff:g id="NUMPROCESS">%1$d</xliff:g> ခုနှင့် ဝန်ဆောင်မှု <xliff:g id="NUMSERVICES">%2$d</xliff:g> ခု"</string>
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> လုပ်ဆောင်ခြင်းနှင့် <xliff:g id="NUMSERVICES">%2$d</xliff:g> ဝန်ဆောင်မှုများ"</string>
@@ -1662,8 +1660,8 @@
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"စနစ်၏ဝန်ဆောင်မှုကို ရပ်ဆိုင်းမည်လား?"</string>
     <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"အကယ်၍ ဤဆားဗစ်ကိုရပ်ဆိုင်းလျှင် သင့်တက်ဘလက်ထဲမှတချို့လုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ကာ ပြန်လည်ဖွင့်သည့်အထိ အလုပ်လုပ်မည်မဟုတ်ပါ။"</string>
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"အကယ်၍ဤဝန်ဆောင်မှုကိုရပ်ဆိုင်းလျှင် သင့်ဖုန်း၏အချို့သောလုပ်ဆောင်ချက်များမှာ ပါဝါပိတ်ပြီး နောက်တခါပြန်လည်ဖွင့်သည့်အထိ ကောင်းစွာအလုပ်လုပ်မည်မဟုတ်ပါ"</string>
-    <string name="language_settings" msgid="8758655933029560944">"ဘာသာစကား &amp; ထည့်သွင်းစနစ်"</string>
-    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ဘာသာစကား &amp; ထည့်သွင်းစနစ်"</string>
+    <string name="language_settings" msgid="8758655933029560944">"ဘာသာစကားနှင့် ထည့်သွင်းမှုစနစ်"</string>
+    <string name="language_keyboard_settings_title" msgid="3709159207482544398">"ဘာသာစကားနှင့် ထည့်သွင်းမှုစနစ်"</string>
     <string name="input_assistance" msgid="7577795275222555487">"စာရိုက်ခြင်း အထောက်အကူပြုစနစ်"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"ကီးဘုတ်နှင့်ထည့်သွင်းရန်နည်းလမ်းများ"</string>
     <string name="phone_language" msgid="7116581601133118044">"ဘာသာစကားများ"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"ကီးဘုတ်ဖြတ်လမ်း အကူအညီ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ရနိုင်သည့် ဖြတ်လမ်းများကို ဖော်ပြပါ"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"မူရင်း"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"မောက်စ်နှင့် တို့ရွှေ့ပြင်"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"မြားရွေ့နှုန်း"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ဂိမ်းထိန်းချုပ်ခြင်း"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"တုန်ခါစက်ကိုသုံးရန်"</string>
@@ -1760,11 +1757,11 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"အများ သုံးစွဲနိုင်မှု ဆက်တင်များ"</string>
     <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_description" msgid="5679491180156408260">"သင့်လိုအပ်ချက်များနှင့် ကိုက်ညီမှုရှိစေရန် ဤစက်ပစ္စည်းကို သင့်စိတ်ကြိုက်ပြင်ဆင်နိုင်သည်။ သုံးရလွယ်သည့် ဤဝန်ဆောင်မှုများကို ဆက်တင်များထဲ၌ နောက်ပိုင်းတွင် ပြောင်းလဲနိုင်သည်။"</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>
-    <string name="interaction_control_category_title" msgid="7836591031872839151">"အပြန်အလှန်ဆက်သွယ်ခြင်း ထိန်းချုပ်မှုများ"</string>
+    <string name="interaction_control_category_title" msgid="7836591031872839151">"အပြန်အလှန်ဆက်သွယ်ချက် ထိန်းချုပ်မှုများ"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"ဒေါင်းလုဒ်လုပ်ထားသည့် ဝန်ဆောင်မှုများ"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"စမ်းသပ်ဆဲ"</string>
     <string name="talkback_title" msgid="7912059827205988080">"Talkback"</string>
@@ -1778,30 +1775,30 @@
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"မျက်နှာပြင် ဇူးမ်ဆွဲပါ"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"ဇူးမ်အသုံးပြုရန် ၃ ကြိမ်တို့ပါ"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"ဇူးမ်အသုံးပြုရန် ခလုတ်ကို တို့ပါ"</string>
-    <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_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="6752037184140789970">"အများသုံးစွဲနိုင်မှု ဖြတ်လမ်း"</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_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>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ဖွင့်ပိတ်ခလုတ်နှိပ်လျှင် ဖုန်းပြောရပ်ရန်"</string>
-    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"အကြီးစားမောက်စ်ညွှန်ပြပုံ"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"ဖွင့်ပိတ်ခလုတ်ဖြင့် ဖုန်းချရန်"</string>
+    <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"မောက်စ်သင်္ကေတအကြီးစား"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"မိုနိုအသံ"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"အသံဖွင့်နေစဉ် ချန်နယ်များကိုပေါင်းပါ"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ထိနှိပ်မှုနှင့် ဖိနှိပ်မှုကွာချိန်"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"ထိထားရန် လိုအပ်ချိန်"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"အရောင်​ပြောင်းပြန်"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"စွမ်းဆောင်ရည် ကျစေနိုင်ပါသည်"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"ညွှန်တံ ရပ်သွားသည့် နောက်မှာ ကလစ်ပါ"</string>
-    <string name="accessibility_autoclick_delay_preference_title" msgid="3962261178385106006">"မကလစ်မီ စောင့်ချိန်"</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>
-    <string name="daltonizer_type" msgid="1124178250809091080">"အမှန်ပြင်သည့်နည်းလမ်း"</string>
+    <string name="daltonizer_type" msgid="1124178250809091080">"ပြင်ဆင်ရန်နည်းလမ်း"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
       <item quantity="other">အလွန်တိုတောင်းသည့် နှောင့်နှေးမှု (<xliff:g id="CLICK_DELAY_LABEL_1">%1$d</xliff:g> ms)</item>
       <item quantity="one">အလွန်တိုတောင်းသည့် နှောင့်နှေးမှု (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
@@ -1823,13 +1820,13 @@
       <item quantity="one">အလွန်ရှည်လျားသည့် နှောင့်နှေးမှု (<xliff:g id="CLICK_DELAY_LABEL_0">%1$d</xliff:g> ms)</item>
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"ဆက်တင်များ"</string>
-    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ပွင့်"</string>
+    <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ပွင့်နေသည်"</string>
     <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ပိတ်"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"အစမ်းကြည့်ရှုရန်"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"ပုံမှန်ရွေးချယ်စရာများ"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"ဘာသာစကား"</string>
     <string name="captioning_text_size" msgid="6737002449104466028">"စာလုံးအရွယ်အစား"</string>
-    <string name="captioning_preset" msgid="8939737196538429044">"စာတမ်းစတိုင်လ်"</string>
+    <string name="captioning_preset" msgid="8939737196538429044">"စာတန်းပုံစံ"</string>
     <string name="captioning_custom_options_title" msgid="5067500939930322405">"စိတ်ကြိုက်ရွေးချယ်စရာများ"</string>
     <string name="captioning_background_color" msgid="9053011212948992570">"နောက်ခံအရောင်"</string>
     <string name="captioning_background_opacity" msgid="6029993616419971202">"နောက်ခံ အလင်းအား"</string>
@@ -1855,8 +1852,8 @@
     <string name="color_cyan" msgid="7033027180641173211">"စိမ်းပြာ"</string>
     <string name="color_yellow" msgid="9112680561610873529">"အဝါ"</string>
     <string name="color_magenta" msgid="5059212823607815549">"ပန်းခရမ်း"</string>
-    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g>ကိုသုံးမည်လား?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> လိုအပ်သည်မှာ :"</string>
+    <string name="enable_service_title" msgid="3061307612673835592">"<xliff:g id="SERVICE">%1$s</xliff:g> ကို သုံးမလား။"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> ကလုပ်ဆောင်ရန်များ-"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"အပလီကေးရှင်းသည် ခွင့်ပြုချက်တောင်းခံမှုကို ပိတ်လိုက်ခြင်းကြောင့်၊ သင့်တုန့်ပြန်မှုကို အချိန်ညှိချက်များ အတည်မပြုနိုင်ပါ။"</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"သင် ဖွင့်လိုက်လျှင် <xliff:g id="SERVICE">%1$s</xliff:g>၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"သင်က ရယူသုံးစွဲရန် ဝန်ဆောင်မှုကို ဖွင့်ထား၍ ၊ သင့်ကိရိယာက သင်၏ မျက်နှာပြင် သော့ပိတ်မှုကို ဒေတာ လျှို့ဝှက်ကုဒ်သွင်းမှု မြှင့်တင်ရန် သုံးမည် မဟုတ်ပါ။"</string>
@@ -1864,31 +1861,31 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် PIN ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>အား ဖွင့်ခြင်းသည် ဒေတာများ လျှို့ဝှက်ကုဒ်အသွင်​​ပြောင်းခြင်းအား အကျိုးသက်ရောက်စေသော​ကြောင့်၊ သင့် လျှို့ဝှက်ကုဒ်ဖြင့် အတည်ပြုရန် လိုသည်။"</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"သင့်လှုပ်ရှားမှုများကို စောင့်ကြည့်လေ့လာရန်"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"အပလီကေးရှင်းတစ်ခုနှင့် သင်နှင့်အပြန်အလှန် ဆက်သွယ်နေချိန် အကြောင်းကြားချက်များကို လက်ခံရန်။"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"သင်နှင့် အက်ပ်တစ်ခုတို့ အပြန်အလှန် ဆက်သွယ်နေချိန်တွင် အကြောင်းကြားချက်များကို လက်ခံရရှိသည်။"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> ကိုရပ်မည်လား?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"အိုကေကို တို့ခြင်းဖြင့် <xliff:g id="SERVICE">%1$s</xliff:g> ရပ်တန့်သွားပါလိမ့်မည်။"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"မည်သည့်ဆားဗစ်မှမရှိပါ"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"မည်သည့် ဝန်ဆောင်မှုကိုမျှ ရွေးမထားပါ"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"မည်သည့်အကြောင်းအရာမှမရှိပါ"</string>
     <string name="settings_button" msgid="3006713718908152930">"ဆက်တင်များ"</string>
-    <string name="print_settings" msgid="4742428530112487843">"ပရင့်ထုတ်‌ခြင်း"</string>
+    <string name="print_settings" msgid="4742428530112487843">"ပုံနှိပ်ခြင်း"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"ပိတ်ထားသည်"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
       <item quantity="other">ပုံနှိပ်ဝန်ဆောင်မှု <xliff:g id="COUNT">%1$d</xliff:g> ခုကို ဖွင့်ထားသည်</item>
       <item quantity="one">ပုံနှိပ်ဝန်ဆောင်မှု ၁ ခုကို ဖွင့်ထားသည်</item>
     </plurals>
-    <string name="print_settings_title" msgid="3685449667822217816">"ပရင့်ထုတ် ဆားဗစ်များ"</string>
+    <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_menu_item_settings" msgid="6591330373682227082">"ဆက်တင်များ"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"ပရင်တာများထည့်ရန်"</string>
-    <string name="print_feature_state_on" msgid="8098901852502441048">"ပွင့်"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"ပွင့်နေသည်"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"ပိတ်"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"ဆားဗစ် အသစ်ထည့်ရန်"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"ပရင်တာ ထည့်ရန်"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"ရှာဖွေခြင်း"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"စာထုတ်စက်များကို ရှာနေပါသည်"</string>
-    <string name="print_service_disabled" msgid="7739452396114245222">"ဆားဗစ်များ အသုံးမပြုနိုင်အောင် ပိတ်ထားသည်"</string>
+    <string name="print_service_disabled" msgid="7739452396114245222">"ဝန်ဆောင်မှု ပိတ်ထားသည်"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"စာထုတ်အလုပ်များ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"စာထုတ်အလုပ်"</string>
     <string name="print_restart" msgid="8373999687329384202">"အစက ပြန်စရန်"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"အားအပြည့်သွင်းကတည်းက မျက်နှာပြင်သုံးမှု"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"မျက်နှာပြင် သုံးစွဲမှု"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"မိုဘိုင်းကွန်ရက် ရှာဖွေခြင်း"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"ပြီးခဲ့သည့် <xliff:g id="TIME">%1$s</xliff:g> က"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"အားအပြည့်သွင်းပြီးသည့် အချိန်မှစ၍ (ပြီးခဲ့သည့် <xliff:g id="TIME">%1$s</xliff:g> က)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"အားဖြည့်ပြီးချိန်မှစ၍ (ပြီးခဲ့သည့် <xliff:g id="TIME">^1</xliff:g> က)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"အားအပြည့်သွင်းပြီးသည့် အချိန်မှစ၍ မျက်နှာပြင်ကို ဖွင့်ထားသောအချိန်"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"အားအပြည့်သွင်းထားသည့် အချိန်မှစ၍ စက်ပစ္စည်း အသုံးပြုမှု"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"အားသွင်းကြိုးဖြုတ်စဉ်မှဘတ္တရီအသုံးပြုနှုန်း"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"ကင်မရာ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ဘလူးတုသ်"</string>
-    <string name="power_cell" msgid="6596471490976003056">"ဖုန်းအရန်သင့်အခြေအနေ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"မိုဘိုင်းကွန်ရက်သည် အသင့်အနေအထားတွင် ရှိနေပါသည်"</string>
     <string name="power_phone" msgid="5392641106474567277">"အသံဖြင့်ခေါ်ဆိုမှုများ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"တက်ဘလက်အားမသုံးသည့်အခါ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ဖုန်းအားမသုံးသည့်အခါ"</string>
@@ -2007,17 +2004,17 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ဘက်ထရီ သုံးစွဲမှုမှာ ပါဝါ အသုံးပြုမှုကို ခန့်မှန်းမှု တစ်ခုသာ ဖြစ်ပြိး ဘက်ထရီ အားကုန်ရခြင်း ရင်းမြစ်တိုင်းကို ထည့်မတွက်ပါ။ အမျိုမျိုးသုံးမှုမှာ တွက်ချက်ထားသည့် ခန့်မှန်းခြေ ပါဝါ သုံးစွဲမှု နှင့် ဘက်ထရီ ထဲမှာ တွေ့မြင်ရသည့် လက်တွေ့ အားကုန်မှုတို့၏ ခြားနားချက် ဖြစ်သည်။"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"အပိုရေတွက်မှု စွမ်းရည် အသုံးပြုမှု"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s ကြာ သုံးထားသည်"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<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_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_detail_foreground" msgid="3350401514602032183">"အသုံးပြုနေစဉ်"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"နောက်ခံတွင် ဖွင့်ထားစဉ်"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"ဘက်ထရီ အသုံးပြုမှု"</string>
-    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"စုစုပေါင်း အက်ပ်အသုံးပြုမှု၏<xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
-    <string name="battery_detail_info_title" msgid="8227822131405620369">"အားအပြည့်သွင်းထားသည့် အချိန်ကတည်းက"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"စုစုပေါင်း အက်ပ်အသုံးပြုမှု၏ <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"အားဖြည့်ပြီးချိန်ကတည်းက"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"ဘက်ထရီအသုံးပြုမှုကို စီမံခန့်ခွဲရန်"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"ခန့်မှန်း ကျန်ရှိချိန်"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"အားပြည့်ရန် လိုအပ်ချိန်"</string>
@@ -2029,7 +2026,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android စနစ်"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"မီဒီယာဆာဗာ"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"အက်ပ်ပိုမိုကောင်းအောင်ပြုခြင်း"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"ဘက်ထရီ ချွေတာသူ"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"ဘက်ထရီ ချွေတာခြင်း"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"အလိုအလျောက် ဖွင့်ရန်"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ဘယ်တော့မှ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"ဘတ်ထရီ <xliff:g id="PERCENT">%1$s</xliff:g> ၌"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"အသံ ထည့်သွင်းခြင်းနှင့် ထုတ်လွှင့်ခြင်းဆက်တင်များ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"အသံဖြင့် ရှာဖွေခြင်း"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Androidလက်ကွက်"</string>
-    <string name="voice_category" msgid="1430370497125803904">"စကားပြော"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"အသံဖြင့် ထည့်သွင်းရေး ဆက်တင်များ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"အသံဖြင့် စာရိုက်ထည့်ခြင်း"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"အသံဖြင့် ထည့်သွင်းရေး ဝန်ဆောင်မှုများ"</string>
@@ -2096,13 +2092,13 @@
     <string name="tts_install_voices_text" msgid="5292606786380069134">"အသံများထည့်သွင်းရန် <xliff:g id="TTS_APP_NAME">%s</xliff:g> အက်ပ်သို့ ရှေ့ဆက်ပါ"</string>
     <string name="tts_install_voices_open" msgid="667467793360277465">"အက်ပ်ကို ဖွင့်ရန်"</string>
     <string name="tts_install_voices_cancel" msgid="4711492804851107459">"မလုပ်တော့"</string>
-    <string name="tts_reset" msgid="2661752909256313270">"ပြင်ဆင်သတ်မှတ်ရန်"</string>
+    <string name="tts_reset" msgid="2661752909256313270">"ပြန်သတ်မှတ်ရန်"</string>
     <string name="tts_play" msgid="2628469503798633884">"ဖွင့်ရန်"</string>
     <string name="gadget_title" msgid="5519037532720577836">"ဖွင့်ပိတ်ထိန်းချုပ်မှု"</string>
     <string name="gadget_toggle_wifi" msgid="319262861956544493">"ဝိုင်ဖိုင်ဆက်တင်းများကို နောက်ဆုံးအခြေရောက်အောင်လုပ်သည်"</string>
     <string name="gadget_toggle_bluetooth" msgid="7538903239807020826">"ဘလူးတုသ်ဆက်တင်ကို တိုးမြင့်မှု"</string>
     <string name="gadget_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_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>
@@ -2169,7 +2165,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"ဤစက်ပစ္စည်းကို စီမံခန့်ခွဲရန်အက်ပ်ကို ပိတ်ရန်"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"အက်ပ်ကို ဖယ်ရှားပါ"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"ပိတ်ပြီး ဖယ်ရှားရန်"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"စက်ပစ္စည်းကို စီမံခန့်ခွဲရန်အတွက် အက်ပ်များ"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"စက်စီမံခန့်ခွဲသည့် အက်ပ်များ"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"စက်ပစ္စည်းကို စီမံခန့်ခွဲရန်အတွက် အက်ပ်များ မရနိုင်ပါ"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ကိုယ်ရေး"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"အလုပ်"</string>
@@ -2196,7 +2192,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"ဆက်သွယ်မှု  မရှိပါ"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"ကွန်ယက်ထပ်ထည့်ရန်"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"ပြန်လည်ဆန်းသစ်ရန် စာရင်း"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"ကျော်"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"ကျော်ရန်"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"ရှေ့သို့"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"နောက်သို့"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"ကွန်ရက်၏အသေးစိတ်"</string>
@@ -2338,16 +2334,16 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"ဒေတာများကို အလိုလျောက်တူအောင်လုပ်ခြင်းကို ဖွင့်မည်လား?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"သင်က ဝဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်တက်ဘလက်ထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့  အကောင့်များသည် သင်က သင့်တက်ဘလက်သို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"သင်က ဝဘ် ပေါ်က သင်၏ အကောင့်ထဲ ပြုလုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို သင့်ဖုန်းထံသို့ အလိုအလျောက် ကူပေးမည်။ \n\nအချို့ အကောင့်များသည် သင်က ဖုန်းသို့ ပြုလုပ်လိုပ်သည့် အပြောင်းအလဲ မှန်သမျှကို ဝဘ်ဆီသို့ အလိုအလျောက် ကူးပေးနိုင်ပါသေးသည်။ Google အကောင့် ထိုသို့ အလုပ်လုပ်ပါသည်။"</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ဒေတာများကို အလိုလျောက်တူအောင်လုပ်ခြင်းကို ပိတ်မည်လား?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"၎င်းသည် အချက်အလက်နှင့် ဘက်ထရီအသုံးပြုမှုကို ထိန်းသိမ်းစောင့်ရှောက်ပေးလိမ့်မည်၊ သို့သော် လတ်တလောသတင်းအချက်အလက်များကို စုဆောင်းရန် သင်ကိုယ်တိုင် အကောင့်တခုခြင်းကို ထပ်တူညီအောင်လုပ်ရန် လိုအပ်လိမ့်မည်။ အဆင့်မြှင့်မှုများ ထွက်ပေါ်ပါက အကြောင်းကြားချက်များ သင်လက်ခံနိင်မည်မဟုတ်ပါ။"</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"ဒေတာအသုံးပြုခြင်း လည်ပတ်မှုအား အစမှပြန်လည်စတင်စေရန်"</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"ဒေတာ အော်တိုစင့်ခ် ပိတ်မလား။"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"၎င်းသည် ဒေတာနှင့် ဘက်ထရီအသုံးပြုမှုကို လျှော့ချပေးမည်၊ သို့သော် လတ်တလောအချက်အလက်များကို ရယူရန် သင်ကိုယ်တိုင် အကောင့်တစ်ခုချင်းကို စင့်ခ်လုပ်ရမည်။ အပ်ဒိတ်များထွက်သည့် အကြောင်းကြားချက်များကိုမူ သင်လက်ခံရရှိတော့မည်မဟုတ်ပါ။"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"ဒေတာသုံးမှတ်တမ်းကို ပြန်စရန်"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"လစဥ်၏ ရက်စွဲ"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"အတည်ပြုရန်"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"ဒေတာအသုံးပြုမှုသတိပေးချက်အား သတ်မှတ်ရန်"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"ဒေတာအသုံးပြုမှုကန့်သတ်ချက်အား သတ်မှတ်ရန်"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"ဒေတာအသုံးပြုမှုအား ကန့်သတ်ခြင်း"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"သင်သတ်မှတ်ထားသည့် ကန့်သတ်ချက်ပြည့်သည်နှင့် သင့်တက်ဘလက်သည် မိုဘိုင်းဒေတာကို ပိတ်သွားပါမည်။\n\nဒေတာသုံးစွဲမှုကို သင်၏တက်ဘလက်က တိုင်းတာခြင်း ဖြစ်ပြီး ဖုန်းလိုင်းဝန်ဆောင်မှုပေးသူ၏ တွက်ချက်မှုနှင့် ကွာခြားနိုင်သောကြောင့် ကန့်သတ်ချက်ကို မယုတ်မလွန် သတ်မှတ်ပါ။"</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"သင်သတ်မှတ်ထားသည့် ကန့်သတ်ချက်ပြည့်သည်နှင့် သင့်ဖုန်းသည် မိုဘိုင်းဒေတာကို ပိတ်သွားပါမည်။\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>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"နောက်ခံတွင် မိုဘိုင်းဒေတာ အသုံးပြုမှုကို ကန့်သတ်လိုက်လျှင် Wi-Fi သို့ မချိတ်ဆက်မချင်း အချို့အက်ပ်နှင့် ဝန်ဆောင်မှုများသည် အလုပ်လုပ်မည် မဟုတ်ပါ။"</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"နောက်ခံတွင် မိုဘိုင်းဒေတာ အသုံးပြုမှုကို ကန့်သတ်လိုက်လျှင် Wi-Fi သို့ မချိတ်ဆက်မချင်း အချို့အက်ပ်နှင့် ဝန်ဆောင်မှုများသည် အလုပ်လုပ်မည် မဟုတ်ပါ။\n\nဤဆက်တင်သည် ဤတက်ဘလက်ထဲရှိ အသုံးပြုသူအားလုံးအပေါ် သက်ရောက်မှု ရှိပါသည်။"</string>
@@ -2450,9 +2446,9 @@
     <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="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="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"အရန်သိမ်းဆည်းမှုအတွက် သင်၏စကားဝှက်အသစ် အပြည့်အစုံကို ပြန်ရေးပါ။"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"အရန်သိမ်းဆည်းခြင်းအတွက် စကားဝှက်သတ်မှတ်ရန်"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"မလုပ်တော့"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"ဖြည့်စွက် စနစ်တိုးမြင့်မှုများ"</string>
@@ -2497,7 +2493,7 @@
     <string name="user_add_profile_item_summary" msgid="5931663986889138941">"သင့်အကောင့်မှ အပလီကေးရှင်းများ နှင့် ပါရှိချက်များ ရယူသုံးစွဲခွင့်ကို သင်ကန့်သတ်ထိန်းချုပ်နိုင်သည်။"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"သုံးစွဲသူ"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"ကန့်သတ်ထားသော ကိုယ်ရေးအချက်အလက်များ"</string>
-    <string name="user_add_user_title" msgid="2108112641783146007">"အသုံးပြုသူ အသစ်ကို ထည့်ရမလား?"</string>
+    <string name="user_add_user_title" msgid="2108112641783146007">"အသုံးပြုသူအသစ် ထည့်မလား။"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"သင်သည် ဒီကိရိယာကို ဖြည့်စွက် အသုံးပြုသူများကို ဖန်တီးပေးလျက် မျှဝေပေးနိုင်သည်။ အသုံးပြုသူတိုင်းဆီမှာ ၎င်း၏ ကိုယ်ပိုင် နေရာ ရှိမည် ဖြစ်ရာ သူတို့သည် ကိုယ်ပိုင် အက်ပ်များ၊ နောက်ခံပုံ၊ စသဖြင့် မိမိစိတ်ကြိုက် ပြုလုပ်နိုင်ကြမည်။ ထို့အပြင် အသုံးပြုသူတို့သည် လူတိုင်းအပေါ် အကျိုးသက်ရောက်နိုင်သည့် ကြိုးမဲ့လို ကိရိယာ ဆက်တင်များကိုပါ ညှိနှိုင်းနိုင်ကြသည်။\n\nသင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် အက်ပ်များကို အပ်ဒိတ်လုပ်ပေးနိုင်သည်။"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"သင်က အသုံးပြုသူ အသစ် တစ်ဦးကို ထည့်ပေးလိုက်လျှင်၊ ထိုသူသည် ၎င်း၏ နေရာကို သတ်မှတ်စီစဉ်ရန် လိုအပ်မည်။\n\n အသုံးပြုသူ မည်သူမဆို ကျန်အသုံးပြုသူ အားလုံးတို့အတွက် အက်ပ်များကို အပ်ဒိတ်လုပ်ပေးနိုင်သည်။"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"အသုံးပြုသူကို ယခုသတ်မှတ်မလား။"</string>
@@ -2531,7 +2527,7 @@
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"ဒီချိတ်ဆက်မှု ထဲက အက်ပ်များ အားလုံး နှင့် ဒေတာကို ဖျက်ပစ်မည်။"</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"ဖယ်ထုတ်ပါ"</string>
     <string name="user_enable_calling" msgid="5128605672081602348">"ဖုန်းခေါ်ဆိုမှုများ ဖွင့်မည်"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ဖုန်းခေါ်ဆိုမှုများ &amp; SMS ဖွင့်မည်"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"ဖုန်းခေါ်ဆိုမှုနှင့် SMS ဖွင့်မည်"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"အသုံးပြုသူကို ဖယ်ရှားမည်"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"ဖုန်းခေါ်ဆိုမှုများ ဖွင့်မည်လား။"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"ခေါ်ဆိုမှုမှတ်တမ်းကို ဤအသုံးပြုသူနှင့် မျှဝေမည်။"</string>
@@ -2548,13 +2544,13 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"တို့ထိပေးစနစ်"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"အဲဒါ အလုပ် လုပ်ပုံ"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"စတိုးဆိုင်များတွင် သင်၏ ဖုန်းဖြင့် ငွေပေးချေပါ"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"အလိုအလျောက် ငွေချေမှု"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"ငွေချေရန် မူရင်းသတ်မှတ်ခြင်း"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"မသတ်မှတ်ထားပါ"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
-    <string name="nfc_payment_use_default" msgid="3234730182120288495">"ပုံသေကို အသုံးပြုရန်"</string>
+    <string name="nfc_payment_use_default" msgid="3234730182120288495">"မူရင်းသတ်မှတ်ချက် သုံးရန်"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"အမြဲတမ်း"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"အခြား ငွေပေးချေရေး အက်ပ်ပွင့်နေချိန်မှ လွဲပြီး"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"ထိတွေ့ &amp; ပေးချေရန်နေရာတွင်၊ ဖော်ပြထားသောအရာဖြင့် ပေးပါ-"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"တို့ထိပြီးပေးရန် နေရာတွင် အောက်ပါနည်းဖြင့် ပေးပါ-"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"မှတ်တိုင်တွင် ငွေချေခြင်း"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"ငွေပေးချေရေး အက်ပ်ကို သတ်မှတ်ပေးပါ။ ၎င်းနောက်မှာ သင့်ဖုန်း၏ နောက်ကျောကို ချိတ်ဆက်ရန် မလိုသည့် သင်္ကေတ ပါရှိသော တာမီနယ် တခုခုဆီသို့ ကပ်ပေးလိုက်ရုံပါပဲ။"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"ရပါပြီ"</string>
@@ -2658,9 +2654,9 @@
     </plurals>
     <string name="network_dashboard_title" msgid="4771589228992391573">"ကွန်ရက်နှင့် အင်တာနက်"</string>
     <string name="network_dashboard_summary" msgid="3274556191585905652">"Wi-Fi၊ မိုဘိုင်း၊ ဒေတာအသုံးပြုမှု၊ ဟော့စပေါ့"</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="app_and_notification_dashboard_title" msgid="7838365599185397539">"အက်ပ်များနှင့် အကြောင်းကြားချက်များ"</string>
+    <string name="app_and_notification_dashboard_title" msgid="7838365599185397539">"အက်ပ်နှင့် အကြောင်းကြားချက်များ"</string>
     <string name="app_and_notification_dashboard_summary" msgid="2363314178802548682">"ခွင့်ပြုချက်များ၊ မူရင်းအက်ပ်များ"</string>
     <string name="account_dashboard_title" msgid="4936890821712178853">"အသုံးပြုသူနှင့် အကောင့်များ"</string>
     <string name="app_default_dashboard_title" msgid="7342549305933047317">"မူရင်းအက်ပ်များ"</string>
@@ -2725,12 +2721,14 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"ဖုန်းမြည်သံကို တုန်ခါမှုအဖြစ် သတ်မှတ်ထားပါသည်"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"ဖုန်းမြည်သံကို အသံပိတ်ထားပါသည်"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"ဖုန်းမြည်သံ အတိုးအကျယ် ၈၀% ဖြစ်သည်"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"မီဒီယာ ပမာဏ"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"နှိုးစက် အသံ ပမာဏ"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"မီဒီယာ အသံအတိုးအကျယ်"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"နှိုးစက်အသံ အတိုးအကျယ်"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"ဖုန်းမြည်သံ ပမာဏ"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"အကြောင်းကြားချက်သံ ပမာဏ"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"ဖုန်းဝင်တီးလုံး"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"ဖုန်းမြည်သံ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"မူရင်းအကြောင်းကြားသံ"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"အက်ပ်ကပံ့ပိုးပေးသော အသံ"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"မူရင်းအကြောင်းကြားသံ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"မူရင်းနှိုးစက်သံ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ဖုန်းဝင်လျှင် တုန်ခါရန်"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"အခြားအသံများ"</string>
@@ -2747,12 +2745,12 @@
     <string name="emergency_tone_alert" msgid="8941852695428130667">"သတိပေးချက်"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"တုန်ခါရန်"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"အသံများ ဖွင့်ထားပါ"</string>
-    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"မည်သည့် အလိုအလျောက်စည်းမျဉ်းမျှ ဖွင့်မထားပါ"</string>
+    <string name="zen_mode_settings_summary_off" msgid="1857165567766351925">"အော်တိုစည်းမျဉ်းများ ဖွင့်မထားပါ"</string>
     <plurals name="zen_mode_settings_summary_on" formatted="false" msgid="1216562765753405784">
       <item quantity="other">အလိုအလျောက် စည်းမျဉ်း <xliff:g id="ON_COUNT">%d</xliff:g> ခုကို ဖွင့်ထားသည်</item>
       <item quantity="one">အလိုအလျောက် စည်းမျဉ်း ၁ ခုကို ဖွင့်ထားသည်</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"မနှောင့်ယှက်ရ စိတ်ကြိုက်ရွေးချယ်မှုများ"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"မနှောင့်ယှက်ရ ရွေးချယ်မှု"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"ဦးစားပေးများသာ ခွင့်ပြုရန်"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"အလိုအလျောက်စည်းမျဉ်းများ"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"မနှောင့်ယှက်ရ စည်းမျဉ်းထည့်ရန်"</string>
@@ -2761,12 +2759,12 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"နှိုးစက်များသာ"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"လုံးဝ တိတ်ဆိတ်ခြင်း"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"မြင်ကွင်းအနှောင့်အယှက်များကို ပိတ်ဆို့ပါ"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"မြင်ကွင်းပိတ်ခြင်းမှတားဆီးပါ"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"အလုပ်ပရိုဖိုင်ဆိုင်ရာ အသံများ"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"ကိုယ်ရေးပရိုဖိုင်အသံကို သုံးပါ"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"အသံများသည် အလုပ်နှင့် ကိုယ်ပိုင်ပရိုဖိုင်များအတွက် အတူတူပင် ဖြစ်သည်"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"အလုပ်ဖုန်းမြည်သံ"</string>
-    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"မူရင်းအလုပ် အကြောင်းကြားချက်အသံ"</string>
+    <string name="work_notification_ringtone_title" msgid="6081247402404510004">"မူရင်း အလုပ်အကြောင်းကြားသံ"</string>
     <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"မူရင်းအလုပ် နှိုးစက်အသံ"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"ကိုယ်ရေးကိုယ်တာပရိုဖိုင်အတိုင်းထားပါ"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"အသံကို အစားထိုးလိုပါသလား။"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"အကြောင်းကြားချက်များကို ဘယ်တော့မှ မပြပါနှင့်"</string>
@@ -2799,20 +2798,20 @@
     <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_min_summary" msgid="8233873580287975662">"အရေးမကြီး − မည်သည့်အသံ သို့မဟုတ် ရုပ်ပုံကိုမျှ ကြားဖြတ်ဖွင့်ခြင်း မရှိပါ"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"အသင့်အတင့်အရေးကြီး − အသံမပါ"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"အရေးကြီး − အသံမည်ပါစေ"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"အလွန်အရေးကြီး − အသံမည်ပြီး မျက်နှာပြင်ပေါ်တွင်လည်း ဖွင့်ပြပါ"</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="6585849855452076626">"အသံကို ခွင့်ပြုရန်"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"အသံပြုခြင်း၊ တုန်ခါခြင်း၊ သို့မဟုတ် လက်ရှိမျက်နှာပြင်တွင် ဤသတိပေးချက်များကို ပြခြင်းများ မပြုလုပ်ပါနှင့်။"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"သတိပေးချက် အကူအညီ"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"အကြောင်းကြားချက်ကို ဖွင့်သုံးခြင်း"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"အကြောင်းကြားချက် ရယူခြင်း"</string>
     <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"အကြောင်းကြားချက်များကို အပလီကေးရှင်းများက မဖတ်နိုင်ပါ။"</string>
     <plurals name="manage_notification_access_summary_nonzero" formatted="false" msgid="7930130030691218387">
       <item quantity="other">app %d ခုသည် သတိပေးချက်များကို ဖတ်နိုင်သည်</item>
       <item quantity="one">app %d ခုသည် သတိပေးချက်များကို ဖတ်နိုင်သည်</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"မည်သည့် ထည့်သွင်းထားသည့် အပ်ဖ်မှ အသိပေးချက်အသုံးပြုရန် မတောင်းဆိုထားပါ။"</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"ထည့်သွင်းထားသည့်အက်ပ်များသည် အကြောင်းကြားချက်ရယူရန် တောင်းဆိုထားခြင်းမရှိပါ။"</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g>အတွက် အသိပေးချက်ကို အသုံးပြုခွင့်ပေးမလား?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> သည် အဆက်အသွယ် အမည်များနှင့် သင်လက်ခံရရှိသည့် မက်ဆေ့ဂျ်များကဲ့သို့ ကိုယ်ရေးကိုယ်တာ အချက်အလက်များ အပါအဝင် အကြောင်းကြားချက်များ အားလုံးကို ဖတ်နိုင်ပါလိမ့်မည်။ ၎င်းသည် အကြောင်းကြားချက်များကို ပယ်နိုင်ပြီး ယင်းအကြောင်းကြားချက်တွင် ပါဝင်သည့် လုပ်ဆောင်ချက်ခလုတ်များကိုလည်း နှိပ်နိုင်ပါသည်။ \n\n၎င်းသည် အက်ပ်ကို Do Not Disturb အား ဖွင့်နိုင်ပိတ်နိုင် ပြုလုပ်စေနိုင်ပြီး အခြားဆက်စပ်ဆက်တင်များကိုလည်း ပြောင်းလဲနိုင်စွမ်းရှိစေပါသည်။"</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> အတွက်အကြောင်းကြားချက် အသုံးပြုခွင့်ကို ပိတ်လိုက်လျှင်၊ Do Not Disturb ကိုအသုံးပြုခွင့်လည်း ပိတ်လိုက်ပါမည်။"</string>
@@ -2833,9 +2832,11 @@
     <string name="picture_in_picture_app_detail_summary" msgid="7942592478427522244">"အက်ပ်ပွင့်နေစဉ် သို့မဟုတ် သင်ထွက်လိုက်ချိန်တွင် ဤအက်ပ်အား တစ်ခုပေါ် တစ်ခုထပ်၍ဖွင့်ခွင့်ပြုပါ (ဥပမာ၊  ဗီဒီယိုဆက်ကြည့်ရန်)။ ဤဝင်းဒိုးသည် သင်သုံးနေသော အခြားအက်များ၏ အပေါ်တွင် ပြသပါလိမ့်မည်။"</string>
     <string name="picture_in_picture_on" msgid="6103704909710176555">"Yes"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"No"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"မနှောင့်ယှက်ရန် အသုံးပြုခြင်း"</string>
+    <string name="manage_zen_access_title" msgid="2611116122628520522">"\"မနှောင့်ယှက်ရ\" ကိုအသုံးပြုခြင်း"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"မနှောက်ယှက်ရန် အသုံးပြုခြင်းအတွက် မည်သည့်ထည့်သွင်းထားသည့် အပ်ဖ်မှ တောင်းဆိုမှုမရှိပါ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"အက်ပ်များကို တင်နေ..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"၎င်းအက်ပ်၏ သတိပေးချက်များကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ဆို့ထားပါသည်"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"၎င်းသတိပေးချက်အမျိုးအစားကို ဤစက်ပစ္စည်းတွင် ပေါ်မလာစေရန် Android က ပိတ်ဆို့ထားပါသည်"</string>
     <string name="notification_channels" msgid="5346841743182627500">"အမျိုးအစားများ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"အခြား"</string>
     <string name="no_channels" msgid="3077375508177744586">"ဤအက်ပ်က မည်သည့် အကြောင်းကြားချက်ကိုမျှ ပို့စ်တင်မထားပါ"</string>
@@ -2884,7 +2885,7 @@
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"စည်းမျဉ်း ပြုပြင်မည်"</string>
     <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"အချိန်စည်းမျဉ်း"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"သတ်မှတ်ထားသည့် အချိန်များတွင် \"မနှောင့်ယှက်ပါနှင့်\" ကို ဖွင့်ရန် အလိုအလျောက်စည်းမျဉ်း သတ်မှတ်ထားသည်"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"အဖြစ်အပျက်စည်းမျဉ်း"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"အကြောင်းအရာ စည်းမျဉ်း"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"သတ်မှတ်ထားသည့် အဖြစ်အပျက်များတွင် \"မနှောင့်ယှက်ပါနှင့်\" ကို ဖွင့်ရန် အလိုအလျောက်စည်းမျဉ်း သတ်မှတ်ထားသည်"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"အဖြစ်အပျက်များ အတွင်း"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"<xliff:g id="CALENDAR">%1$s</xliff:g> အတွက် အဖြစ်အပျက်များအတွင်း"</string>
@@ -2916,11 +2917,11 @@
     <string name="zen_mode_from_none" msgid="8219706639954614136">"မရှိ"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"နှိုးစက်များ"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"သတိပေးချက်များ"</string>
-    <string name="zen_mode_events" msgid="7914446030988618264">"ပွဲစဉ်များ"</string>
+    <string name="zen_mode_events" msgid="7914446030988618264">"အစီအစဉ်များ"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"ခေါ်ဆိုသူ အားလုံး"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"ရွေးချယ်ထားသည့် ခေါ်ဆိုသူများ"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"ခေါ်ဆိုသူများကို ပြန်ထပ်မည်"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"တစ် <xliff:g id="MINUTES">%d</xliff:g> မိနစ်အကြာတွင် တူညီသည့်လူမှ ဖုန်းပြန်ခေါ်လျှင် ခွင့်ပြုမည်"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"အကြိမ်ကြိမ်ခေါ်ဆိုသူများ"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"<xliff:g id="MINUTES">%d</xliff:g> မိနစ်အတွင်း ဖုန်းထပ်ခေါ်သူကို ခွင့်ပြုမည်။"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"အလိုအလျောက် ဖွင့်ရန်"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"ဘယ်တော့မှ"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"ညတိုင်း"</string>
@@ -2939,10 +2940,10 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"<xliff:g id="FORMATTEDTIME">%1$s</xliff:g> အထိနိုးစက်သာလျှင် သို့ပြောင်းမည်"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"အမြဲတမ်း ကြားဖြတ်ရန်သို့ ပြောင်းမည်"</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"မျက်နှာပြင်ဖွင့်ထားစဉ်တွင် ပိတ်ဆို့ပါ"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"မျက်နှာပြင်ပေါ်တွင် ဖော်ပြခြင်း သို့မဟုတ် ပေါ်လာခြင်းကို Do Not Disturb မှတားဆီးခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"မျက်နှာပြင်ပိတ်ထားစဉ်တွင် ပိတ်ဆို့ပါ"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"မျက်နှာပြင်ကိုဖွင့်ခြင်း သို့မဟုတ် သတိပေးချက်မီးကို မှိတ်တုတ်မှိတ်တုတ်ပြုလုပ်ခြင်းများကို Do Not Disturb မှတားဆီးခြင်းမပြုနိုင်ရန် ကာကွယ်ပါ"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"မျက်နှာပြင်ဖွင့်ထားစဉ်တွင် ပိတ်ပါ"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Do Not Disturb မှ ပိတ်ထားသည့် အကြောင်းကြားချက်များက မျက်နှာပြင်ပေါ်တွင် ဖော်ပြခြင်း သို့မဟုတ် ပေါ်လာခြင်းတို့မလုပ်နိုင်ရန် တားဆီးပါ"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"မျက်နှာပြင်ပိတ်ထားစဉ် ပိတ်ပါ"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Do Not Disturb ကပိတ်ထားသော်လည်း မျက်နှာပြင်ကိုဖွင့်ခြင်း သို့မဟုတ် သတိပေးချက်မှိတ်တုတ်မီးပြခြင်းတို့အားဖြင့် အကြောင်းကြားခြင်းများကို တားဆီးပါ"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Do Not Disturb သည်သတိပေးချက်များ မျက်နှာပြင်ပေါ်တွင် မဖော်ပြခြင်းကို ကာကွယ်ပါ"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"ပိတ်ပါ"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"မျက်နှာပြင် ဖွင့်ထားစဉ်"</string>
@@ -2951,36 +2952,32 @@
     <string name="notification_app_settings_button" msgid="6685640230371477485">"အကြောင်းကြားချက် ဆက်တင်များ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ဤကိရိယာအတွက် အကြံပြုချက် ပို့ရန်"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"စီမံခန့်ခွဲသူ၏ ပင်နံပါတ်ကို ထည့်ပါ"</string>
-    <string name="switch_on_text" msgid="1124106706920572386">"ပွင့်"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"ဖွင့်ရန်"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"ပိတ်"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"မျက်နှာပြင် ပင်တွဲခြင်း"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"ဤဆက်တင်ကို ဖွင့်ထားလျှင်၊ သင်က ပင်မဖြုတ်ခင်အချိန်ထိ လက်ရှိမျက်နှာပြင်မြင်ကွင်းတွင် ထားရှိရန် မျက်နှာပြင် ပင်တွဲခြင်းကို အသုံးပြုနိုင်မည် ဖြစ်ပါသည်။\n\nမျက်နှာပြင် ပင်တွဲခြင်းကို အသုံးပြုရန် −\n\n၁။ မျက်နှာပြင်ပင်တွဲခြင်း ဖွင့်ထားကြောင်း သေချာစေပါ။\n\n၂။ ပင်တွဲလိုသည့် မျက်နှာပြင်ကို ဖွင့်ပါ။\n\n၃။ ခြုံကြည့်ရန်ကို တို့ပါ။\n\n၄။ အပေါ်သို့ပွတ်ဆွဲပြီး ပင်တွဲခြင်းသင်္ကေတကို တို့ပါ။"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"ဤဆက်တင်ကို ဖွင့်ထားလျှင် သင်က ပင်မဖြုတ်ခင်အချိန်ထိ မျက်နှာပြင်ပင်တွဲခြင်းကိုသုံးပြီး လက်ရှိမြင်ကွင်းကို ထားရှိနိုင်သည်။\n\nမျက်နှာပြင် ပင်တွဲခြင်းကို အသုံးပြုရန် −\n\n၁။ မျက်နှာပြင်ပင်တွဲခြင်း ဖွင့်ထားကြောင်း သေချာစေပါ။\n\n၂။ ပင်တွဲလိုသည့် မျက်နှာပြင်ကို ဖွင့်ပါ။\n\n၃။ ခြုံကြည့်ရန်ကို တို့ပါ။\n\n၄။ အပေါ်သို့ပွတ်ဆွဲပြီး ပင်တွဲခြင်းသင်္ကေတကို တို့ပါ။"</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"ပင်မဖြုတ်မီမှာ သော့ဖွင့် ပုံစံကွက်ကို မေးရန်"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"ပင်မဖြုတ်မီမှာ PIN ကို မေးရန်"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"ပင်မဖြုတ်မီမှာ စကားဝှက်ကို မေးကြည့်ရန်"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"သော့ခတ်ကိရိယာ ပင်ထိုးမှုဖြုတ်နေ"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"ပင်ဖြုတ်စဉ် စက်ကို လော့ခ်ချထားရန်"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"ဤအလုပ်ပရိုဖိုင်အား စီမံခန့်ခွဲသည်မှာ-"</string>
     <string name="managing_admin" msgid="8843802210377459055">"<xliff:g id="ADMIN_APP_LABEL">%s</xliff:g> မှ စီမံသည်။"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(စမ်းသပ်ရေး)"</string>
     <string name="display_auto_rotate_title" msgid="7119684966039069439">"စက်ပစ္စည်းကို လှည့်ခြင်း"</string>
     <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"မျက်နှာပြင် အကြောင်းအရာ လှည့်ပြရန်"</string>
-    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ထောင်လိုက် မြင်ကွင်း ထဲမှာ ရှိနေရန်"</string>
+    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"ထောင်လိုက်ထားရန်"</string>
     <string name="display_auto_rotate_stay_in_landscape" msgid="3804752830204062162">"ဘေးတိုက် မြင်ကွင်း ထဲမှာ ရှိနေရန်"</string>
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"လက်ရှိ လှည့်ထားမှုအတိုင်း ရှိနေရန်"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"လုံခြုံသည့် အစပြုခြင်း"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ဆက်လုပ်ရန်"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ PIN အသုံးပြုခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ ရေးဆွဲပုံစံအသုံးပြုခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ လျှို့ဝှက်ကုဒ်ထည့်သွင်းခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။\n\nဤနည်းဖြင့် ​ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"ထပ်မံ့အားဖြင့် သင့်လက်ဗွေရာကို သုံး၍ သင့်စက်ပစ္စည်းကို သော့ဖွင့်ခြင်းအပြင်၊ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ သင့်ပင်နံပါတ်ထည့်သွင်းခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။ \n\nဤနည်းဖြင်ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"ထပ်မံ့အားဖြင့် သင့်လက်ဗွေရာကို သုံး၍ သင့်စက်ပစ္စည်းကို သော့ဖွင့်ခြင်းအပြင်၊ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ သင့်ပုံစံကို လိုအပ်ခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။ \n\nဤနည်းဖြင်ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"ထပ်မံ့အားဖြင့် သင့်လက်ဗွေရာကို သုံး၍ သင့်စက်ပစ္စည်းကို သော့ဖွင့်ခြင်းအပြင်၊ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်ခြင်းမပြုမီ လျှို့ဝှက်ကုဒ်ထည့်သွင်းခြင်းဖြင့် ထပ်လောင်း ကာကွယ်နိုင်သည်။ ဤစက်ပစ္စည်းအား စဖွင့်သတ်မှတ်မည့်အချိန်အထိ၊ နှိုးစက်များ အပါအဝင် အသိပေးချက်များ၊ စာတိုများနှင့် ဖုန်းခေါ်ဆိုခြင်းများ လက်ခံရယူနိုင်ခြင်း မရှိပါ။ \n\nဤနည်းဖြင်ဒေတာ ပျောက်ဆုံးခြင်း သို့မဟုတ် စက်ပစ္စည်းအား ခိုးယူခံရခြင်းများမှ ကာကွယ်နိုင်သည်။"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"စက်ပစ္စည်း စတင်ရန် PIN လိုအပ်၏"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"စက်ပစ္စည်း စတင်ရန် ရေးဆွဲပုံစံ လိုအပ်၏"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"စက်ပစ္စည်း စတင်ရန် လျှို့ဝှက်ကုဒ် လိုအပ်၏"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"မလိုအပ်ပါ"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"မလိုအပ်ပါ"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"မလိုအပ်ပါ"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် ပင်နံပါတ်သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် ပင်နံပါတ်သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် ပုံစံသတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် ပုံစံသတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် စကားဝှက်သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် စကားဝှက်သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"သင်၏ လက်ဗွေရာကို အသုံးပြုခြင်းအပြင် ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် ပင်နံပါတ်သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် ပင်နံပါတ်သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"သင်၏ လက်ဗွေရာကို အသုံးပြုခြင်းအပြင် ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် ပုံစံသတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် ပုံစံသတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"သင်၏ လက်ဗွေရာကို အသုံးပြုခြင်းအပြင် ဤစက်ပစ္စည်းအား စဖွင့်နိုင်ရန်အတွက် စကားဝှက်သတ်မှတ်ထားခြင်းဖြင့် ထပ်လောင်းကာကွယ်မှု ပြုလုပ်နိုင်ပါသည်။ စက်ပစ္စည်းကို မဖွင့်မီ နှိုးစက်များအပါအဝင် ဖုန်းခေါ်ဆိုမှု၊ မက်ဆေ့ဂျ် သို့မဟုတ် အကြောင်းကြားချက်များကို လက်ခံရရှိမည် မဟုတ်ပါ။\n\n၎င်းသည် ပျောက်ဆုံးသွားသော သို့မဟုတ် အခိုးခံရသော စက်ပစ္စည်းများပေါ်ရှိ ဒေတာများကို ကာကွယ်ပေးပါသည်။ သင်၏စက်ပစ္စည်းကို စဖွင့်နိုင်ရန်အတွက် စကားဝှက်သတ်မှတ်ထားလိုပါသလား။"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yes"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"No"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN လိုပါသလား?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ရေးဆွဲပုံစံ လိုပါသလား?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"လျှို့ဝှက်ကုဒ် လိုပါသလား?"</string>
@@ -2992,7 +2989,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"IMEI ဆက်စပ် အချက်အလက်များ"</string>
     <string name="slot_number" msgid="3762676044904653577">"(အပေါက်<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"မူရင်းအတိုင်းဖွင့်ရန်"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"လင့်ခ်များကို ဖွင့်နေသည်"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"လင့်ခ်များကို ဖွင့်ခြင်း"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"ထောက်ပံ့ထားသည့် လင့်များကို ဖွင့်မည်"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"မမ​ေးမြန်းဘဲ ဖွင့်မည်"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"ထောက်ပံ့ထားသည့်လင့်ခ်များ"</string>
@@ -3031,7 +3028,7 @@
     <string name="runtime_permissions_summary_no_permissions_granted" msgid="1679758182657005375">"ခွင့်ပြုထားသော ခွင့်ပြုချက်များ မရှိပါ"</string>
     <string name="runtime_permissions_summary_no_permissions_requested" msgid="7655100570513818534">"တောင်းခံထားသော ခွင့်ပြုချက်များ မရှိပါ"</string>
     <string name="filter_all_apps" msgid="1988403195820688644">"အက်ပ်များ အားလုံး"</string>
-    <string name="filter_enabled_apps" msgid="5395727306799456250">"ထည့်သွင်းထားသည့် အက်ပ်များ"</string>
+    <string name="filter_enabled_apps" msgid="5395727306799456250">"ထည့်ထားသည့် အက်ပ်များ"</string>
     <string name="filter_instant_apps" msgid="574277769963965565">"ချက်ခြင်းသုံး အက်ပ်များ"</string>
     <string name="filter_personal_apps" msgid="3277727374174355971">"ကိုယ်ရေး"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"အလုပ်"</string>
@@ -3048,8 +3045,8 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> ကို သုံးထားသော အက်ပ်များ"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"နိုးထရန် တို့ပါ"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"စက်ကိရိယာ နိုးကြားရန် ဖန်မျက်နှာပြင်ပေါ်ရှိ မည်သည့်နေရာမဆိုအား နှစ်ကြိမ်-တို့ပါ"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"လင့်ခ်များကို ဖွင့်နေသည်"</string>
-    <string name="domain_urls_summary_none" msgid="2639588015479657864">"ထောက်ပံ့ထားသည့်လင့်ခ်များ မဖွင့်ပါနှင့်"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"လင့်ခ်များကို ဖွင့်ခြင်း"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"ပံ့ပိုးထားသည့်လင့်ခ်များ မဖွင့်ပါနှင့်"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> ဖွင့်မည်"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"<xliff:g id="DOMAIN">%s</xliff:g> နင့် အခြား URL များကို ဖွင့်ပါ"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"ပံ့ပိုးထားသည့်လင့်ခ်ကို မည်သည့်အက်ပ်ကမျှ ဖွင့်၍မရပါ"</string>
@@ -3063,21 +3060,21 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"အသိအမှတ်မပြုပါ"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"မူရင်း"</string>
     <string name="default_for_work" msgid="9152194239366247932">"အလုပ်အတွက် မူရင်း"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"အကူအညီ &amp; အသံဖြင့်စာရိုက်ခြင်း"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"အကူအညီနှင့် အသံဖြင့်စာရိုက်ခြင်း"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"အကူအညီပေးရေး အက်ပ်"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> အား သင့်လက်ထောက်အဖြစ် ပြုမည်လား?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"ကူညီပေးသူသည် သင်၏ စနစ်ထဲတွင် သုံးနေသည့် အက်ပ်များ အကြောင်း အချက်အလက်များကို၊ သင်၏ မျက်နှာပြင် ပေါ်တွင် မြင်ရသည့် သို့မဟုတ် အက်ပ်များ အထဲတွင် ရယူသုံးနိုင်သည့် အချက်အလက်များ အပါအဝင်ကို၊ ဖတ်ရှုနိုင်မည်။"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"အိုကေ"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"သဘောမတူပါ"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"အသံဖြင့်စာရိုက်ထည့်ခြင်းအား ရွေးပါ"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"ဘရောင်ဇာအပ်ဖ်"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"ဘရောင်ဇာ အက်ပ်"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"ပုံမှန် ဘရောင်ဇာ မရှိပါ"</string>
     <string name="default_phone_title" msgid="282005908059637350">"ဖုန်း အက်ပ်"</string>
     <string name="default_app" msgid="6864503001385843060">"(မူသေ)"</string>
     <string name="system_app" msgid="9068313769550747372">"(စနစ်)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(စနစ်မူလ)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"အက်ပ်များ သိုလှောင်မှု"</string>
-    <string name="usage_access" msgid="5479504953931038165">"သုံးစွဲမှုကို ရယူသုံးနိုင်"</string>
+    <string name="usage_access" msgid="5479504953931038165">"သုံးစွဲမှုကို ကြည့်ရှုနိုင်ခြင်း"</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>
@@ -3092,11 +3089,11 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"ပျမ်းမျှ <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> ( <xliff:g id="COUNT">%2$d</xliff:g> )"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"ဘက်ထရီအား သင့်မြတ်အောင် လုပ်ကိုင်မှု"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"ဘက်ထရီအသုံးမြှင့်ခြင်း"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"သုံးစွဲမှုသတိပေးချက်များ"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"အက်ပ်အားလုံးပြရန်"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"အပိုအက်ပ်များကို ဝှက်ရန်"</string>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"သင့်မြတ်အောင် မလုပ်ရသေး"</string>
+    <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_system" msgid="7362862974428225301">"ဘက်ထရီအား သင့်မြတ်အောင် လုပ်ကိုင် မရ"</string>
@@ -3136,9 +3133,9 @@
     <string name="background_check_pref" msgid="7550258400138010979">"နောက်ခံကို စစ်ကြည့်ပါ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"နောက်ခံကို အပြည့်အဝ သုံးနိုင်ခွင့်"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"မျက်နှာပြင်မှ စာသားကိုသုံးမည်"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"မျက်နှာပြင်အကြောင်းအရာများကို စာသားအဖြစ်အသုံးပြုရန် အကူအညီအပ်ဖ်ကို ခွင်ပြုမည်"</string>
-    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"မျက်နှာပြင်ပုံဖမ်းချက် အသုံးပြုမည်"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"မျက်နှာပြင်၏ ပုံကိုအသုံးပြုရန် အကူအညီအပ်ဖ်ကို ခွင့်ပြုမည်"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"မျက်နှာပြင်မှအကြောင်းအရာများကို စာသားအဖြစ်ရယူရန် အကူအညီအက်ပ်ကို ခွင့်ပြုမည်"</string>
+    <string name="assist_access_screenshot_title" msgid="4034721336291215819">"ဖန်သားပြင်ဓာတ်ပုံ အသုံးပြုမည်"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"မျက်နှာပြင်၏ပုံကို အသုံးပြုရန် အကူအညီအက်ပ်အား ခွင့်ပြုမည်"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"ဖန်သားပြင်ကို အလင်းပေးပါ"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"အကူအညီအက်ပ်သည် ဖန်သားပြင် (သို့) ဖန်သားပြင်ဓာတ်ပုံပေါ်မှ စာသားကို အသုံးပြုစဉ်တွင် ဖန်သားပြင် အနားများကို အလင်းပေးပါ"</string>
     <string name="assist_footer" msgid="1982791172085896864">"သင်ကြည့်နေသည့် မျက်နှာပြင်မှသတင်းအချက်အလက်ကို အခြေခံ၍ အကူအညီအပ်ဖ်သည် သင့်ကိုကူညီနိုင်ပါသည်။ အထေက်အပံ့ဖြစ်စေသည့် ကူညီမှုကိုသင့်အားပေးစွမ်းနိုင်ရန် အချို့အပ်ဖ်များသည် အဖွင့်ကိရိယာနှင့် အသံထည့်သွင်းခြင်းနှစ်ခုလုံးကို ထောက်ပံ့ပါသည်။"</string>
@@ -3157,8 +3154,8 @@
     <string name="free_memory" msgid="4003936141603549746">"လက်ကျန်"</string>
     <string name="memory_usage_apps" msgid="5650192998273294098">"အက်ပ်များမှ အသုံးပြုသော မှတ်ဉာဏ်"</string>
     <plurals name="memory_usage_apps_summary" formatted="false" msgid="6089210945574265774">
-      <item quantity="other"> App <xliff:g id="COUNT">%1$d</xliff:g> သည် မှတ်ဉာဏ်အား လွန်ခဲ့သော <xliff:g id="DURATION_1">%2$s</xliff:g> က သုံးခဲ့၏</item>
-      <item quantity="one">လွန်ခဲ့သော <xliff:g id="DURATION_0">%2$s</xliff:g> က မှတ်ဉာဏ်အား app ၁ ခု မှ သုံးခဲ့၏</item>
+      <item quantity="other"> အက်ပ် <xliff:g id="COUNT">%1$d</xliff:g> ခုသည် မှတ်ဉာဏ်ကို လွန်ခဲ့သော <xliff:g id="DURATION_1">%2$s</xliff:g> က သုံးခဲ့သည်</item>
+      <item quantity="one">လွန်ခဲ့သော <xliff:g id="DURATION_0">%2$s</xliff:g> တွင် မှတ်ဉာဏ်ကို အက်ပ် ၁ ခုက သုံးခဲ့သည်</item>
     </plurals>
     <string name="running_frequency" msgid="6622624669948277693">"လှိုင်းနှုန်း"</string>
     <string name="memory_maximum_usage" msgid="6513785462055278341">"အများဆုံး အသုံးပြုမှု"</string>
@@ -3190,23 +3187,23 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"ခွင့်ပြုချက်များဖြင့် အပ်ဖ်များ"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Yes"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"No"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"အမျိုးအမည်မသိသော အက်ပ်များကို ထည့်သွင်းခြင်း"</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="write_settings" msgid="4797457275727195681">"စနစ်ဆက်တင်များ ပြန်ပြင်ခြင်း"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"စနစ်ချိန်ညှိချက်များကို ရေးသားပြုပြင်မည်"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_1">%2$d</xliff:g> ၏ <xliff:g id="COUNT_0">%1$d</xliff:g> အပ်ဖ်များကို စနစ်ချိန်ညှချက်များအား ပြန်ပြင်ရန် ခွင့်ပြုသည်"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"အခြားအက်ပ်များကို ထည့်သွင်းနိုင်သည်"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"စနစ်ချိန်ညှိချက်များကို ပြန်ပြင်နိုင်သည်"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"စနစ်ချိန်ညှိချက်များကို ပြန်ပြင်နိုင်သည်"</string>
-    <string name="write_system_settings" msgid="3482913590601096763">"စနစ်ချိန်ညှိချက်များကို ပြန်ပြင်ရန်"</string>
+    <string name="write_system_settings" msgid="3482913590601096763">"စနစ်ဆက်တင်များ ပြန်ပြင်ခြင်း"</string>
     <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">"Yes"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"No"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Yes"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"No"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"အက်ပ်ထည့်သွင်းမှုများကို ခွင့်ပြုခြင်း"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"ခွင့်ပြုထားသည်"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"ခွင့်ပြုမထားပါ"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ကင်မရာအတွက် ပါဝါခလုတ်ကို နှစ်ကြိမ် နှိပ်ပါ"</string>
@@ -3223,7 +3220,7 @@
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"ဟေး ပီတာ။"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"ဟေး၊ ဒီနေ့တွေ့ပြီး ကော်ဖီအတူသောက်ချင်သလား။"</string>
     <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"ကောင်းတာပေါ့။ ဒီနဲ့သိပ်မဝေးတဲ့နေရာမှာ ဆိုင်ကောင်းကောင်းတစ်ခုရှိတယ်။"</string>
-    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"အလွန်ကောင်းပါသည်။"</string>
+    <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"သိပ်ကောင်းတာပေါ့။"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"အင်္ဂါနေ့ ညနေ ၆:၀၀"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"အင်္ဂါနေ့ ညနေ ၆:၀၁"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"အင်္ဂါနေ့ ညနေ ၆:၀၂"</string>
@@ -3235,7 +3232,7 @@
       <item quantity="one">အက်ပ် ၁ ခုအတွက် ပိတ်ထားသည်</item>
     </plurals>
     <string name="notification_summary_none" msgid="4586376436702610">"အက်ပ်အားလုံးအတွက် ဖွင့်ထားသည်"</string>
-    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> အက်ပ်များ ထည့်သွင်းပြီးပါပြီ"</string>
+    <string name="apps_summary" msgid="193158055537070092">"အက်ပ် <xliff:g id="COUNT">%1$d</xliff:g> ခု ထည့်သွင်းထားသည်"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"အက်ပ်၂၄ ခုထည့်သွင်းခဲ့သည်"</string>
     <string name="storage_summary" msgid="3801281635351732202">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> အသုံးပြုထားသည် - <xliff:g id="FREE_SPACE">%2$s</xliff:g> လွတ်နေသည်"</string>
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"စက်တွင်းသိုလှောင်ခန်း− <xliff:g id="PERCENTAGE">%1$s</xliff:g> ကို အသုံးပြုထားပြီး - <xliff:g id="FREE_SPACE">%2$s</xliff:g> လွတ်နေပါသည်"</string>
@@ -3299,9 +3296,9 @@
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> အီသာနက်ဒေတာ"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> ဒေတာသတိပေးချက်"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> ဒေတာသတိပေးချက် / <xliff:g id="ID_2">%2$s</xliff:g> ဒေတာကန့်သတ်ချက်"</string>
-    <string name="billing_cycle" msgid="5169909190811133499">"ငွေတောင်းခ့မှု ကြားကာလ"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"လစဉ်လည်ပတ်မှုသည် လတိုင်း၏ <xliff:g id="ID_1">%1$s</xliff:g> တွင်စတင်သည်"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"လစဉ်အစ <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle" msgid="5169909190811133499">"ငွေတောင်းခံမှု ကာလ"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"လစဉ် <xliff:g id="ID_1">%1$s</xliff:g> ရက်နေ့တွင် လည်ပတ်မှုစတင်သည်"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"လစဉ် <xliff:g id="ID_1">%1$s</xliff:g> ရက်နေ့မှစ၍"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"ကွန်ရက် ကန့်သတ်ချက်များ"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other">ကန့်သတ်ချက် <xliff:g id="COUNT">%1$d</xliff:g> ခု</item>
@@ -3321,7 +3318,7 @@
       <item quantity="one">ဒေတာချွေတာမှုဖွင့်ထားချိန်တွင် ကန့်သတ်မှုမရှိသည့်ဒေတာကို အသုံးပြုရန် အက်ပ်၁ ခုကိုခွင့်ပြုထားသည်</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"ဒေတာချွေတာမှုစနစ်"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ကန့်သတ်မှုမရှိသည့် ဒေတာ"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"ဒေတာကန့်သတ်မှု မရှိခြင်း"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"နောက်ခံဒေတာကို ပိတ်ထားသည်"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"ဖွင့်ပါ"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"ပိတ်ပါ"</string>
@@ -3390,9 +3387,10 @@
     <string name="developer_smallest_width" msgid="7516950434587313360">"အသေးဆုံး အကျယ်"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"ထည့်သွင်းထားသည့် မည်သည့်အက်ပ်တစ်ခုမျှ ပရီမီယံ SMS အသုံးပြုခွင့်တောင်းဆိုမှု မရှိပါ။"</string>
     <string name="premium_sms_warning" msgid="9086859595338944882">"ပရီမီယံ SMS သည်ငွေကြေးကုန်ကျနိုင်ပြီး သင့်ဖုန်းဝန်​ဆောင်မှုပေးသူ၏ ငွေတောင်းခံလွှာသို့ ပေါင်း၍ ထည့်သွင်းပါမည်။ အက်ပ်တစ်ခုကို သင်ခွင့်ပြုလိုက်လျှင် ၎င်းအက်ပ်ကိုအသုံးပြုပြီး ပရီမီယံ SMS ပို့နိုင်မည်ဖြစ်သည်။"</string>
-    <string name="premium_sms_access" msgid="4660047004791638305">"ပရီမီယံ SMS အသုံးပြုခွင့်"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"ပရီမီယံ SMS သုံးခွင့်ရှိခြင်း"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"အခြားစက်ပစ္စည်းများက မတွေ့နိုင်ပါ"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"ဤစက်သို့ ချိတ်ဆက်ထားသည်−"</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>
@@ -3462,13 +3460,13 @@
     <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="2521630136233865893">"အသိပေးအကြောင်းကြားချက်များကို အမြန်စစ်ဆေးရန် ဖန်သားပြင်ကို နှစ်ချက်တို့ထိပါ။"</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="8696432220086951466">"အသိပေးအကြောင်းကြားချက်များကို အမြန်စစ်ဆေးရန် ဖုန်းကို ကောက်ယူလိုက်ပါ။"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"အသိပေးအကြောင်းကြားချက်များကို အမြန်စစ်ဆေးရန် တက်ဘလက်ကို ကောက်ယူလိုက်ပါ။"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"အသိပေးအကြောင်းကြားချက်များကို အမြန်စစ်ဆေးရန် ကိရိယာကို ကောက်ယူလိုက်ပါ။"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"သတိပေးချက်များအတွက် လက်ဗွေကို ပွတ်ဆွဲပါ"</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>
@@ -3486,11 +3484,11 @@
     <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="domain_url_section_title" msgid="7046835219056428883">"ထည့်သွင်းထားသည့် အက်ပ်များ"</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>
     <string name="configure_section_header" msgid="7391183586410814450">"စီစဉ်သတ်မှတ်ပါ"</string>
-    <string name="auto_sync_account_title" msgid="898796354710116383">"ဒေတာကို အလိုအလျောက် စင့်ခ်လုပ်ရန်"</string>
+    <string name="auto_sync_account_title" msgid="898796354710116383">"ဒေတာ အော်တိုစင့်ခ်လုပ်ရန်"</string>
     <string name="auto_sync_personal_account_title" msgid="8496263182646100610">"ကိုယ်ရေးကိုယ်တာဒေတာကို အလိုအလျောက် စင့်ခ်လုပ်ရန်"</string>
     <string name="auto_sync_work_account_title" msgid="4489172450037434152">"အလုပ်ဒေတာကို အလိုအလျောက် စင့်ခ်လုပ်ရန်"</string>
     <string name="auto_sync_account_summary" msgid="692499211629185107">"အက်ပ်အား ဒေတာကို အလိုအလျောက် ပြန်လည်စတင်ပါစေ"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(အသုံးပြုသူ <xliff:g id="USER">%s</xliff:g> အတွက် ပိတ်ထားသည်)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"အော်တိုဖြည့် ဝန်ဆောင်မှု"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"အလိုအလျောက်၊ ဖြည့်စွက်ခြင်း၊ အလိုအလျောက် ဖြည့်စွက်ခြင်း"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ကို သင်၏ အလိုအလျောက် ဖြည့်စွက်ခြင်းအက်ပ်အဖြစ် သတ်မှတ်လိုပါသလား။ <xliff:g id="APP_NAME_1">%1$s</xliff:g> သည် သင့်မျက်နှာပြင်ကို ဖတ်ခွင့်ရရှိမည်ဖြစ်ပြီး အခြားအက်ပ်များရှိ ကွက်လပ်များကို ဖြည့်စွက်ပေးပါမည်။"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"မည်သည့်အရာများကို အော်တိုဖြည့်နိုင်ကြောင်း ဆုံးဖြတ်ရန်အတွက် မျက်နှာပြင်ပေါ်ရှိ အရာများကို အသုံးပြုခွင့်ပေးရန် &lt;b&gt;သင်သည် ဤအက်ပ်ကို ယုံကြည်စိတ်ချရပါမည်။&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;"</string>
     <string name="device_theme" msgid="4571803018917608588">"စက်ပစ္စည်း အပြင်အဆင်"</string>
     <string name="default_theme" msgid="7085644992078579076">"မူရင်း"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"သိုလှောင်ခန်း စီမံခန့်ခွဲမှုစနစ်− <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 2d4bf55..7891796 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ingen"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ingen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index e706a27..66b655d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Kontoer"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Posisjon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Kontoer"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Sikkerhet og posisjon"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering og legitimasjon"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefonen er kryptert"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefonen er kryptert"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Innstillinger for låseskjerm"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Posisjon, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Personvern"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Avslått av administratoren"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Sikkerhetsstatus"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Skjermlås, fingeravtrykk"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skjermlås"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeravtrykk"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Admin. fingeravtrykk"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Bruk fingeravtrykk for"</string>
@@ -362,12 +361,12 @@
     <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="8386444182056861429">"Legg til fingeravtrykk"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke dette nettbrettet hvis du mister det, det blir stjålet eller innholdet blir slettet."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke denne enheten hvis du mister den, den blir stjålet eller innholdet blir slettet."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke denne telefonen hvis du mister den, den blir stjålet eller innholdet blir slettet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke dette nettbrettet hvis du mister det eller det blir stjålet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke denne enheten hvis du mister den eller den blir stjålet."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre fra å bruke denne telefonen hvis du mister den eller den blir stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre i å bruke dette nettbrettet hvis du mister det, det blir stjålet eller innholdet blir slettet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre i å bruke denne enheten hvis du mister den, den blir stjålet eller innholdet blir slettet."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre i å bruke denne telefonen hvis du mister den, den blir stjålet eller innholdet blir slettet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre i å bruke dette nettbrettet hvis du mister det eller det blir stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre i å bruke denne enheten hvis du mister den eller den blir stjålet."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Funksjoner for enhetsbeskyttelse blir ikke aktivert. Du kommer ikke til å kunne hindre andre i å bruke denne telefonen hvis du mister den eller den blir stjålet."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Hopp over likevel"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Gå tilbake"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Finn sensoren"</string>
@@ -446,7 +445,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">"Konfigurer en lås for bakgrunnskjermen din for å få ekstra beskyttelse."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"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>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Varsle når et offentlig nettverk av høy kvalitet er tilgjengelig"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Slå på Wi‑Fi automatisk"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi slås på igjen i nærheten av lagrede nettverk av høy kvalitet, for eksempel hjemmenettverket ditt"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Utilgjengelig fordi Wi‑Fi-skanning er slått av"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unngå dårlige tilkoblinger"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ikke bruk et Wi-Fi-nettverk med mindre det har en brukbar Internett-tilkobling"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Bare bruk nettverk som har en god nettilkobling"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurer 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nettverksmaske"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Lagrede nettverk"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-innstillinger"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"De avanserte innstillingene for Wi-Fi er ikke tilgjengelig for denne brukeren"</string>
@@ -1017,21 +1015,20 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"For å kontrollere hva som skjer når telefonen er plassert i dokken og/eller i hvilemodus, slå på skjermspareren."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Når du skal begynne"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Nåværende skjermsparer"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Start nå"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Innstillinger"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Aktiver enheten med løftebevegelser"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Skjerm for innkommende varsel"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Omgivelsesskjerm"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Skjermen slås på når du mottar varsler"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gjør teksten større eller mindre"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Innstillinger for SIM-kort-lås"</string>
-    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM-kort-lås"</string>
+    <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM-kortlås"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Av"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Låst"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kort-lås"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kortlås"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Lås SIM-kortet"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Personlig kode kreves for å bruke nettbrettet"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Krev PIN-kode for å bruke telefonen"</string>
@@ -1178,7 +1175,7 @@
     <string name="storage_external_title" msgid="3433462910096848696">"Bærbar lagring"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"<xliff:g id="USED">%1$s</xliff:g> brukt av <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
-    <string name="storage_volume_used" msgid="1303803057698959872">"Brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used" msgid="1303803057698959872">"brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_volume_used_total" msgid="6113121714019000244">"Total lagringsplass brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"<xliff:g id="NAME">%1$s</xliff:g> er montert"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"Kunne ikke montere <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Utforsk <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Annet omfatter delte filer lagret av apper, filer lastet ned fra Internett eller Bluetooth, Android-filer og så videre. \n\nFor å se det synlige innholdet på <xliff:g id="NAME">^1</xliff:g>, trykk på Utforsk."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Systemet inkluderer filer som brukes for å kjøre Android-versjon <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Delen System inneholder filer som brukes for å kjøre Android-versjon <xliff:g id="VERSION">%s</xliff:g>"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> kan ha lagret bilder, musikk, apper eller andre data, som bruker <xliff:g id="SIZE">^2</xliff:g> lagringsplass. \n\nFor å se mer informasjon, bytt til <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfigurer <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Bruk som bærbar lagring"</string>
@@ -1281,7 +1278,7 @@
     <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_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_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>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Tilbakestill innstillingene"</string>
@@ -1346,7 +1343,7 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Ikke tilknyttet"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Kan ikke knytte til mer enn <xliff:g id="MAXCONNECTION">%1$d</xliff:g> enheter."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> kobles fra."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Bruk Wi-Fi-soner og internettdeling til å gi Internett til andre enheter via mobildatatilkoblingen din."</string>
+    <string name="tethering_footer_info" msgid="7287131664937054043">"Bruk Wi-Fi-soner og internettdeling for å gi andre enheter Internett-tilgang via telefonens mobildataforbindelse."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Hjelp"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilnettverk"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilabonnement"</string>
@@ -1377,8 +1374,8 @@
     <string name="location_high_battery_use" msgid="517199943258508020">"Høy batteribruk"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"Lav batteribruk"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Posisjonsmodus"</string>
-    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Bruk GPS, Wi-Fi, Bluetooth eller mobilnettverk for å fastslå posisjonen"</string>
-    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Bruk Wi-Fi, Bluetooth eller mobilnettverk for å fastslå posisjonen"</string>
+    <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Bruk GPS, Wi-Fi, Bluetooth eller mobilnettverk til å fastslå posisjonen"</string>
+    <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Bruk Wi-Fi, Bluetooth eller mobilnettverk til å fastslå posisjonen"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Bruk GPS til å fastslå posisjonen din"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Søker"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi-skanning"</string>
@@ -1548,7 +1545,7 @@
     <string name="filter" msgid="2018011724373033887">"Filter"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Velg filteralternativer"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"Alle apper"</string>
-    <string name="filter_apps_disabled" msgid="5862632369555319938">"Apper som er slått av"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Avslåtte apper"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Tredjeparts"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Kjører"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
@@ -1600,7 +1597,7 @@
     <string name="system_package" msgid="1352722848400644991">"Systemoppdateringer kan ikke installeres på eksterne medier."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Administratorappen på enheten kan ikke installeres på eksterne medier"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Vil du tvinge avslutning?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Hvis du tvangsstopper en app, kan den oppføre seg uventet."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Hvis du tvinger avslutning av en app, kan det oppstå problemer."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Kan ikke flytte appen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Butikk"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Informasjon om appen"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Appen er installert fra <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Mer informasjon på <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Appkjøring"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Kjøres"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(aldri brukt)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Hurtigtasthjelp"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Vis tilgjengelige hurtigtaster"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Standard"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mus/styreflate"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Pekerhastighet"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Spillkontroller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Bruk vibrering"</string>
@@ -1778,7 +1775,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Zoom inn på skjermen"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Trykk tre ganger for å zoome"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Trykk på en knapp for å zoome"</string>
-    <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 nede fingeren 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_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>
@@ -1792,7 +1789,7 @@
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Stor markør for mus/styreflate"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Monolyd"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Kombiner kanaler når du spiller av lyd"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Forsinkelse på trykk og hold nede"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Forsinkelse for trykk-og-hold"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Fargeinvertering"</string>
     <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>
@@ -1864,7 +1861,7 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Du må bekrefte PIN-koden din for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Du må bekrefte passordet ditt for å slå på <xliff:g id="SERVICE">%1$s</xliff:g>, fordi den påvirker datakryptering."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"observere handlingene dine"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Den får varsler når du bruker apper."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Appen mottar varsler når du bruker andre apper."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Vil du stoppe <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Du stopper <xliff:g id="SERVICE">%1$s</xliff:g> ved å trykke på OK."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Ingen tjenester er installert"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Skjermbruk siden batteriet var fulladet"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Strømforbruk fra skjermen"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanning etter mobilnettverk"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"for <xliff:g id="TIME">%1$s</xliff:g> siden"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appbruk siden batteriet var fulladet (for <xliff:g id="TIME">%1$s</xliff:g> siden)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"for <xliff:g id="TIME">^1</xliff:g> siden"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appbruk siden batteriet var fulladet (for <xliff:g id="TIME">^1</xliff:g> siden)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Hvor lenge skjermen har vært på siden batteriet var fulladet"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsbruk siden batteriet var fulladet"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteribruk siden strømmen ble trukket ut"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Celle-standby"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilnettverk i ventemodus"</string>
     <string name="power_phone" msgid="5392641106474567277">"Telefonsamtaler"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Nettbrettet ikke i bruk"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen ikke i bruk"</string>
@@ -2007,14 +2004,14 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Batteribruken er anslått, og inkluderer ikke hver kilde som bruker batteriet. Forskjellen mellom den anslåtte batteribruken og den registrerte batteribruken, føres opp under annen batteribruk."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Overberegnet strømforbruk"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Brukt i %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Brukes i <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> brukt av <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av total batteribruk"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Oversikt siden sist batteriet var fulladet"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Sist batteriet var fulladet"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Gjenværende batteritid er omtrentlig og kan endres basert på bruk"</string>
-    <string name="battery_detail_foreground" msgid="3350401514602032183">"Mens den brukes aktivt"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"Mens den er i bakgrunnen"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"Aktiv bruk"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"I bakgrunnen"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batteribruk"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> av total appbruk (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Siden sist batteriet var fulladet"</string>
@@ -2063,7 +2060,7 @@
     <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
     <string name="mem_use_free_type" msgid="717708548454880840">"Ledig"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Totalt"</string>
-    <string name="menu_duration_3h" msgid="4714866438374738385">"3 timer"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 timene"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 timer"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"1 dag"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Innstillinger for talekommando og -styring"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Talesøk"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-tastatur"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Tale"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Innstillinger for taleinndata"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Taleinndata"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Taleinndatatjenester"</string>
@@ -2339,15 +2335,15 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Alle endringene du gjør i kontoene dine på nettet, kopieres auto­matisk til nettbrettet ditt.\n\nNoen kontoer kan også auto­matisk kopiere endringer du gjør på nettbrettet til nettet. Google-kontoer fungerer på denne måten."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Alle endringene du gjør i kontoene dine på nettet, kopieres auto­matisk til telefonen din.\n\nNoen kontoer kan også auto­matisk kopiere endringer du gjør på telefonen, til nettet. Google-kontoer fungerer på denne måten."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vil du slå av auto-synkronisering?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Dette bevarer data- og batteribruk, men du må synkronisere hver konto manuelt for å samle ny informasjon. Du kommer ikke til å motta varsler når det gjøres oppdateringer."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Dette gir lavere data- og batteribruk, men du må synkronisere hver konto manuelt for å samle ny informasjon. Du kommer ikke til å motta varsler når det gjøres oppdateringer."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tilbakestillingsdato for brukssyklus"</string>
-    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dato for hver måned:"</string>
+    <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dato hver måned:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Bekreft"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Angi advarsel for databruk"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Angi grense for databruk"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Begrensning av databruk"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Nettbrettet slår av mobildata når det har nådd grensen du har angitt.\n\nSiden databruken måles av nettbrettet, og operatøren din kan beregne bruken annerledes, kan det være lurt å angi en konservativ grense."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Telefonen slår av mobildata når den har nådd grensen du har angitt.\n\nSiden databruken måles av telefonen, og operatøren din kan beregne bruken annerledes, kan det være lurt å angi en konservativ grense."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Mobildata slås av når du har brukt mengden du har angitt.\n\nSiden databruken måles av telefonen, og operatøren din kan beregne bruken annerledes, kan det være lurt å angi en konservativ grense."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Vil du begrense bruken av bakgrunnsdata?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Hvis du begrenser mobildatabruk i bakgrunnen, er det enkelte apper og tjenester som ikke fungerer med mindre du er tilkoblet Wi-Fi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Hvis du begrenser mobildatabruk i bakgrunnen, er det enkelte apper og tjenester som ikke fungerer med mindre du er tilkoblet Wi-Fi.\n\nDenne innstillingen påvirker alle brukerne på dette nettbrettet."</string>
@@ -2514,7 +2510,7 @@
     <string name="user_new_user_name" msgid="369856859816028856">"Ny bruker"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Ny profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Vil du slette deg selv?"</string>
-    <string name="user_confirm_remove_title" msgid="1163721647646152032">"Fjerne denne brukeren?"</string>
+    <string name="user_confirm_remove_title" msgid="1163721647646152032">"Slette brukeren?"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"Fjerne denne profilen?"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"Vil du fjerne arbeidsprofilen?"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"Lagringsplassen og dataene dine blir fjernet fra dette nettbrettet. Denne handlingen kan ikke angres."</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Bruk standard"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Alltid"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Unntatt når en annen betalingsapp er åpen"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"På en sveipebetalingsterminal betaler du med"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"På betalingsterminaler med berøringsfunksjonalitet vil du betale med"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Betaling ved terminaler"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Konfigurer en betalingsapp. Deretter holder du baksiden av telefonen din mot en terminal som har symbolet for kontaktløs betaling."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Skjønner"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Varselvolum"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonringelyd"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Standard varsellyd"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Lyd fra app"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Standard varsellyd"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standard alarmlyd"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrer også når det ringer"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andre lyder"</string>
@@ -2779,7 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Varsler"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Avansert"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Jobbvarsler"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"Blinklys"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Blinkende lys"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"På låseskjermen"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt innhold i varsler"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skjul sensitivt innhold i varslene"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hvordan vil du at profilvarsler skal vises når enheten er låst?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilvarsler"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Varsler"</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_blocked" msgid="7938180808339386300">"Vis aldri varsler"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Lav: Ingen lyd eller visuell forstyrrelse"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Middels: Ingen lyd"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Høy: Lag lyd"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Haster: Lag lyd og 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Varselassistent"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokkerer varslene fra denne appen fra å vises på denne enheten"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokkerer denne varselkategorien fra å vises på denne enheten"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorier"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Annet"</string>
     <string name="no_channels" msgid="3077375508177744586">"Denne appen har ikke publisert noen varsler"</string>
@@ -2866,7 +2867,7 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitivt"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Ferdig"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Viktighet"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blinklys"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blinkende lys"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibrering"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Lyd"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Slett"</string>
@@ -2919,7 +2920,7 @@
     <string name="zen_mode_events" msgid="7914446030988618264">"Hendelser"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Alle oppringere"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Utvalgte oppringere"</string>
-    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gjentatte oppringere"</string>
+    <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Gjentatte anrop"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Tillat hvis den samme personen ringer enda en gang innen <xliff:g id="MINUTES">%d</xliff:g> minutter"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Slå på automatisk"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Aldri"</string>
@@ -2958,7 +2959,7 @@
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Krev opplåsingsmønster for å løsne apper"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"PIN-kode for å løsne apper"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Krev passord for å løsne apper"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheten under løsning av apper"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Lås enheten når apper løsnes"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Denne arbeidsprofilen administreres av:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Administrert av <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Eksperimentell)"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Behold gjeldende visningsretning"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Trygg oppstart"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsett"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Du kan beskytte denne enheten ved å kreve en PIN-kode ved oppstart. Frem til enheten starter, kan den ikke motta oppringninger, meldinger eller varsler, inkludert alarmer. \n\nDette beskytter informasjonen på enheter som er mistet eller stjålet."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Du kan beskytte denne enheten ved å kreve et mønster ved oppstart. Frem til enheten starter, kan den ikke motta oppringninger, meldinger eller varsler, inkludert alarmer. \n\nDette beskytter informasjonen på enheter som er mistet eller stjålet."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Du kan beskytte denne enheten ved å kreve et passord ved oppstart. Frem til enheten starter, kan den ikke motta oppringninger, meldinger eller varsler, inkludert alarmer. \n\nDette beskytter informasjonen på enheter som er mistet eller stjålet."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"I tillegg til å bruke fingeravtrykket ditt for å låse opp enheten, kan du sikre den enda mer ved å be om PIN-koden din før den låses opp. Inntil enheten er låst opp kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på enheter du har mistet eller som er stjålet."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"I tillegg til å bruke fingeravtrykket ditt for å låse opp enheten, kan du sikre den enda mer ved å be om mønsteret ditt før den låses opp. Inntil enheten er låst opp kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"I tillegg til å bruke fingeravtrykket ditt for å låse opp enheten, kan du sikre den enda mer ved å be om passordet ditt før den låses opp. Inntil enheten er låst opp kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Krev PIN-kode for å starte enheten"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Krev mønster for å starte enheten"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Krev passord for å starte enheten"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nei takk"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nei takk"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nei takk"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan beskytte denne enheten ved å be om PIN-koden din ved oppstart. Inntil enheten er låst opp, kan den ikke motta oppringninger, meldinger eller varsler – inkludert alarmer. \n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve PIN-kode for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Du kan beskytte denne enheten ved å be om mønsteret ditt ved oppstart. Inntil enheten er låst opp, kan den ikke motta oppringninger, meldinger eller varsler – inkludert alarmer. \n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve mønster for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kan beskytte denne enheten ved å kreve et passord ved oppstart. Inntil enheten er låst opp, kan den ikke motta oppringninger, meldinger eller varsler – inkludert alarmer. \n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passord for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"I tillegg til å bruke fingeravtrykket ditt til å låse opp enheten kan du sikre den enda mer ved å be om PIN-koden din ved oppstart. Inntil enheten er låst opp, kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve PIN-kode for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"I tillegg til å bruke fingeravtrykket ditt til å låse opp enheten kan du sikre den enda mer ved å be om mønsteret ditt ved oppstart. Inntil enheten er låst, opp kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve mønster for å starte enheten?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"I tillegg til å bruke fingeravtrykket ditt til å låse opp enheten kan du sikre den enda mer ved å be om passordet ditt ved oppstart. Inntil enheten er låst opp, kan den ikke motta anrop, SMS eller varsler – inkludert alarmer.\n\nDette bidrar til å beskytte data på mistede eller stjålne enheter. Vil du kreve passord for å starte enheten?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nei"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vil du kreve PIN-kode?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vil du kreve mønster?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vil du kreve passord?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Med denne tillatelsen kan apper endre systeminnstillingene."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nei"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ja"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nei"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Tillat appinstalleringer"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Tillatt"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Ikke tillatt"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Tillat fra denne kilden"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Vri to ganger for å åpne kameraet"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Åpne kameraappen ved å vri to ganger på håndleddet"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Tykk på av/på-knappen to ganger for kamera"</string>
@@ -3229,7 +3226,7 @@
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"tirs kl. 18.02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"tirs kl. 18.03"</string>
     <string name="disconnected" msgid="4836600637485526329">"Ikke tilkoblet"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> av dataen er brukt"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> med data er brukt"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other">Av for <xliff:g id="COUNT">%d</xliff:g> apper</item>
       <item quantity="one">Av for én app</item>
@@ -3301,7 +3298,7 @@
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Advarsel for databruk: <xliff:g id="ID_1">%1$s</xliff:g> / datagrense: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Faktureringssyklus"</string>
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Den månedlige faktureringssyklusen starter den <xliff:g id="ID_1">%1$s</xliff:g>. dagen i måneden"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Månedlig fakturering starter <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Månedlig, den <xliff:g id="ID_1">%1$s</xliff:g>. hver måned"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Nettverksbegrensninger"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> begrensninger</item>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Koblet til"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Fliser med hurtiginnstillinger for utviklere"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Vi er her for å hjelpe deg"</string>
@@ -3410,7 +3408,7 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"Utenlandstakster kan påløpe"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Telefon"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Chat"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Utforsk tips og triks"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Se gode tips"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"Søk i hjelp og send tilbakemelding"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Kontakt brukerstøtten"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Logg på"</string>
@@ -3454,8 +3452,8 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Hurtigbevegelser for å kontrollere telefonen din"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Hurtigbevegelser for å kontrollere nettbrettet ditt"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Hurtigbevegelser for å kontrollere enheten din"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Gå til kameraet"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"For å åpne kameraet raskt, trykk på av/på-knappen to ganger. Dette fungerer fra alle skjermbilder."</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Åpne kameraet raskt"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Trykk på av/på-knappen to ganger for å åpne kameraet raskt. Dette fungerer fra alle skjermbilder."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Vend kameraet"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Dobbelttrykk for å sjekke telefonen"</string>
@@ -3465,13 +3463,13 @@
     <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Løft for å sjekke telefonen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Løft for å sjekke nettbrettet"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Løft for å sjekke enheten"</string>
-    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"For å sjekke varslene dine raskt, løft telefonen din."</string>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Løft telefonen for å sjekke varsler raskt."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"For å sjekke varslene dine raskt, løft nettbrettet ditt."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"For å sjekke varslene dine raskt, løft enheten din."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Sveip fingeravtrykk for varsler"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"For å sjekke varslene dine, sveip ned på fingeravtrykksensoren på baksiden av telefonen."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"For å sjekke varslene dine, sveip ned på fingeravtrykksensoren på baksiden av nettbrettet."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"For å sjekke varslene dine, sveip ned på fingeravtrykksensoren på baksiden av enheten."</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Varsler med fingeravtrykksensor"</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av telefonen."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av nettbrettet."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Sjekk varsler ved å sveipe ned på fingeravtrykksensoren på baksiden av enheten."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Assistansebevegelse"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Sensivitet"</string>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Lagring på nettbrett"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefonlagring"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"brukt av <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"brukt"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Fjern appen"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Vil du fjerne denne instant-appen?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(slått av for brukeren <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Autofylltjeneste"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fyll, autofyll"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Vil du gjøre <xliff:g id="APP_NAME_0">%1$s</xliff:g> til autofyll-appen din? <xliff:g id="APP_NAME_1">%1$s</xliff:g> kommer til å være i stand til å lese skjermen din og fylle ut felt i andre apper."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sørg for at appen er pålitelig&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google autofyll&gt;%1$s&lt;/xliff:g&gt; bruker det som er på skjermen til å fastslå hva som kan fylles ut automatisk."</string>
     <string name="device_theme" msgid="4571803018917608588">"Enhetstema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standard"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagringsadministrator: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index a3fa2ff..059e7c7 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"कुनै पनि होइन"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"कुनै पनि होइन"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index a421802..afc9f3b 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"खाताहरू"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
     <string name="account_settings_title" msgid="626177544686329806">"खाताहरू"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"सुरक्षा तथा स्थान"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"इन्क्रिप्सन र प्रमाणहरू"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"फोन इन्क्रिप्ट गरिएको छ"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"फोन इन्क्रिप्ट गरिएको छ"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"लक स्क्रिनका प्राथमिकताहरू"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"मेरो स्थान, स्क्रिन अनलक, SIM कार्ड लक, प्रामाणिक भण्डारण लक सेट गर्नुहोस्"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरो स्थान, स्क्रिन अनलक, भण्डारण लकका गोप्य डेटा सेट गर्नुहोस्"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"गोपनीयता"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"प्रशासकद्वारा असक्षम पारिएको छ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"सुरक्षाको स्थिति"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"औंठाछापहरू व्यवस्थापन गर्नुहोस्"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"निम्नको लागि औठाछाप प्रयोग गर्नुहोस्"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi स्क्यान गर्ने सेवालाई निष्क्रिय पारिएको हुनाले Wi-Fi वेकअप विकल्प उपलब्ध छैन"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi-Fi कन्फिगर गर्नुहोस्"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"म्याक ठेगाना"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP ठेगाना"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"सबनेट मास्क"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ठेगानाहरू"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"सुरक्षित सञ्जालहरू"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP सेटिङहरू"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"यस प्रयोगकर्ताका लागि Wi‑Fi उन्नत सम्बन्धी सेटिङहरू उपलब्ध छैनन्"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"बन्द"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"फोन डकमा र/वा शयन अवस्थामा हुँदा हुने कुरालाई नियन्त्रण गर्न स्क्रिन सेभरलार्इ सक्रिय गर्नुहोस्।"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"सुरू हुने समय"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"हालको स्क्रिन सेभर"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"अब सुरु गर्नुहोस्"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"सेटिङहरू"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"स्वचालित उज्यालोपना"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"चालु गर्न उठाउनुहोस्"</string>
-    <string name="doze_title" msgid="5389406335828323273">"आगमन सूचनाको स्क्रिन"</string>
+    <string name="doze_title" msgid="2259176504273878294">"परिवेश प्रदर्शन"</string>
     <string name="doze_summary" msgid="3846219936142814032">"सूचनाहरू प्राप्त हुँदा स्क्रिनलाई सक्रिय गर्नुहोस्"</string>
     <string name="title_font_size" msgid="4405544325522105222">"फन्ट आकार"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"पाठ सन्देश अझ ठूलो वा सानो पार्नुहोस्"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"प्रणाली"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> अन्वेषण गर्नुहोस्"</string>
     <string name="storage_detail_dialog_other" msgid="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_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_wizard_init_title" msgid="5085400514028585772">"तपाईँको <xliff:g id="NAME">^1</xliff:g> सेट गर्नुहोस्"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"पोर्टेबल भण्डारणको रूपमा प्रयोग गर्नुहोस्"</string>
@@ -1366,7 +1363,7 @@
     <string name="location_title" msgid="1029961368397484576">"मेरो स्थान"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"काम प्रोफाइलका लागि स्थान"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"मोड"</string>
-    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च शुद्धता"</string>
+    <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"उच्च सटीकपना"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"ब्याट्री बचत"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"उपकरण मात्र"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"स्थान बन्द छ"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(कहिल्यै प्रयोग नभएको)"</string>
@@ -1638,7 +1636,7 @@
     <string name="running_processes_item_description_s_p" msgid="8019860457123222953">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रिया र <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवाहरू"</string>
     <string name="running_processes_item_description_p_s" msgid="744424668287252915">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रियाहरू र <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवा"</string>
     <string name="running_processes_item_description_p_p" msgid="1607384595790852782">"<xliff:g id="NUMPROCESS">%1$d</xliff:g> प्रक्रियाहरू र <xliff:g id="NUMSERVICES">%2$d</xliff:g> सेवाहरू"</string>
-    <string name="running_processes_header_title" msgid="6588371727640789560">"उपकरण मेमोरी"</string>
+    <string name="running_processes_header_title" msgid="6588371727640789560">"यन्त्रको मेमोरी"</string>
     <string name="running_processes_header_footer" msgid="723908176275428442">"अनुप्रयोग RAM उपयोग"</string>
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"प्रणाली"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"अनुप्रयोगहरू"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"किबोर्डको सर्टकट सहयोगी"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"उपलब्ध सर्टकटहरूलाई प्रदर्शन गर्नुहोस्"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"पूर्वनिर्धारित"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"माउस / ट्रयाकप्याड"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"सूचक गति"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"खेल नियन्त्रक"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"भाइब्रेटर प्रयोग गर्नुहोस्"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"पूर्ण चार्ज भएदेखि स्क्रिनको प्रयोग"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"स्क्रिनले गरेको पावरको खपत"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"मोबाइल नेटवर्क स्क्यान गर्ने कार्य"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> पहिले"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्ज भएदेखि अनुप्रयोगको प्रयोग (<xliff:g id="TIME">%1$s</xliff:g> पहिले)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> पहिले"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"पूर्ण चार्ज भएदेखि अनुप्रयोगको प्रयोग (<xliff:g id="TIME">^1</xliff:g> पहिले)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"पूर्ण चार्ज भएदेखि स्क्रिन सक्रिय रहेको समय"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"पूर्ण चार्ज भएदेखि यन्त्रको प्रयोग"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"अनप्लग भएदेखि ब्याट्री प्रयोग"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"क्यामेरा"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"ब्लुटुथ"</string>
-    <string name="power_cell" msgid="6596471490976003056">"सेल स्ट्याडबाइ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"मोबाइल नेटवर्क स्ट्यान्डबाइ छ"</string>
     <string name="power_phone" msgid="5392641106474567277">"भ्वाइस कलहरू"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ट्याब्लेट निष्क्रिय"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"निष्क्रिय फोन"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ब्याट्री प्रयोग शक्ति प्रयोगको एक ठाउँ हो र ब्याट्री खर्चको हरेक स्रोत समावेश छैन। विविधको अनुमानित शक्ति प्रयोग गणना र ब्याट्रीमा वास्तविक ब्याट्री खर्च अवलोकन बीच भिन्नता छ।"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"बढी गिन्ती गरिएको उर्जा प्रयोग"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s को लागि प्रयोग गरियो"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> का लागि प्रयोग गरियो"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ले प्रयोग गरेको <xliff:g id="PERCENT">%1$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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"भ्वाइस इनपुट र आउटपुट सेटिङहरू"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"आवाज खोजी"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"एन्ड्रोइड किबोर्ड"</string>
-    <string name="voice_category" msgid="1430370497125803904">"वाणी"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"ध्वनि निवेश सेटिङ्"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ध्वनि निवेश"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"ध्वनि निवेश सेवाहरू"</string>
@@ -2146,7 +2142,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">"तपाईँले प्रामाणिक डेटा भण्डारण प्रयोग गर्नुअघि तपाईँले लक स्क्रिन PIN वा पासवर्ड सेट गर्नु पर्छ।"</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>
@@ -2453,7 +2449,7 @@
     <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>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ध्वनी सूचना"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"फोन रिङटोन"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"सूचना सम्बन्धी पूर्वनिर्धारित ध्वनि"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"अनुप्रयोगले प्रदान गरेको ध्वनि"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"सूचना सम्बन्धी पूर्वनिर्धारित ध्वनि"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"अलार्मको पूर्वनिर्धारित ध्वनि"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"कलका लागि भाइब्रेट पनि"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनिहरू"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"सूचनाहरू कहिल्यै नदेखाउनुहोस्"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"न्यून: आवाज वा दृश्यको अवरोध नहुने"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"मध्यम: आवाज ननिकाल्ने"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"बढी महत्त्वपूर्ण: आवाज निकाल्नुहोस्"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"अत्यन्तै महत्त्वपूर्ण: आवाज निकाल्नुहोस् र स्क्रिनमा पप गर्नुहोस्"</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="6585849855452076626">"आवाजलाई अनुमति दिनुहोस्"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ध्वनि, कम्पन नगर्नुहोस् वा हालको स्क्रिनमा यी सूचनाहरूलाई दृश्यमा नचियाउनुहोस्।"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"सूचना सहायक"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"पहुँचमा बाधा नपुर्‍यानुहोस्"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"कुनै पनि स्थापित अनुप्रयोगहरू द्वारा पहुँचमा बाधा नपुर्‍यानुहोस् को माग गरेका छैनन्"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"अनुप्रयोगहरू लोड हुँदै..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ले यो यन्त्रमा यस अनुप्रयोगका सूचनाहरूलाई देखिनबाट रोक लगाइरहेको छ"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ले यो यन्त्रमा यस प्रकारका सूचनाहरूलाई देखिनबाट रोक लगाइरहेको छ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"कोटीहरू"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"अन्य"</string>
     <string name="no_channels" msgid="3077375508177744586">"यो अनुप्रयोगले कुनै पनि सूचना पोस्ट गरेको छैन"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"वर्तमान अभिमुखिकरणमा रहनुहोस्"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"स्टार्ट-अप सुरक्षित गर्नुहोस्"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"जारी राख्नुहोस्"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"यस उपकरणलाई अझै सुरक्षित गर्न सुरु गर्नु भन्दा अगि आफ्नो पिन आवश्यक बनाउन सक्नुहुने छ। उपकरण सुरु नभए सम्म कल, सन्देश, वा सूचनाहरू, प्राप्त गर्न सक्दैन, अलार्म सहित चल्ने छैन। \n\n उपकरण हराएको वा चोरी भएको खण्डमा यसले डेटा जोगाउँछ।"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"यो यन्त्र सुरू हुन अघि तपाईँको ढाँचा आवश्यक बनाउनु भएर तपाईँले यसलाई थप सुरक्षा दिन सक्नुहुन्छ। यन्त्र सुरू नभएसम्म त्यसले फोन, सन्देश वा अलार्म लगायतका सूचनाहरू प्राप्त गर्न सक्दैन।\n\nयस्तो व्यवस्थाले हराएका वा चोरी भएका यन्त्रमा डेटाको सुरक्षा गर्न मद्दत पुर्याउँछ।"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"यस उपकरणलाई अझै सुरक्षित गर्न सुरु गर्नु भन्दा पहिले आफ्नो पासवर्डलाई आवश्यक बनाउन सक्नुहुने छ। उपकरण सुरु नभए सम्म कल, सन्देश, वा सूचनाहरू, प्राप्त गर्न सक्दैन, अलार्म सहित चल्ने छैन। \n\n उपकरण हराएको वा चोरी भएको खण्डमा यसले डेटा जोगाउँछ।"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"तपाईंको फिंगरप्रिन्ट प्रयोग गरेर तपाईंको यन्त्रलाई अनलक गर्नुका साथै तपाईं यो यन्त्रलाई सुरु गर्नुभन्दा पहिले तपाईंको PIN चाहिने बनाएर अझ सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र सुरु नभएसम्म यसले अलार्महरूसहित कलहरू, सन्देशहरू वा सूचनाहरू प्राप्त गर्न सक्दैन।\n\n यन्त्रहरू हराए वा चोरी भएमा यसले डेटा जोगाउन मद्दत गर्दछ।"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"तपाईंको फिंगरप्रिन्ट प्रयोग गरेर तपाईंको यन्त्रलाई अनलक गर्नुका साथै तपाईं यो यन्त्रलाई सुरु गर्नुभन्दा पहिले तपाईंको ढाँचा चाहिने बनाएर अझ सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र सुरु नभएसम्म यसले अलार्महरूसहित कलहरू, सन्देशहरू वा सूचनाहरू प्राप्त गर्न सक्दैन। \n\n यन्त्रहरू हराए वा चोरी भएमा यसले डेटा जोगाउन मद्दत गर्दछ।"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"तपाईंको फिंगरप्रिन्ट प्रयोग गरेर तपाईंको यन्त्रलाई अनलक गर्नुका साथै तपाईं यो यन्त्रलाई सुरु गर्नुभन्दा पहिले पासवर्ड चाहिने बनाएर अझ सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र सुरु नभएसम्म यसले अलार्महरूसहित कलहरू, सन्देशहरू वा सूचनाहरू प्राप्त गर्न सक्दैन।\n\n यन्त्रहरू हराए वा चोरी भएमा यसले डेटा जोगाउन मद्दत गर्दछ।"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"उपकरण सुरु गर्न PIN आवश्यक छ"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"यन्त्रलाई सुरु गर्न ढाँचाको आवश्यक छ"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"उपकरण सुरु गर्न पासवर्ड आवश्यक छ"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"धन्यवाद पर्दैन"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"धन्यवाद पर्दैन"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"धन्यवाद पर्दैन"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"यो यन्त्र खुल्नुअघि आफ्नो PIN चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न PIN चाहिने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"यो यन्त्र खुल्नुअघि आफ्नो ढाँचा कोर्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न ढाँचा कोर्नु पर्ने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न पासवर्ड चाहिने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"आफ्नो यन्त्रलाई अनलक गर्नका लागि फिंगरप्रिन्ट प्रयोग गर्नुका साथसाथै, यो यन्त्र खुल्नुअघि आफ्नो PIN चाहिने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न PIN चाहिने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"आफ्नो यन्त्रलाई अनलक गर्नका लागि फिंगरप्रिन्ट प्रयोग गर्नुका साथसाथै, यो यन्त्र खुल्नुअघि आफ्नो ढाँचा कोर्नु पर्ने बनाएर तपाईं यस यन्त्रलाई थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\nयसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न ढाँचा कोर्नु पर्ने बनाउने हो?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"आफ्नो यन्त्रलाई अनलक गर्नका लागि फिंगरप्रिन्ट प्रयोग गर्नुका साथसाथै, यो यन्त्र खुल्नुअघि आफ्नो पासवर्ड चाहिने बनाएर तपाईं यस यन्त्रलाई  थप सुरक्षित बनाउन सक्नुहुन्छ। यन्त्र नखुलेसम्म यसमा फोन उठाउन, सन्देश प्राप्त गर्न, वा अलार्म प्रयोग गर्ने लगायत सूचनाहरू प्राप्त गर्न सकिँदैन।\n\n यसले हराएका र चोरी भएका यन्त्रहरूको डेटा सुरक्षित राख्न मद्दत गर्दछ। आफ्नो यन्त्र खोल्न पासवर्ड चाहिने बनाउने हो&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"हो"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"होइन"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN आवश्यक छ?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"प्याटर्न आवश्यक छ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"पासवर्ड आवश्यक छ?"</string>
@@ -3092,7 +3089,7 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"औसत <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"ब्याट्री आफू अनुकूल"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"ब्याट्रीको अप्टिमाइजेसन"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"ब्याट्रीको प्रयोग सम्बन्धी अलर्ट"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"सबै अनुप्रयोगहरू देखाउनुहोस्"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"अतिरिक्त अनुप्रयोगहरू लुकाउनु"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"हो"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"होइन"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"अनुप्रयोग स्थापना गर्ने अनुमति दिनुहोस्"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"अनुमति छ"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"अनुमति छैन"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"क्यामेराका लागि दुई पटक पावर बटन थिच्नुहोस्"</string>
@@ -3394,7 +3391,8 @@
     <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_connected_summary" msgid="8733997010923307915">"निम्नमा जोडिएको छ"</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>
@@ -3583,7 +3581,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(प्रयोगकर्ता <xliff:g id="USER">%s</xliff:g> को लागि असक्षम पारियो)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"स्वतः भरण सेवा"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"स्वतः, भरण, स्वतः भरण"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> लाई आफ्नो स्वतः भरण अनुप्रयोग बनाउने हो? <xliff:g id="APP_NAME_1">%1$s</xliff:g> ले तपाईँको स्क्रिन पढ्न र अन्य अनुप्रयोगहरूका क्षेत्रहरू भर्न सक्नेछ।"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;तपाईं यो अनुप्रयोगमाथि भरोसा गर्नुहुन्छ भन्ने कुरा पक्का गर्नुहोस्&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; यस अनुप्रयोगले स्वतः भर्नसकिने कुराहरूको निर्धारण गर्न तपाईंको स्क्रिनमा भएका वस्तुहरूको प्रयोग गर्छ।"</string>
     <string name="device_theme" msgid="4571803018917608588">"यन्त्रको विषयवस्तु"</string>
     <string name="default_theme" msgid="7085644992078579076">"पूर्वनिर्धारित"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"भण्डारणको प्रबन्धक: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index bde8e64..133809b 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Geen"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Geen"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 61f48ef..dce3ab7 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Accounts"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Locatie"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Beveiliging en locatie"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Versleuteling en gegevens"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefoon versleuteld"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Voorkeuren voor schermvergrendeling"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefoon versleuteld"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Voorkeuren schermvergrendeling"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"\'Mijn locatie\', schermontgrendeling, SIM- en certificaatopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, certificaatopslag vergrendelen"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Uitgeschakeld door beheerder"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Beveiligingsstatus"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Schermvergrendeling, vingerafdruk"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Schermvergrendeling"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vingerafdruk"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Vingerafdrukbeheer"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Vingerafdruk voor"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Melden als er een netwerk van hoge kwaliteit beschikbaar is"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wifi automatisch inschakelen"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wifi wordt opnieuw ingeschakeld in de buurt van opgeslagen netwerken van hoge kwaliteit, zoals je thuisnetwerk"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Niet beschikbaar omdat scannen naar wifi is uitgeschakeld"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Slechte verbindingen vermijden"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Wifi-netwerk niet gebruiken, tenzij dit een goede internetverbinding heeft"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Alleen netwerken gebruiken met een goede internetverbinding"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wifi configureren"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnetmasker"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adressen"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Opgeslagen netwerken"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-instellingen"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Geavanceerde wifi-instellingen zijn niet beschikbaar voor deze gebruiker"</string>
@@ -1017,30 +1015,29 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Uit"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Schakel de screensaver in om te bepalen wat er gebeurt als de telefoon is gedockt en/of de slaapstand actief is."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Wanneer starten"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Huidige screensaver"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Nu beginnen"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Instellingen"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Optillen om te activeren"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Scherm binnenkomende meldingen"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Actieve display"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Scherm activeren wanneer je meldingen ontvangt"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tekst groter of kleiner maken"</string>
-    <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen SIM-kaartvergrendeling"</string>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Instellingen simkaartvergrendeling"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Simkaartvergrendeling"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Uit"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Vergrendeld"</string>
-    <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kaartvergrendeling"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM-kaart vergrendelen"</string>
+    <string name="sim_lock_settings_title" msgid="9018585580955414596">"Simkaartvergrendeling"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Simkaart vergrendelen"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Pincode vereist voor gebruik van tablet"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Pincode vereist voor gebruik van telefoon"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Pincode vereist voor gebruik van tablet"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Pincode vereist voor gebruik van telefoon"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"SIM pincode wijzigen"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"Pincode simkaart wijzigen"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM pincode"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM-kaart vergrendelen"</string>
-    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM-kaart ontgrendelen"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Simkaart vergrendelen"</string>
+    <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Simkaart ontgrendelen"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Oude SIM pincode"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Nieuwe SIM pincode"</string>
     <string name="sim_reenter_new" msgid="6523819386793546888">"Typ nieuwe pincode opnieuw"</string>
@@ -1367,15 +1364,15 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locatie voor werkprofiel"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Modus"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Nauwkeurig"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Accubesparing"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batterijbesparing"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Alleen apparaat"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Locatie uit"</string>
-    <string name="location_app_level_permissions" msgid="1825588230817081339">"Rechten op app-niveau"</string>
+    <string name="location_app_level_permissions" msgid="1825588230817081339">"Machtigingen op app-niveau"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Recente locatieverzoeken"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Er zijn geen apps die je locatie onlangs hebben aangevraagd"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Locatieservices"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Hoog accugebruik"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Laag accugebruik"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Laag batterijgebruik"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Locatiemodus"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Gps, wifi, Bluetooth of mobiele netwerken gebruiken om locatie te bepalen"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Wifi, Bluetooth of mobiele netwerken gebruiken om locatie te bepalen"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Winkel"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"App-details"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App geïnstalleerd vanuit <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Meer informatie via <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"App-bewerkingen"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Actief"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nooit gebruikt)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Helper voor sneltoetsen"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Beschikbare sneltoetsen weergeven"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Standaard"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Muis/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Snelheid van aanwijzer"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Gamecontroller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Trilstand gebruiken"</string>
@@ -1772,16 +1769,16 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Tik op items op je scherm om ze hardop te laten voorlezen"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Ondertiteling"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Vergroting"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Vergroten door drie keer te tikken"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Vergroten door 3 keer te tikken"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Vergroten met knop"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Vergroten met knop en drie keer tikken"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Inzoomen op scherm"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Tik drie keer om te zoomen"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Zoomen door te tikken op een knop"</string>
     <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 en houd je het gewenste punt op het scherm 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_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 voor toegankelijkheid"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Snelle link toegankelijkheid"</string>
     <string name="accessibility_shortcut_service_title" msgid="4779360749706905640">"Service van sneltoets"</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 sneltoets is ingeschakeld, kun je een toegankelijkheidsfunctie openen door drie seconden op beide volumeknoppen te drukken."</string>
@@ -1901,7 +1898,7 @@
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"Zoekvak weergegeven"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"Zoekvak verborgen"</string>
     <string name="printer_info_desc" msgid="5824995108703060003">"Meer informatie over deze printer"</string>
-    <string name="power_usage_summary_title" msgid="7190304207330319919">"Accu"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Batterij"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Waarvoor de accu is gebruikt"</string>
     <string name="power_usage_not_available" msgid="3109326074656512387">"Accugebruikgegevens niet beschikbaar."</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>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Schermgebruik sinds volledige lading"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Schermverbruik"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scannen naar mobiele netwerken"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> geleden"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"App-gebruik sinds volledige lading (<xliff:g id="TIME">%1$s</xliff:g> geleden)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> geleden"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"App-gebruik sinds volledige lading (<xliff:g id="TIME">^1</xliff:g> geleden)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tijd die het scherm is ingeschakeld sinds volledige lading"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Apparaatgebruik sinds volledige lading"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Accugebruik sinds losgekoppeld"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wifi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobiel stand-by"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobiel netwerk stand-by"</string>
     <string name="power_phone" msgid="5392641106474567277">"Spraakoproepen"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactief"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefoon inactief"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Accugebruik is een schatting van het stroomgebruik en omvat niet elke bron van accuverbruik. Divers is het verschil tussen het berekende, geschatte stroomgebruik en het werkelijke verbruik dat is waargenomen voor de accu."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Te hoog berekend stroomgebruik"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s gebruikt"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> gebruikt"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> gebruikt door <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> van batterij"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uitsplitsing sinds laatste volledige lading"</string>
@@ -2029,7 +2026,7 @@
     <string name="process_kernel_label" msgid="3916858646836739323">"Android-besturingssysteem"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"App-optimalisatie"</string>
-    <string name="battery_saver" msgid="1426682272004907982">"Accubesparing"</string>
+    <string name="battery_saver" msgid="1426682272004907982">"Batterijbesparing"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Automatisch inschakelen"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nooit"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"bij <xliff:g id="PERCENT">%1$s</xliff:g> batterijlading"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Instellingen voor spraakinvoer en -uitvoer"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Spraakgestuurd zoeken"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-toetsenbord"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Spraak"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Instellingen voor spraakinvoer"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Spraakinvoer"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Spraakinvoerservices"</string>
@@ -2323,7 +2319,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobiel"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Geen"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobiele gegevens"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobiele data"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"2G-/3G-gegevens"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"4G-gegevens"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Voorgrond:"</string>
@@ -2339,15 +2335,15 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Wijzigingen die je op internet aanbrengt in je accounts, worden automatisch naar je telefoon gekopieerd.\n\nBij sommige accounts worden mogelijk ook de wijzigingen die je op de tablet aanbrengt, naar internet gekopieerd. Dit geldt bijvoorbeeld voor Google-accounts."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Wijzigingen die je op internet aanbrengt in je accounts, worden automatisch naar je telefoon gekopieerd.\n\nBij sommige accounts worden mogelijk ook de wijzigingen die je op de telefoon aanbrengt, naar internet gekopieerd. Dit geldt bijvoorbeeld voor Google-accounts."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Auto-synchr. uitschakelen?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hiermee beperk je gegevens- en accugebruik. Je moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. Je ontvangt geen meldingen wanneer er updates zijn."</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Hiermee beperk je gegevens- en batterijgebruik. Je moet elk account echter handmatig synchroniseren om recente informatie te verzamelen. Je ontvangt geen meldingen wanneer er updates zijn."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Herzieningsdatum voor gebruikscyclus"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Ingesteld"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Waarschuwing voor gegevensverbruik instellen"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limiet voor gegevensverbruik instellen"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Gegevensgebruik beperken"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Limiet voor dataverbruik instellen"</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Datagebruik beperken"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Je tablet schakelt mobiele data uit zodra je de ingestelde limiet bereikt.\n\nAangezien het datagebruik wordt gemeten door je tablet en je provider het gebruik afwijkend kan berekenen, kun je overwegen een conservatieve limiet in te stellen."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Je telefoon schakelt mobiele data uit zodra je de ingestelde limiet bereikt.\n\nAangezien het datagebruik wordt gemeten door je telefoon en je provider het gebruik afwijkend kan berekenen, kun je overwegen een conservatieve limiet in te stellen."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Je telefoon schakelt mobiele data uit zodra je de ingestelde limiet bereikt.\n\nAangezien het datagebruik wordt gemeten door je telefoon, en je provider het gebruik afwijkend kan berekenen, kun je overwegen een conservatieve limiet in te stellen."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Achtergrondgegevens beperken?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Als je mobiele data op de achtergrond beperkt, werken sommige apps en services alleen als je verbinding hebt via wifi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Als je mobiele data op de achtergrond beperkt, werken sommige apps en services alleen als je verbinding hebt via wifi.\n\nDeze instelling is van toepassing op alle gebruikers van deze tablet."</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Meldingsvolume"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Standaard meldingsgeluid"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Door app geleverd geluid"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Standaard meldingsgeluid"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standaard alarmgeluid"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Ook trillen voor oproepen"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andere geluiden"</string>
@@ -2761,13 +2759,13 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Alleen alarmen"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Totale stilte"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Visuele onderbreking blokkeren"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokkeer visuele onderbreking"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Geluiden voor werkprofiel"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Gebruik geluid persoonsprofiel"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Geluiden voor werkprofielen en persoonlijke profielen komen overeen"</string>
     <string name="work_ringtone_title" msgid="5806657896300235315">"Beltoon voor werktelefoon"</string>
     <string name="work_notification_ringtone_title" msgid="6081247402404510004">"Standaardmeldingsgeluid voor werk"</string>
-    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"Standaardalarmgeluid voor werk"</string>
+    <string name="work_alarm_ringtone_title" msgid="1441926676833738891">"Standaard alarmgeluid voor werk"</string>
     <string name="work_sound_same_as_personal" msgid="3123383644475266478">"Hetzelfde als persoonlijk profiel"</string>
     <string name="work_sync_dialog_title" msgid="7123973297187354813">"Geluiden vervangen?"</string>
     <string name="work_sync_dialog_yes" msgid="7243884940551635717">"Vervangen"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hoe moeten profielmeldingen worden weergegeven wanneer je apparaat is vergrendeld?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profielmeldingen"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"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_blocked" msgid="7938180808339386300">"Nooit meldingen weergeven"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Laag: geen geluid of visuele onderbreking"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Gemiddeld: geen geluid"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Hoog: geluid laten horen"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgent: geluid laten horen en op het scherm weergeven"</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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Meldingsassistent"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokkeert de weergave van meldingen van deze app op dit apparaat"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokkeert de weergave van deze categorie meldingen op dit apparaat"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorieën"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Anders"</string>
     <string name="no_channels" msgid="3077375508177744586">"Deze app heeft geen meldingen geplaatst"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"In huidige stand blijven"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Beveiligd opstarten"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Doorgaan"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Je kunt dit apparaat verder beveiligen door de pincode ook te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas nadat het is opgestart oproepen, berichten en meldingen, waaronder alarmen, ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Je kunt dit apparaat verder beveiligen door het patroon te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas nadat het is opgestart oproepen, berichten en meldingen, waaronder alarmen, ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Je kunt dit apparaat verder beveiligen door het wachtwoord ook te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas nadat het is opgestart oproepen, berichten en meldingen, waaronder alarmen, ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Pincode vereisen om apparaat op te starten"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Patroon vereisen om apparaat op te starten"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Wachtwoord vereisen om apparaat op te starten"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nee, bedankt"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nee, bedankt"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nee, bedankt"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Je kunt dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Je kunt dit apparaat verder beveiligen door je patroon te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Je kunt dit apparaat verder beveiligen door het wachtwoord ook te vereisen voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten en meldingen (waaronder alarmen) ontvangen. \n\nZo kunnen gegevens op verloren of gestolen apparaten worden beveiligd. Wil je instellen dat een wachtwoord vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je pincode moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een pincode vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je patroon moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een patroon vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Naast het gebruik van je vingerafdruk om je apparaat te ontgrendelen, kun je dit apparaat verder beveiligen door in te stellen dat je wachtwoord moet worden opgegeven voordat het apparaat wordt opgestart. Het apparaat kan pas na het opstarten oproepen, berichten of meldingen (waaronder alarmen) ontvangen.\n\nZo kunnen gegevens op verloren of gestolen apparaten worden beschermd. Wil je instellen dat een wachtwoord vereist is om het apparaat te starten?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nee"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Pincode vereisen?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Patroon vereisen?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Wachtwoord vereisen?"</string>
@@ -3092,15 +3089,15 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"Gemiddeld <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"Accuoptimalisatie"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"Batterijoptimalisatie"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Gebruiksmeldingen"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Alle apps weergeven"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Extra apps verbergen"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Niet geoptimaliseerd"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Niet geoptimaliseerd"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Accuverbruik optimaliseren"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"Accuoptimalisatie niet beschikbaar"</string>
-    <string name="high_power_desc" msgid="6283926163708585760">"Accuoptimalisatie niet toepassen. Hierdoor kan je accuverbruik toenemen."</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Batterijoptimalisatie niet beschikbaar"</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"Batterijoptimalisatie niet toepassen. Hierdoor kan je batterijverbruik toenemen."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"App altijd uitvoeren op de achtergrond?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Als je toestaat dat <xliff:g id="APP_NAME">%1$s</xliff:g> altijd op de achtergrond wordt uitgevoerd, kan de batterij sneller leeg raken. \n\nJe kunt dit later wijzigen via \'Instellingen\' &gt; \'Apps en meldingen\'."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> gebruik sinds laatste volledige lading"</string>
@@ -3172,7 +3169,7 @@
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Optimaliseren"</string>
     <string name="ignore_optimizations_on_desc" msgid="2321398930330555815">"Hierdoor kan je accuverbruik toenemen"</string>
     <string name="ignore_optimizations_off_desc" msgid="5255731062045426544">"Aanbevolen voor een langere accuduur"</string>
-    <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> toestaan om accuoptimalisatie te negeren?"</string>
+    <string name="ignore_optimizations_title" msgid="2829637961185027768">"<xliff:g id="APP">%s</xliff:g> toestaan om batterijoptimalisatie te negeren?"</string>
     <string name="app_list_preference_none" msgid="108006867520327904">"Geen"</string>
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Als je gebruikstoegang uitschakelt voor deze app, wordt niet voorkomen dat je beheerder datagebruik voor apps in je werkprofiel bijhoudt"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"<xliff:g id="COUNT_0">%1$d</xliff:g> van <xliff:g id="COUNT_1">%2$d</xliff:g> tekens gebruikt"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Met deze rechten kan een app de systeeminstellingen aanpassen."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nee"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ja"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nee"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"App-installaties toestaan"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Toegestaan"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Niet toegestaan"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Toestaan van deze bron"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Twee keer draaien voor camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Open de camera-app door je pols twee keer te draaien"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Druk twee keer op aan/uit voor de camera"</string>
@@ -3339,7 +3336,7 @@
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"Uit / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Nooit automatisch inschakelen"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Automatisch inschakelen bij %1$s acculading"</string>
-    <string name="not_battery_optimizing" msgid="5362861851864837617">"Accuoptimalisatie wordt niet gebruikt"</string>
+    <string name="not_battery_optimizing" msgid="5362861851864837617">"Batterijoptimalisatie wordt niet gebruikt"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Het typen van reacties of andere tekst in meldingen blokkeren als het apparaat is vergrendeld"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Standaard spellingcontrole"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Spellingcontrole kiezen"</string>
@@ -3373,7 +3370,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"geen"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Rangschikkingsobject ontbreekt"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Rangschikkingsobject bevat deze sleutel niet."</string>
-    <string name="special_access" msgid="3458780842491881155">"Speciale toegang voor apps"</string>
+    <string name="special_access" msgid="3458780842491881155">"Speciale app-toegang"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> apps kunnen onbeperkt data gebruiken</item>
       <item quantity="one">1 app kan onbeperkt data gebruiken</item>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Verbonden met"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ontwikkelaarstegels voor Snelle instellingen"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"We zijn er om je te helpen"</string>
@@ -3468,7 +3466,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Als je je meldingen snel wilt checken, pak je je telefoon op."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Als je je meldingen snel wilt checken, pak je je tablet op."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Als je je meldingen snel wilt checken, pak je je apparaat op."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vingerafdruk vegen voor meldingen"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Over vingerafdruksensor vegen voor meldingen"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je telefoon."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je tablet."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Als je je meldingen wilt bekijken, veeg je omlaag over de vingerafdruksensor achter op je apparaat."</string>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Opslag op tablet"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Telefoonopslag"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Gebruikt van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"gebruikt van <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"gebr."</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Gegevens van app wissen"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Wil je deze instant-app verwijderen?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(uitgezet voor gebruiker <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Service voor automatisch aanvullen"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, automatisch, invullen, aanvullen"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Wil je <xliff:g id="APP_NAME_0">%1$s</xliff:g> instellen als je app voor automatisch aanvullen? <xliff:g id="APP_NAME_1">%1$s</xliff:g> kan je scherm lezen en velden aanvullen in andere apps."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Zorg dat je deze app vertrouwt&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; maakt gebruik van de content op je scherm om te bepalen wat automatisch kan worden aangevuld."</string>
     <string name="device_theme" msgid="4571803018917608588">"Apparaatthema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standaard"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Opslagbeheer: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 90a700d..0fb60cc 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ਕੋਈ ਨਹੀਂ"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ਕੋਈ ਨਹੀਂ"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index a97eb15..e20c4e3 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"ਕੀ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"ਇਹ ਇਸ ਨਾਲ ਤੁਹਾਡੇ ਕਨੈਕਸ਼ਨ ਨੂੰ ਖ਼ਤਮ ਕਰ ਦੇਵੇਗਾ:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"ਤੁਹਾਨੂੰ Bluetooth ਸੈਟਿੰਗਾਂ ਬਦਲਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੈ।"</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦ੍ਰਿਸ਼ਮਾਨ ਹੁੰਦੀ ਹੈ ਜਦੋਂ Bluetooth ਸੈਟਿੰਗਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੇੜਲੀਆਂ ਡਿਵਾਈਸਾਂ ਲਈ ਦਿਖਣਯੋਗ ਹੁੰਦਾ ਹੈ ਜਦੋਂ Bluetooth ਸੈਟਿੰਗਾਂ ਖੁੱਲ੍ਹੀਆਂ ਹੁੰਦੀਆਂ ਹਨ।"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"ਕੀ <xliff:g id="DEVICE_NAME">%1$s</xliff:g> ਨੂੰ ਡਿਸਕਨੈਕਟ ਕਰਨਾ ਹੈ?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"ਪ੍ਰਸਾਰਨ"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"ਕੀ ਪ੍ਰੋਫਾਈਲ ਅਸਮਰੱਥ ਬਣਾਉਣੀ ਹੈ?"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ਖਾਤੇ"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ਟਿਕਾਣਾ"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ਖਾਤੇ"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"ਸੁਰੱਖਿਆ ਅਤੇ ਟਿਕਾਣਾ"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"ਇਨਕ੍ਰਿਪਸ਼ਨ ਅਤੇ ਕ੍ਰੀਡੈਂਸ਼ੀਅਲ"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ਫ਼ੋਨ ਇਨਕ੍ਰਿਪਟ ਕੀਤਾ ਗਿਆ"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ਲੌਕ ਸਕ੍ਰੀਨ ਤਰਜੀਹਾਂ"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ਮੇਰਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, SIM ਕਾਰਡ ਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ਮੇਰਾ ਟਿਕਾਣਾ, ਸਕ੍ਰੀਨ ਅਨਲੌਕ, ਕ੍ਰੈਡੈਂਸ਼ੀਅਲ ਸਟੋਰੇਜ ਲੌਕ ਸੈੱਟ ਕਰੋ"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ਪਰਦੇਦਾਰੀ"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ਪ੍ਰਸ਼ਾਸਕ ਦੁਆਰਾ ਅਯੋਗ ਬਣਾਇਆ ਗਿਆ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ਸੁਰੱਖਿਆ ਅਵਸਥਾ"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"ਫਿੰਗਰਪ੍ਰਿੰਟਸ ਵਿਵਸਥਿਤ ਕਰੋ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ਇਸ ਲਈ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤੋ"</string>
@@ -616,7 +615,7 @@
     <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>
-    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"ਉਪਲਬਧ ਡਿਵਾਈਸਾਂ"</string>
+    <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"ਉਪਲਬਧ ਡੀਵਾਈਸਾਂ"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"ਕੋਈ ਡਿਵਾਈਸਾਂ ਉਪਲਬਧ ਨਹੀਂ"</string>
     <string name="bluetooth_device_context_connect" msgid="3997659895003244941">"ਕਨੈਕਟ ਕਰੋ"</string>
     <string name="bluetooth_device_context_disconnect" msgid="8220072022970148683">"ਡਿਸਕਨੈਕਟ ਕਰੋ"</string>
@@ -648,7 +647,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"ਸਪੀਕਰ ਫੋਨ ਦੇ ਤੌਰ ਤੇ"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"ਸੰਗੀਤ ਅਤੇ ਮੀਡੀਆ ਲਈ"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"ਸੈਟਿੰਗਾਂ ਯਾਦ ਰੱਖੋ"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"ਪ੍ਰਸਾਰਿਤ ਕਰੋ"</string>
+    <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>
@@ -667,7 +666,7 @@
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> Wi-Fi ਨੂੰ ਬੰਦ ਕਰਨਾ ਚਾਹੁੰਦੀ ਹੈ"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</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_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>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ਅਣਉਪਲਬਧ ਕਿਉਂਕਿ Wi‑Fi ਸਕੈਨਿੰਗ ਬੰਦ ਹੈ"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ਸਬਨੈੱਟ ਮਾਸਕ"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ਪਤੇ"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"ਸੁਰੱਖਿਅਤ ਕੀਤੇ ਨੈੱਟਵਰਕ"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ਸੈਟਿੰਗਾਂ"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Wi‑Fi ਉੱਨਤ ਸੈਟਿੰਗਾਂ ਇਸ ਵਰਤੋਂਕਾਰ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹਨ"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ਬੰਦ"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ਇਹ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਕਿ ਜਦੋਂ ਫੋਨ ਡੌਕ ਕੀਤਾ ਅਤੇ/ਜਾਂ ਸਲੀਪ ਮੋਡ ਵਿੱਚ ਹੁੰਦਾ ਹੈ ਉਦੋਂ ਕੀ ਹੁੰਦਾ ਹੈ, ਸਕ੍ਰੀਨ ਸੇਵਰ ਚਾਲੂ ਕਰੋ।"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ਕਦੋਂ ਸ਼ੁਰੂ ਕਰਨਾ ਹੈ"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ ਸੇਵਰ"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ਹੁਣ ਚਾਲੂ ਕਰੋ"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ਸੈਟਿੰਗਾਂ"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ਸਵੈਚਲਿਤ ਚਮਕ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ਸਕਿਰਿਆ ਕਰਨ ਲਈ ਚੁੱਕੋ"</string>
-    <string name="doze_title" msgid="5389406335828323273">"ਆਉਣ ਵਾਲੀ ਸੂਚਨਾ ਸਬੰਧੀ ਸਕ੍ਰੀਨ"</string>
+    <string name="doze_title" msgid="2259176504273878294">"ਤੱਕਣੀਯੋਗ ਡਿਸਪਲੇ"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ਜਦ ਤੁਹਾਨੂੰ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਹੋਣ ਤਾਂ ਸਕ੍ਰੀਨ ਨੂੰ ਸਜੀਵ ਕਰੋ"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ਫੌਂਟ ਦਾ ਆਕਾਰ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ਲਿਖਤ ਨੂੰ ਵੱਡਾ ਜਾਂ ਛੋਟਾ ਕਰੋ"</string>
@@ -1034,9 +1031,9 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM ਕਾਰਡ ਲੌਕ"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM ਕਾਰਡ ਲੌਕ ਕਰੋ"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ PIN ਦੀ ਲੋੜ ਹੈ"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ਫੋਨ ਵਰਤਣ ਲਈ PIN ਲੁੜੀਂਦਾ"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"ਫੋਨ ਵਰਤਣ ਲਈ PIN ਲੋੜੀਂਦਾ ਬਣਾਓ"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"ਟੈਬਲੇਟ ਵਰਤਣ ਲਈ PIN ਦੀ ਲੋੜ ਹੈ"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ਫੋਨ ਵਰਤਣ ਲਈ PIN ਲੁੜੀਂਦਾ"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"ਫੋਨ ਵਰਤਣ ਲਈ PIN ਲੋੜੀਂਦਾ ਬਣਾਓ"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"SIM PIN ਬਦਲੋ"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM ਕਾਰਡ ਲੌਕ ਕਰੋ"</string>
@@ -1114,7 +1111,7 @@
     <string name="memory_available" msgid="5052397223077021181">"ਉਪਲਬਧ"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"ਉਪਲਬਧ (ਰੀ਼ਡ-ਓਨਲੀ)"</string>
     <string name="memory_size" msgid="6629067715017232195">"ਕੁੱਲ ਸਪੇਸ"</string>
-    <string name="memory_calculating_size" msgid="2188358544203768588">"ਕੈਲਕੁਲੇਟ ਕਰ ਰਿਹਾ ਹੈ…"</string>
+    <string name="memory_calculating_size" msgid="2188358544203768588">"ਗਣਨਾ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ…"</string>
     <string name="memory_apps_usage" msgid="5128673488173839077">"ਐਪਸ &amp; ਐਪ ਡੈਟਾ"</string>
     <string name="memory_media_usage" msgid="3738830697707880405">"ਮੀਡੀਆ"</string>
     <string name="memory_downloads_usage" msgid="3755173051677533027">"ਡਾਊਨਲੋਡ"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"ਸਿਸਟਮ"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ਐਕਸਪਲੋਰ ਕਰੋ"</string>
     <string name="storage_detail_dialog_other" msgid="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_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_wizard_init_title" msgid="5085400514028585772">"ਆਪਣੇ <xliff:g id="NAME">^1</xliff:g> ਨੂੰ ਸੈੱਟ ਅੱਪ ਕਰੋ"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ ਦੇ ਰੂਪ ਵਿੱਚ ਉਪਯੋਗ ਕਰੋ"</string>
@@ -1376,10 +1373,10 @@
     <string name="location_category_location_services" msgid="7437150886946685979">"ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"ਉੱਚ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
     <string name="location_low_battery_use" msgid="8602232529541903596">"ਘੱਟ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
-    <string name="location_mode_screen_title" msgid="4528716772270246542">"ਸਥਿਤੀ ਮੋਡ"</string>
+    <string name="location_mode_screen_title" msgid="4528716772270246542">"ਟਿਕਾਣਾ ਮੋਡ"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS, Wi‑Fi, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ Wi‑Fi, ਬਲੂਟੁੱਥ, ਜਾਂ ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਵਰਤੋ"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੋ"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"ਟਿਕਾਣੇ ਦਾ ਪਤਾ ਲਗਾਉਣ ਲਈ GPS ਵਰਤੋ"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"ਸਕੈਨ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi ਸਕੈਨਿੰਗ"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ਸਿਸਟਮ ਐਪਾਂ ਅਤੇ ਸੇਵਾਵਾਂ ਨੂੰ ਕਿਸੇ ਵੀ ਸਮੇਂ Wi‑Fi ਨੈੱਟਵਰਕਾਂ ਦਾ ਪਤਾ ਲਾਉਣ ਦੀ ਆਗਿਆ ਦੇ ਕੇ ਟਿਕਾਣਾ ਸੇਵਾ ਬਿਹਤਰ ਬਣਾਓ।"</string>
@@ -1513,7 +1510,7 @@
     </plurals>
     <string name="clear_uri_btn_text" msgid="8575655132961012158">"ਪਹੁੰਚ ਸਾਫ਼ ਕਰੋ"</string>
     <string name="controls_label" msgid="7611113077086853799">"ਨਿਯੰਤਰਣ"</string>
-    <string name="force_stop" msgid="7435006169872876756">"ਰੋਕਣ ਤੇ ਜ਼ੋਰ ਪਾਓ"</string>
+    <string name="force_stop" msgid="7435006169872876756">"ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰੋ"</string>
     <string name="total_size_label" msgid="1048676419552557254">"ਕੁੱਲ"</string>
     <string name="application_size_label" msgid="7376689739076506885">"ਐਪ ਦਾ ਆਕਾਰ"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB ਸਟੋਰੇਜ ਐਪ"</string>
@@ -1599,8 +1596,8 @@
     <string name="invalid_location" msgid="4354595459063675191">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਇੰਸਟੌਲ ਕਰਨਾ ਪ੍ਰਮਾਣਿਕ ਨਹੀਂ ਹੈ।"</string>
     <string name="system_package" msgid="1352722848400644991">"ਸਿਸਟਮ ਅਪਡੇਟਾਂ ਬਾਹਰੀ ਮੀਡੀਆ ਤੇ ਇੰਸਟੌਲ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕਦੀਆਂ।"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"ਡੀਵਾਈਸ ਪ੍ਰਸ਼ਾਸਕ ਐਪ ਬਾਹਰੀ ਮੀਡੀਆ \'ਤੇ ਸਥਾਪਤ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕਦੀ"</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"ਕੀ ਰੋਕਣ ਤੇ ਜ਼ੋਰ ਦੇਣਾ ਹੈ?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"ਜੇਕਰ ਤੁਸੀਂ ਇੱਕ ਐਪ ਨੂੰ ਰੋਕਣ ਤੇ ਜ਼ੋਰ ਪਾਉਂਦੇ ਹੋ, ਤਾਂ ਇਹ ਦੁਰਵਿਵਹਾਰ ਕਰ ਸਕਦਾ ਹੈ।"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"ਕੀ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰਨਾ ਹੈ?"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"ਜੇ ਤੁਸੀਂ ਕਿਸੇ ਐਪ ਨੂੰ ਜ਼ਬਰਦਸਤੀ ਬੰਦ ਕਰਦੇ ਹੋ, ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ ਇਹ ਠੀਕ ਤਰ੍ਹਾਂ ਕਾਰਜ ਨਾ ਕਰੇ।"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"ਐਪ ਮੂਵ ਨਹੀਂ ਕਰ ਸਕਿਆ। <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"ਤਰਜੀਹੀ ਇੰਸਟੌਲ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string>
@@ -1615,6 +1612,7 @@
     <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="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> \'ਤੇ ਹੋਰ ਜਾਣਕਾਰੀ"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"App ops"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"ਦੌੜ"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ਕਦੇ ਵੀ ਨਹੀਂ ਵਰਤਿਆ)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"ਕੀ-ਬੋਰਡ ਸ਼ਾਰਟਕੱਟ ਸਹਾਇਕ"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ਉਪਲਬਧ ਸ਼ਾਰਟਕੱਟ ਵਿਖਾਓ"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"ਮਾਊਸ/ਟਰੈਕਪੈਡ"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ਪੋਆਇੰਟਰ ਗਤੀ"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ਗੇਮ ਕੰਟ੍ਰੋਲਰ"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"ਵਾਈਬ੍ਰੇਟਰ ਵਰਤੋ"</string>
@@ -1888,7 +1885,7 @@
     <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>
+    <string name="print_service_disabled" msgid="7739452396114245222">"ਸੇਵਾ ਅਯੋਗ ਬਣਾਈ ਗਈ ਹੈ"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"ਪ੍ਰਿੰਟ ਜੌਬਸ"</string>
     <string name="print_print_job" msgid="7563741676053287211">"ਪ੍ਰਿੰਟ ਜੌਬ"</string>
     <string name="print_restart" msgid="8373999687329384202">"ਰੀਸਟਾਰਟ ਕਰੋ"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਸਕ੍ਰੀਨ ਵਰਤੋਂ"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"ਸਕ੍ਰੀਨ ਖਪਤ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਕੈਨਿੰਗ"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> ਪਹਿਲਾਂ"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ (<xliff:g id="TIME">%1$s</xliff:g> ਪਹਿਲਾਂ)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਐਪ ਵਰਤੋਂ (<xliff:g id="TIME">^1</xliff:g> ਪਹਿਲਾਂ)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਸਕ੍ਰੀਨ ਕਿੰਨੇ ਸਮੇਂ ਤੱਕ ਚਾਲੂ ਰਹੀ"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"ਪੂਰਾ ਚਾਰਜ ਕਰਨ ਤੋਂ ਬਾਅਦ ਡੀਵਾਈਸ ਵਰਤੋਂ"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"ਅਨਪਲਗ ਕਰਨ ਤੋਂ ਬਾਅਦ ਬੈਟਰੀ ਵਰਤੋਂ"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"ਕੈਮਰਾ"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"ਸੈਲ ਸਟੈਂਡਬਾਇ"</string>
+    <string name="power_cell" msgid="3392999761958982492">"ਮੋਬਾਈਲ ਨੈੱਟਵਰਕ ਸਟੈਂਡਬਾਇ"</string>
     <string name="power_phone" msgid="5392641106474567277">"ਵੌਇਸ ਕਾਲਾਂ"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ਟੈਬਲੇਟ ਨਿਸ਼ਕਿਰਿਆ"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ਫੋਨ ਨਿਸ਼ਕਿਰਿਆ"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"ਬੈਟਰੀ ਵਰਤੋਂ ਪਾਵਰ ਵਰਤੋਂ ਦਾ ਇੱਕ ਅਨੁਮਾਨ ਹੈ ਅਤੇ ਇਸ ਵਿੱਚ ਬੈਟਰੀ ਖ਼ਰਚ ਦਾ ਹਰੇਕ ਸਰੋਤ ਸ਼ਾਮਲ ਨਹੀਂ ਹੁੰਦਾ। ਵਿਵਿਧ ਹਿਸਾਬ ਲਗਾਈ ਅਨੁਮਾਨਿਤ ਪਾਵਰ ਵਰਤੋਂ ਅਤੇ ਬੈਟਰੀ ਤੇ ਦੇਖੇ ਗਏ ਅਸਲੀ ਖ਼ਰਚ ਵਿਚਕਾਰ ਅੰਤਰ ਹੈ।"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ਓਵਰ-ਕਾਉਂਟਿਡ ਪਾਵਰ ਵਰਤੋਂ"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s ਲਈ ਵਰਤੀ ਗਈ"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> ਲਈ ਵਰਤਿਆ ਗਿਆ"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ਵੱਲੋਂ <xliff:g id="PERCENT">%1$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>
@@ -2030,7 +2027,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"ਐਪ ਅਨੁਕੂਲਨ"</string>
     <string name="battery_saver" msgid="1426682272004907982">"ਬੈਟਰੀ ਸੇਵਰ"</string>
-    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ਆਟੋਮੈਟਿਕਲੀ ਚਾਲੂ ਕਰੋ"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ਆਪਣੇ-ਆਪ ਚਾਲੂ ਕਰੋ"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"<xliff:g id="PERCENT">%1$s</xliff:g> \'ਤੇ ਬੈਟਰੀ"</string>
     <string name="battery_percentage" msgid="723291197508049369">"ਬੈਟਰੀ ਪ੍ਰਤੀਸ਼ਤ"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"ਵੌਇਸ ਇਨਪੁਟ &amp; ਆਊਟਪੁਟ ਸੈਟਿੰਗਾਂ"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ਵੌਇਸ ਖੋਜ"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android ਕੀ-ਬੋਰਡ"</string>
-    <string name="voice_category" msgid="1430370497125803904">"ਬੋਲੀ"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"ਵੌਇਸ ਇਨਪੁਟ ਸੈਟਿੰਗਾਂ"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"ਵੌਇਸ ਇਨਪੁਟ"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"ਵੌਇਸ ਇਨਪੁਟ ਸੇਵਾਵਾਂ"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ਸੂਚਨਾ ਵੌਲਿਊਮ"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ਫੋਨ ਰਿੰਗਟੋਨ"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ਐਪ ਵੱਲੋਂ ਮੁਹੱਈਆ ਕਰਵਾਈ ਧੁਨੀ"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਸੂਚਨਾ ਧੁਨੀ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਅਲਾਰਮ ਧੁਨੀ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ਕਾਲਾਂ ਲਈ ਥਰਥਰਾਹਟ ਵੀ ਕਰੋ"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ਹੋਰ ਅਵਾਜ਼ਾਂ"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"ਸੂਚਨਾਵਾਂ ਕਦੇ ਵੀ ਨਾ ਵਿਖਾਓ"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"ਘੱਟ: ਕੋਈ ਧੁਨੀ ਜਾਂ ਦ੍ਰਿਸ਼ਟਾਂਤਕ ਰੁਕਾਵਟ ਨਹੀਂ"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"ਔਸਤ: ਕੋਈ ਧੁਨੀ ਨਹੀਂ"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ਉੱਚ: ਧੁਨੀ ਵਜਾਓ"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"ਜ਼ਰੂਰੀ: ਧੁਨੀ ਵਜਾਓ ਅਤੇ ਸਕ੍ਰੀਨ \'ਤੇ ਵਿਖਾਓ"</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="6585849855452076626">"ਧੁਨੀ ਨੂੰ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ਵਰਤਮਾਨ ਸਕ੍ਰੀਨ \'ਤੇ ਦ੍ਰਿਸ਼ ਵਿੱਚ ਇਹਨਾਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਧੁਨੀ ਨਾ ਵਜਾਉਣ ਦਿਓ, ਥਰਥਰਾਹਟ ਨਾ ਕਰਨ ਦਿਓ ਜਾਂ ਝਲਕ ਨਾ ਵਿਖਾਉਣ ਦਿਓ।"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ਸੂਚਨਾ ਸਹਾਇਕ"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਐਕਸੈਸ"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ਕਿਸੇ ਵੀ ਸਥਾਪਿਤ ਐਪਸ ਨੇ ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਐਕਸੈਸ ਦੀ ਬੇਨਤੀ ਨਹੀਂ ਕੀਤੀ ਹੈ"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ਐਪਸ ਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ਵੱਲੋਂ ਇਸ ਐਪ ਦੀਆਂ ਸੂਚਨਾਵਾਂ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਵਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ਵੱਲੋਂ ਸੂਚਨਾਵਾਂ ਦੀ ਇਸ ਸ਼੍ਰੇਣੀ ਨੂੰ ਇਸ ਡੀਵਾਈਸ \'ਤੇ ਵਿਖਾਏ ਜਾਣ ਤੋਂ ਰੋਕਿਆ ਜਾ ਰਿਹਾ ਹੈ"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ਸ਼੍ਰੇਣੀਆਂ"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ਹੋਰ"</string>
     <string name="no_channels" msgid="3077375508177744586">"ਇਸ ਐਪ ਨੇ ਕੋਈ ਵੀ ਸੂਚਨਾਵਾਂ ਪੋਸਟ ਨਹੀਂ ਕੀਤੀਆਂ ਹਨ"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ਮੌਜੂਦਾ ਅਨੁਕੂਲਨ ਵਿੱਚ ਰਹੋ"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ਸੁਰੱਖਿਅਤ ਸ਼ੁਰੂਆਤ"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ਜਾਰੀ ਰੱਖੋ"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਸਟਾਰਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣੇ PIN ਦੀ ਮੰਗ ਕਰਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਸਟਾਰਟ ਅਪ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਅਲਾਰਮਾਂ ਸਮੇਤ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਸਟਾਰਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣੇ PIN ਦੀ ਮੰਗ ਕਰਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਸਟਾਰਟ ਅਪ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਅਲਾਰਮਾਂ ਸਮੇਤ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਸਟਾਰਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਮੰਗ ਕਰਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਸਟਾਰਟ ਅਪ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਅਲਾਰਮਾਂ ਸਮੇਤ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਸਟਾਰਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣੇ PIN ਦੀ ਮੰਗ ਕਰਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਸਟਾਰਟ ਅਪ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਅਲਾਰਮਾਂ ਸਮੇਤ।\n\nਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਸਟਾਰਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣੇ ਪੈਟਰਨ ਦੀ ਮੰਗ ਕਰਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਸਟਾਰਟ ਅਪ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਅਲਾਰਮਾਂ ਸਮੇਤ।\n\nਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਵਰਤਣ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਸਟਾਰਟ ਅਪ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣੇ ਪਾਸਵਰਡ ਦੀ ਮੰਗ ਕਰਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਕਰ ਸਕਦੇ ਹੋ ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਸਟਾਰਟ ਅਪ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ, ਅਲਾਰਮਾਂ ਸਮੇਤ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ।"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"ਡੀਵਾਈਸ ਚਾਲੂ ਕਰਨ ਲਈ PIN ਲੁੜੀਂਦਾ"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"ਡੀਵਾਈਸ ਚਾਲੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਲੋੜੀਂਦਾ ਬਣਾਓ"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"ਨਹੀਂ ਧੰਨਵਾਦ"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਸ਼ੁਰੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ। \n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਤੋਂ ਇਲਾਵਾ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਸਮੇਂ PIN ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪੈਟਰਨ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ਆਪਣੀ ਡੀਵਾਈਸ ਨੂੰ ਅਨਲੌਕ ਕਰਨ ਲਈ ਆਪਣੇ ਫਿੰਗਰਪ੍ਰਿੰਟ ਦੀ ਵਰਤੋਂ ਕਰਨ ਦੇ ਨਾਲ-ਨਾਲ, ਤੁਸੀਂ ਇਸ ਡੀਵਾਈਸ ਦੇ ਚਾਲੂ ਹੋਣ ਤੋਂ ਪਹਿਲਾਂ ਆਪਣਾ ਪਾਸਵਰਡ ਦਾਖਲ ਕਰਨਾ ਲੋੜੀਂਦਾ ਬਣਾਕੇ ਇਸਨੂੰ ਹੋਰ ਸੁਰੱਖਿਅਤ ਬਣਾ ਸਕਦੇ ਹੋ। ਜਦੋਂ ਤੱਕ ਡੀਵਾਈਸ ਚਾਲੂ ਨਹੀਂ ਹੁੰਦੀ, ਇਹ ਅਲਾਰਮਾਂ ਸਹਿਤ, ਕਾਲਾਂ, ਸੁਨੇਹੇ ਜਾਂ ਸੂਚਨਾਵਾਂ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕਦੀ।\n\nਇਹ ਗੁਆਚੀਆਂ ਜਾਂ ਚੋਰੀ ਹੋਈਆਂ ਡੀਵਾਈਸਾਂ \'ਤੇ ਡੈਟਾ ਸੁਰੱਖਿਅਤ ਕਰਨ ਵਿੱਚ ਸਹਾਇਤਾ ਕਰਦਾ ਹੈ। ਤੁਹਾਡੀ ਡੀਵਾਈਸ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ ਪਾਸਵਰਡ ਲੋੜੀਂਦਾ ਬਣਾਈਏ?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ਹਾਂ"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"ਨਹੀਂ"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ਕੀ PIN ਲੁੜੀਂਦਾ ਹੈ?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ਕੀ ਪੈਟਰਨ ਦੀ ਲੋੜ ਹੈ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ਕੀ ਪਾਸਵਰਡ ਦੀ ਲੋੜ ਹੈ?"</string>
@@ -3076,7 +3073,7 @@
     <string name="default_app" msgid="6864503001385843060">"(ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
     <string name="system_app" msgid="9068313769550747372">"(ਸਿਸਟਮ)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(ਸਿਸਟਮ ਪੂਰਵ-ਨਿਰਧਾਰਤ)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"ਐਪਸ ਸਟੋਰੇਜ"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"ਐਪਾਂ ਸਟੋਰੇਜ"</string>
     <string name="usage_access" msgid="5479504953931038165">"ਉਪਯੋਗਤਾ ਐਕਸੈਸ"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"ਪਰਮਿਟ ਉਪਭੋਗਤਾ ਐਕਸੈਸ"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"ਐਪ ਉਪਯੋਗਤਾ ਪਸੰਦ"</string>
@@ -3128,7 +3125,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"ਇਸ ਡੀਵਾਈਸ ਦੀ MIDI ਵਜੋਂ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="usb_use" msgid="3256040963685055320">"ਇਹਨਾਂ ਲਈ USB ਦੀ ਵਰਤੋਂ ਕਰੋ"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰਨ ਲਈ"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਚਾਰਜ ਕਰ ਰਹੀ ਹੈ"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"ਪਾਵਰ ਸਪਲਾਈ ਕਰਨ ਲਈ"</string>
     <string name="usb_summary_file_transfers" msgid="6435943692610175111">"ਫ਼ਾਈਲਾਂ ਦਾ ਤਬਾਦਲਾ ਕਰਨ ਲਈ"</string>
     <string name="usb_summary_photo_transfers" msgid="8440204169576585250">"ਫ਼ੋਟੋਆਂ ਦਾ ਤਬਾਦਲਾ ਕਰਨ ਲਈ (PTP)"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"ਹਾਂ"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"ਨਹੀਂ"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"ਐਪ ਸਥਾਪਿਤ ਕਰਨ ਦੀ ਇਜਾਜ਼ਤ ਦਿਓ"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"ਇਜਾਜ਼ਤ ਹੈ"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"ਇਜਾਜ਼ਤ ਨਹੀਂ"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"ਕੈਮਰੇ ਲਈ ਪਾਵਰ ਬਟਨ ਨੂੰ ਦੋ ਵਾਰੀ ਦਬਾਓ"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"ਇਸ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ ਗਿਆ"</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>
@@ -3572,7 +3570,7 @@
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"ਫ਼ੋਨ ਸਟੋਰੇਜ"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> ਵਿੱਚੋਂ ਵਰਤਿਆ"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"ਵਰਤਿਆ ਗਿਆ"</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"ਵਰਤੀ ਗਈ"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"ਐਪ ਕਲੀਅਰ ਕਰੋ"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ਕੀ ਤੁਸੀਂ ਇਸ \'ਤਤਕਾਲ ਐਪ\' ਨੂੰ ਹਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"ਗੇਮਾਂ"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ਵਰਤੋਂਕਾਰ <xliff:g id="USER">%s</xliff:g> ਲਈ ਅਯੋਗ ਬਣਾਈ)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ਆਟੋਫਿਲ ਸੇਵਾ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ਆਟੋ, ਫਿਲ, ਆਟੋਫਿਲ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"ਕੀ <xliff:g id="APP_NAME_0">%1$s</xliff:g> ਨੂੰ ਆਪਣੀ ਆਟੋਫਿਲ ਐਪ ਬਣਾਉਣਾ ਹੈ? <xliff:g id="APP_NAME_1">%1$s</xliff:g> ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ ਨੂੰ ਪੜ੍ਹ ਸਕੇਗੀ ਅਤੇ ਹੋਰ ਐਪਾਂ ਵਿੱਚ ਖੇਤਰਾਂ ਨੂੰ ਭਰ ਸਕੇਗੀ।"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ਯਕੀਨੀ ਬਣਾਓ ਕਿ ਤੁਸੀਂ ਇਸ ਐਪ \'ਤੇ ਭਰੋਸਾ ਕਰਦੇ ਹੋ&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ਐਪ ਤੁਹਾਡੀ ਸਕ੍ਰੀਨ \'ਤੇ ਮੌਜੂਦ ਆਪਣੇ-ਆਪ ਭਰੀਆਂ ਜਾ ਸਕਣ ਵਾਲੀਆਂ ਥਾਂਵਾਂ ਦਾ ਪਤਾ ਲਗਾਉਂਦੀ ਹੈ।"</string>
     <string name="device_theme" msgid="4571803018917608588">"ਡੀਵਾਈਸ ਥੀਮ"</string>
     <string name="default_theme" msgid="7085644992078579076">"ਪੂਰਵ-ਨਿਰਧਾਰਤ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ਸਟੋਰੇਜ ਪ੍ਰਬੰਧਕ: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 68794c0..db6284c 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Brak"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Brak"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index ffaa833..6dcb86f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -111,7 +111,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Rozłączyć?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Spowoduje to zakończenie połączenia z urządzeniem:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Nie masz uprawnień, by zmienić ustawienia Bluetootha."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jest widoczne na urządzenia w pobliżu, gdy ustawienia Bluetooth są otwarte."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"Urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> jest widoczne dla urządzeń w pobliżu, gdy ustawienia Bluetooth są otwarte."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Odłączyć urządzenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Transmisja"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wyłączyć profil?"</string>
@@ -333,20 +333,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konta"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokalizacja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konta"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Lokalizacja i blokady"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Szyfrowanie i dane logowania"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon zaszyfrowany"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon zaszyfrowany"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Ustawienia ekranu blokady"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych logowania"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Prywatność"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Wyłączone przez administratora"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stan zabezpieczeń"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Blokada ekranu, odcisk palca"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Blokada ekranu"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Odcisk palca"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Zarządzaj odciskami"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Używaj odcisku palca do"</string>
@@ -670,7 +669,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Jako telefon w trybie głośnika"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Dla muzyki i multimediów"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Zapamiętaj ustawienia"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Prześlij ekran"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Przesyłanie ekranu"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Wyświetlacz bezprzewodowy"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Brak urządzeń w pobliżu."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Łączenie"</string>
@@ -697,7 +696,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Wyłączona"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Niedostępne przy wyłączonym NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając je do siebie. Możliwe jest na przykład przesłanie stron z internetowych, filmów z YouTube, kontaktów itp.\n\nWystarczy zetknąć urządzenia ze sobą i kliknąć ekran. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Po włączeniu tej funkcji możesz przesyłać dane między urządzeniami z funkcją NFC, zbliżając je do siebie. Możliwe jest na przykład przesłanie stron internetowych, filmów z YouTube, kontaktów itp.\n\nWystarczy zetknąć urządzenia ze sobą i kliknąć ekran. Aplikacja automatycznie określi, jakie dane chcesz przesłać."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Włącz Wi-Fi"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -714,6 +713,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Powiadamiaj o dostępnej publicznej sieci wysokiej jakości"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Włącz Wi-Fi automatycznie"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi włączy się w pobliżu zapisanych sieci wysokiej jakości, takich jak Twoja sieć domowa"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Niedostępna, bo skanowanie Wi-Fi jest wyłączone"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Unikaj słabych połączeń"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nie używaj sieci Wi-Fi, jeśli połączenie jest słabe"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Używaj tylko sieci z dobrym połączeniem internetowym"</string>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Skonfiguruj Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsieci"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Zapisane sieci"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Ustawienia adresu IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Zaawansowane ustawienia Wi‑Fi są niedostępne dla tego użytkownika"</string>
@@ -1041,13 +1039,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Wył."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Włącz wygaszacz ekranu, by kontrolować to, co dzieje się, gdy telefon jest w stacji dokującej i/lub w trybie uśpienia."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kiedy zacząć"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Bieżący wygaszacz ekranu"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Zacznij teraz"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ustawienia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Podnieś, by wybudzić"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Ekran przychodzącego powiadomienia"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ekran dostosowany do otoczenia"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Włącz ekran po otrzymaniu powiadomień"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Powiększ lub pomniejsz tekst"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_external_title" msgid="3433462910096848696">"Pamięć przenośna"</string>
     <string name="storage_volume_summary" msgid="7023441974367853372">"Wykorzystane <xliff:g id="USED">%1$s</xliff:g> z <xliff:g id="TOTAL">%2$s</xliff:g>"</string>
     <string name="storage_size_large" msgid="5691585991420946254">"<xliff:g id="NUMBER">^1</xliff:g>"<small><small>" <xliff:g id="UNIT">^2</xliff:g>"</small></small>""</string>
-    <string name="storage_volume_used" msgid="1303803057698959872">"Wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_used" msgid="1303803057698959872">"wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_volume_used_total" msgid="6113121714019000244">"Łącznie wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_mount_success" msgid="687641090137253647">"Podłączono: <xliff:g id="NAME">%1$s</xliff:g>"</string>
     <string name="storage_mount_failure" msgid="1042621107954547316">"Nie udało się podłączyć: <xliff:g id="NAME">%1$s</xliff:g>"</string>
@@ -1362,19 +1359,19 @@
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"Podłącz, by uruchomić"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"Błąd tetheringu przez USB"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Tethering przez Bluetooth"</string>
-    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Udostępniam poł. internetowe tabletu (Bluetooth)"</string>
-    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Udostępniam poł. internetowe telefonu (Bluetooth)"</string>
+    <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"Udostępniam połączenie internetowe tabletu przez Bluetooth"</string>
+    <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"Udostępniam połączenie internetowe telefonu przez Bluetooth"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"Udostępniam poł. internetowe tabletu jednemu urządzeniu (Bluetooth)"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="default" msgid="5970460338828861091">"Udostępniam poł. internetowe telefonu jednemu urządzeniu (Bluetooth)"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Udostępniam poł. internetowe tabletu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> urządzeniom (Bluetooth)"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Udostępniam poł. internetowe telefonu <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> urządzeniom (Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Udostępniam poł. internetowe urządzenia <xliff:g id="DEVICE_NAME">%1$d</xliff:g> (Bluetooth)"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Nie udostępniam poł. internetowego tabletu (Bluetooth)"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Nie udostępniam poł. internetowego telefonu przez Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Udostępniam połączenie internetowe urządzenia <xliff:g id="DEVICE_NAME">%1$d</xliff:g> przez Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Nie udostępniam połączenia internetowego na tablecie przez Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Nie udostępniam połączenia internetowego w telefonie przez Bluetooth"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Brak powiązania"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Nie można powiązać więcej niż <xliff:g id="MAXCONNECTION">%1$d</xliff:g> urządzeń."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Powiązanie z urządzeniem <xliff:g id="DEVICE_NAME">%1$s</xliff:g> zostanie anulowane."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Funkcje hotspotu i tetheringu pozwalają zapewnić połączenie internetowe innym urządzeniom z wykorzystaniem komórkowego połączenia danych."</string>
+    <string name="tethering_footer_info" msgid="7287131664937054043">"Funkcje hotspotu i tetheringu pozwalają zapewnić połączenie internetowe innym urządzeniom z wykorzystaniem komórkowej transmisji danych."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomoc"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Sieć komórkowa"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Taryfa komórkowa"</string>
@@ -1517,7 +1514,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Taka sama jak blokada ekranu urządzenia"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Zarządzaj aplikacjami"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Zarządzaj zainstalowanymi aplikacjami i usuwaj je."</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Informacje o aplikacji"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Informacje o aplikacjach"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Zarządzaj aplikacjami, konfiguruj skróty szybkiego uruchamiania."</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ustawienia aplikacji"</string>
     <string name="install_applications" msgid="4872012136210802181">"Nieznane źródła"</string>
@@ -1645,6 +1642,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Sklep"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Szczegóły aplikacji"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacja zainstalowana z: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Więcej informacji w: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Działania aplikacji"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Trwa"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nieużywana)"</string>
@@ -1721,7 +1719,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomocnicze skróty klawiszowe"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Wyświetl dostępne skróty"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Domyślnie"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mysz/touchpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Szybkość wskaźnika"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontroler gier"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Użyj wibracji"</string>
@@ -1789,7 +1786,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Ułatwienia dostępu"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Ustawienia ułatwień dostępu"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Czytniki ekranu, wyświetlacz, sterowanie interakcją"</string>
-    <string name="vision_settings_title" msgid="4204111425716868288">"Ustawienia widoczności"</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="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>
@@ -1802,7 +1799,7 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Klikaj elementy na ekranie, by posłuchać ich nazw czytanych na głos"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Napisy"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Powiększenie"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Powiększ trzykrotnym kliknięciem"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Powiększ 3-krotnym kliknięciem"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Powiększ przyciskiem"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Powiększ przyciskiem i trzykrotnym kliknięciem"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Powiększenie na ekranie"</string>
@@ -1825,7 +1822,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Czas dotknięcia i przytrzymania"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inwersja kolorów"</string>
     <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 przestanie się poruszać"</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>
@@ -1925,7 +1922,7 @@
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Ustawienia"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Dodaj drukarki"</string>
     <string name="print_feature_state_on" msgid="8098901852502441048">"Włączone"</string>
-    <string name="print_feature_state_off" msgid="7294876968403966040">"Wyłączone"</string>
+    <string name="print_feature_state_off" msgid="7294876968403966040">"Wyłączona"</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Dodaj usługę"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Dodaj drukarkę"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Szukaj"</string>
@@ -1957,8 +1954,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Wykorzystanie przez ekran od ostatniego naładowania"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Zużycie przez ekran"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanowanie sieci komórkowej"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> temu"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Wykorzystanie przez aplikacje od pełnego naładowania (<xliff:g id="TIME">%1$s</xliff:g> temu)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> temu"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Wykorzystanie od pełnego naładowania (<xliff:g id="TIME">^1</xliff:g> temu)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Czas włączenia ekranu od pełnego naładowania"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Wykorzystanie przez urządzenie od ostatniego naładowania"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Użycie baterii od odłączenia"</string>
@@ -1978,7 +1975,7 @@
     <string name="awake" msgid="387122265874485088">"Czas aktywności urządzenia"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Czas z włączonym Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Czas z wł. Wi-Fi"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Zaawansowane informacje o użytkowaniu baterii"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Zużycie baterii – szczegóły"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Historia – szczegóły"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Wykorzystanie baterii"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Szczegóły użycia"</string>
@@ -1989,7 +1986,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Aparat"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Tryb gotowości"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Tryb gotowości w sieci komórkowej"</string>
     <string name="power_phone" msgid="5392641106474567277">"Połączenia głosowe"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet nieaktywny"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon nieaktywny"</string>
@@ -2049,7 +2046,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Użycie baterii oznacza przybliżone zużycie energii i nie uwzględnia wszystkich źródeł zasilanych z baterii. „Inne” to różnica między obliczonym w przybliżeniu zużyciem energii a faktycznym wyczerpaniem baterii."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Zużycie energii obliczone z nadmiarem"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Wykorzystane w ciągu %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Korzystanie przez <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> zużyte przez: <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> całkowitego zużycia baterii"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Zestawienie od ostatniego pełnego naładowania"</string>
@@ -2105,7 +2102,7 @@
     <string name="mem_use_zram_type" msgid="9087217476795358232">"Partycja wymiany modułu ZRam"</string>
     <string name="mem_use_free_type" msgid="717708548454880840">"Wolna"</string>
     <string name="mem_use_total" msgid="6308786055749777934">"Ogółem"</string>
-    <string name="menu_duration_3h" msgid="4714866438374738385">"3 godziny"</string>
+    <string name="menu_duration_3h" msgid="4714866438374738385">"3 godzin"</string>
     <string name="menu_duration_6h" msgid="1940846763432184132">"6 godzin"</string>
     <string name="menu_duration_12h" msgid="7890465404584356294">"12 godzin"</string>
     <string name="menu_duration_1d" msgid="3393631127622285458">"24 godziny"</string>
@@ -2121,7 +2118,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ustawienia funkcji głosowych"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Wyszukiwanie głosowe"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Klawiatura Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Mowa"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Ustawienia wprowadzania głosowego"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Rozpoznawanie mowy"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Usługi rozpoznawania mowy"</string>
@@ -2461,7 +2457,7 @@
     <string name="vpn_menu_edit" msgid="408275284159243490">"Edytuj profil"</string>
     <string name="vpn_menu_delete" msgid="8098021690546891414">"Usuń profil"</string>
     <string name="vpn_menu_lockdown" msgid="7863024538064268139">"Stały VPN"</string>
-    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Brak dodanych sieci VPN."</string>
+    <string name="vpn_no_vpns_added" msgid="5002741367858707244">"Brak dodanych sieci VPN"</string>
     <string name="vpn_always_on_summary" msgid="2821344524094363617">"Zawsze utrzymuj połączenie z VPN"</string>
     <string name="vpn_always_on_summary_not_supported" msgid="592304911378771510">"Nieobsługiwane przez tę aplikację"</string>
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Stały (aktywny)"</string>
@@ -2604,7 +2600,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Użyj domyślnej"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Zawsze"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Z wyjątkiem, gdy jest otwarta inna aplikacja płatnicza"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Na terminalu „Zbliż i zapłać” zapłać przy użyciu:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Na terminalu „Zbliż i zapłać” płać przy użyciu:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Płacenie przy terminalu"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Skonfiguruj aplikację płatniczą, a później przyłóż tylną część telefonu do terminala z symbolem płatności zbliżeniowej."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"OK"</string>
@@ -2783,6 +2779,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Głośność powiadomień"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Domyślny dźwięk powiadomienia"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Dźwięk z aplikacji"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Domyślny dźwięk powiadomienia"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Domyślny dźwięk alarmu"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Wibracja przy połączeniach"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Inne dźwięki"</string>
@@ -2795,7 +2793,7 @@
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Głośnik w doku odtwarza"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Wszystkie dźwięki"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Tylko dźwięk multimediów"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Cichy"</string>
+    <string name="emergency_tone_silent" msgid="1067515631635824291">"Bez dźwięku"</string>
     <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
     <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Wibracje"</string>
     <string name="boot_sounds_title" msgid="567029107382343709">"Włącz dźwięki"</string>
@@ -2815,7 +2813,7 @@
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"Tylko alarmy"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"Całkowita cisza"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>: <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
-    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokuj czynniki wizualne"</string>
+    <string name="zen_mode_visual_interruptions_settings_title" msgid="6751708745442997940">"Blokuj wyświetlanie"</string>
     <string name="sound_work_settings" msgid="6774324553228566442">"Dźwięki w profilu do pracy"</string>
     <string name="work_use_personal_sounds_title" msgid="1148331221338458874">"Użyj dźwięków z profilu osobistego"</string>
     <string name="work_use_personal_sounds_summary" msgid="6207040454949823153">"Dźwięki są takie same w profilu osobistym i do pracy"</string>
@@ -2846,6 +2844,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Jak mają pokazywać się powiadomienia z profilu, gdy urządzenie jest zablokowane?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Powiadomienia z profilu"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Powiadomienia"</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_blocked" msgid="7938180808339386300">"Nigdy nie pokazuj powiadomień"</string>
@@ -2853,10 +2852,10 @@
     <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_min_summary" msgid="8233873580287975662">"Niska: brak dźwięku i komunikatów wizualnych"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Średnia: bez dźwięku"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Wysoka: sygnalizuj dźwiękiem"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Pilny: sygnalizuj dźwiękiem i wyświetl komunikat"</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="6585849855452076626">"Pozwalaj 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="default_notification_assistant" msgid="7631945224761430146">"Asystent powiadomień"</string>
@@ -2868,7 +2867,7 @@
       <item quantity="other">%d aplikacji może odczytywać powiadomienia</item>
       <item quantity="one">%d aplikacja może odczytywać powiadomienia</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do powiadomień."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do powiadomień."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Zezwolić usłudze <xliff:g id="SERVICE">%1$s</xliff:g> na dostęp do powiadomień?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"Aplikacja <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> będzie mogła czytać wszystkie powiadomienia, w tym informacje osobiste, takie jak nazwy kontaktów i treść otrzymywanych wiadomości. Będzie też mogła odrzucać powiadomienia lub używać zawartych w nich przycisków czynności. \n\nDodatkowo aplikacja będzie mogła włączać lub wyłączać opcję Nie przeszkadzać i zmieniać powiązane ustawienia."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Jeśli wyłączysz dostęp do powiadomień dla aplikacji <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, możesz również wyłączyć opcję Nie przeszkadzać."</string>
@@ -2892,6 +2891,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokuje powiadomienia z tej aplikacji na urządzeniu"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokuje tę kategorię powiadomień na urządzeniu"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Inne"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ta aplikacja nie opublikowała żadnych powiadomień"</string>
@@ -3033,18 +3034,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Pozostaw obecną orientację"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Bezpieczne uruchamianie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Dalej"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Możesz wzmocnić ochronę urządzenia przez wymaganie kodu PIN do jego uruchomienia. Dopiero po uruchomieniu urządzenie może odbierać połączenia, wiadomości czy powiadomienia, w tym alarmy. \n\nZwiększa to bezpieczeństwo danych na zgubionym lub skradzionym urządzeniu."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Możesz wzmocnić ochronę urządzenia przez wymaganie wzoru do jego uruchomienia. Dopiero po uruchomieniu urządzenie może odbierać połączenia, wiadomości czy powiadomienia, w tym alarmy. \n\nZwiększa to bezpieczeństwo danych na zgubionym lub skradzionym urządzeniu."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Możesz wzmocnić ochronę urządzenia przez wymaganie hasła do jego uruchomienia. Dopiero po uruchomieniu urządzenie może odbierać połączenia, wiadomości czy powiadomienia, w tym alarmy. \n\nZwiększa to bezpieczeństwo danych na zgubionym lub skradzionym urządzeniu."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Jeśli korzystasz z funkcji odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania kodu PIN przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Jeśli korzystasz z funkcji odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania wzoru przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Jeśli korzystasz z funkcji odblokowywania odciskiem palca, dla większego bezpieczeństwa możesz wymagać podania hasła przed uruchomieniem urządzenia. Dopóki urządzenie nie zostanie uruchomione, nie może odbierać połączeń, wiadomości ani powiadomień (w tym alarmów).\n\nPomaga to chronić dane na zgubionych lub skradzionych urządzeniach."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Wymagaj kodu PIN przy włączaniu urządzenia"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Wymagaj wzoru przy włączaniu urządzenia"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Wymagaj hasła przy włączaniu urządzenia"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nie, dziękuję"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nie, dziękuję"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nie, dziękuję"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Możesz jeszcze lepiej zabezpieczyć urządzenie, wymuszając wpisanie kodu PIN przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości i powiadomień (w tym alarmów). \n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Możesz jeszcze lepiej zabezpieczyć urządzenie, wymuszając narysowanie wzoru przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości i powiadomień (w tym alarmów). \n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Możesz jeszcze lepiej zabezpieczyć urządzenie, wymuszając podanie hasła przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości i powiadomień (w tym alarmów). \n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Oprócz odblokowywania urządzenia odciskiem palca, możesz jeszcze lepiej zabezpieczyć urządzenie, wymuszając wpisanie kodu PIN przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości i powiadomień (w tym alarmów). \n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Oprócz odblokowywania urządzenia odciskiem palca, możesz jeszcze lepiej zabezpieczyć urządzenie, wymuszając narysowanie wzoru przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości i powiadomień (w tym alarmów). \n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Oprócz odblokowywania urządzenia odciskiem palca, możesz jeszcze lepiej zabezpieczyć urządzenie, wymuszając podanie hasła przed uruchomieniem. Do czasu uruchomienia urządzenie nie może odbierać połączeń, wiadomości i powiadomień (w tym alarmów). \n\nTo pomaga zabezpieczyć dane na utraconych lub skradzionych urządzeniach. Wymagać hasła do uruchomienia urządzenia?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Tak"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nie"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Wymagać kodu PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Wymagać wzoru?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Wymagać hasła?"</string>
@@ -3251,15 +3248,15 @@
     <string name="work_profile_usage_access_warning" msgid="2918050775124911939">"Wyłączenie tej aplikacji dostępu do użytkowania nie uniemożliwi administratorowi śledzenia danych użytkowania aplikacji, które zostały dodane do Twojego profilu do pracy"</string>
     <string name="accessibility_lock_screen_progress" msgid="2408292742980383166">"Wykorzystałeś <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g> znaków"</string>
     <string name="draw_overlay" msgid="6564116025404257047">"Wyświetlanie nad innymi"</string>
-    <string name="system_alert_window_settings" msgid="8466613169103527868">"Wyświetlaj nad innymi aplikacjami"</string>
+    <string name="system_alert_window_settings" msgid="8466613169103527868">"Wyświetlanie nad innymi aplikacjami"</string>
     <string name="system_alert_window_apps_title" msgid="7005760279028569491">"Aplikacje"</string>
-    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Wyświetlane nad innymi aplikacjami"</string>
+    <string name="system_alert_window_access_title" msgid="6297115362542361241">"Wyświetlanie nad innymi aplikacjami"</string>
     <string name="permit_draw_overlay" msgid="7456536798718633432">"Pozwól na wyświetlanie nad innymi aplikacjami"</string>
     <string name="app_overlay_permission_preference" msgid="9039432222453006038">"Uprawnienie aplikacji do wyśw. nad innymi"</string>
     <string name="allow_overlay_description" msgid="8961670023925421358">"Pozwala aplikacji na wyświetlanie się nad innymi aplikacjami, których właśnie używasz. Może zakłócać korzystanie z innych aplikacji oraz wpływać na ich wygląd lub sposób działania."</string>
     <string name="keywords_vr_listener" msgid="7441221822576384680">"vr rzeczywistość wirtualna odbiornik stereo usługa pomocnicza"</string>
     <string name="keywords_system_alert_window" msgid="5049498015597864850">"system alert okno okno dialogowe wyświetlać nad innymi aplikacjami"</string>
-    <string name="overlay_settings" msgid="6930854109449524280">"Wyświetlaj nad innymi"</string>
+    <string name="overlay_settings" msgid="6930854109449524280">"Wyświetlanie nad innymi"</string>
     <string name="system_alert_window_summary" msgid="602892301318324492">"Aplikacje, które mogą wyświetlać się nad innymi: <xliff:g id="COUNT_0">%1$d</xliff:g> z <xliff:g id="COUNT_1">%2$d</xliff:g>"</string>
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplikacje z uprawnieniami"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Tak"</string>
@@ -3278,14 +3275,14 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To uprawnienie umożliwia aplikacji modyfikowanie ustawień systemu."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Tak"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Tak"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nie"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Pozwól na instalowanie aplikacji"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Dozwolone"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Niedozwolone"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Zezwól z tego źródła"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dwukrotny obrót otwiera aparat"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otwórz aplikację aparatu, obracając dwukrotnie nadgarstkiem"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Aparat: dwa razy naciśnij przycisk zasilania"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Szybko uruchom aparat bez odblokowywania ekranu"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"Rozmiar wyświetlacza"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Rozmiar interfejsu"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Powiększ lub pomniejsz elementy na ekranie"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"wyświetlacz, gęstość, powiększenie ekranu, skala, skalowanie"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"Powiększ lub pomniejsz elementy na ekranie. Niektóre aplikacje na ekranie głównym mogą przesunąć się w inne miejsce."</string>
@@ -3470,11 +3467,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Pomoc"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Najmniejsza szerokość"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Żadna z zainstalowanych aplikacji nie prosiła o dostęp do SMS-ów specjalnych"</string>
+    <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_connected_summary" msgid="8733997010923307915">"Połączono z"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Kafelki szybkich ustawień dla programisty"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Chętnie Ci pomożemy"</string>
@@ -3556,7 +3554,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Aby szybko sprawdzić powiadomienia, podnieś telefon."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Aby szybko sprawdzić powiadomienia, podnieś tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Aby szybko sprawdzić powiadomienia, podnieś urządzenie."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Przesuń palcem, by zobaczyć powiadomienia"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Sprawdzanie powiadomień"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu telefonu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu tabletu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Aby sprawdzić powiadomienia, przesuń palcem w dół na czytniku linii papilarnych z tyłu urządzenia."</string>
@@ -3673,7 +3671,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Pamięć w tablecie"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Pamięć telefonu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"wykorzystane z <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"miejsca"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Wyczyść dane aplikacji"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Czy chcesz usunąć tę aplikację błyskawiczną?"</string>
@@ -3683,7 +3681,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> – wyłączono)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Usługa autouzupełniania"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatyczne, uzupełnianie, autouzupełnianie"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Czy <xliff:g id="APP_NAME_0">%1$s</xliff:g> ma być Twoją aplikacją do autouzupełniania? <xliff:g id="APP_NAME_1">%1$s</xliff:g> będzie czytać zawartość ekranu i wypełniać pola w innych aplikacjach."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sprawdź, czy ta aplikacja jest zaufana&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Autouzupełnianie Google&gt;%1$s&lt;/xliff:g&gt; na podstawie zawartości ekranu określa, co można uzupełnić automatycznie."</string>
     <string name="device_theme" msgid="4571803018917608588">"Motyw urządzenia"</string>
     <string name="default_theme" msgid="7085644992078579076">"Wartość domyślna"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menedżer miejsca: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 5f58703..fc59d59 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Nenhum"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nenhum"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index 6c51a66..330d65b 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Segurança e local"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Smartphone criptografado"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone criptografado"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferências da tela de bloqueio"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o 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="security_status_title" msgid="5848766673665944640">"Status da segurança"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueio de tela, impressão digital"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueio de tela"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerenciar impressões digitais"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impressão digital para"</string>
@@ -357,7 +356,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Basta tocar no sensor de impressão digital para autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Não é possível usar sua impressão digital para desbloquear este dispositivo. Para ver mais informações, entre em contato com o administrador da sua organização."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Pular"</string>
@@ -441,7 +440,7 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteger seu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Usar impressão digital"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear com sua impressão digital"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloqueio de tela"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Escolher bloq de trab."</string>
     <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>
@@ -458,7 +457,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar tela bloqueio"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desativar o padrão, o PIN ou a segurança da senha"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Escolha um método para bloquear a tela"</string>
-    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nenhuma"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nenhum"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Deslizar"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sem segurança"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notificar quando uma rede pública de alta qualidade estiver disponível"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ativar o Wi‑Fi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Reativar o Wi‑Fi automaticamente perto de redes salvas de alta qualidade como sua rede doméstica"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Indisponível porque a verificação Wi‑Fi está desativada"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexões ruins"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Não usar uma rede Wi-Fi a menos que tenha uma boa conexão com a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Use somente redes que têm uma boa conexão com a Internet"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Redes salvas"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configurações de IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"As configurações avançadas de Wi-Fi não estão disponíveis para esse usuário"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar o que acontece quando o smartphone está ancorado e/ou no modo de suspensão, ative o protetor de tela."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quando começar"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Protetor de tela atual"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Começar agora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Tela de notificação de entrada"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Exibição de ambiente"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Loja"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalhes do app"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App instalado a partir da <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Mais informações em <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operações de apps"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Em execução"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca usado)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Assistente de atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar atalhos disponíveis"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Padrão"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de jogos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibração"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da tela desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Câmera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Célula em espera"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Rede móvel em espera"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ocioso"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone ocioso"</string>
@@ -2007,14 +2004,14 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"O uso da bateria é uma estimativa do uso de energia e não inclui todas as fontes de consumo de bateria. \"Diversos\" refere-se à diferença entre a estimativa de uso de energia calculada e a utilização real observada na bateria."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Usada por %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"O tempo restante de bateria é aproximado e pode mudar de acordo com o uso"</string>
-    <string name="battery_detail_foreground" msgid="3350401514602032183">"Enquanto em uso ativo"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"Quando estiver em segundo plano"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"Ativo"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"Em segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso da bateria"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> do uso total do app (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Desde a carga completa"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configurações de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Fala"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Configurações da entrada de texto por voz"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Entrada de texto por voz"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Serviços de entrada de texto por voz"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificações"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Som de notificação padrão"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Som fornecido pelo app"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Som de notificação padrão"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Som de alarme padrão"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Também vibrar para chamadas"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Como você deseja que as notificações sejam exibidas quando o dispositivo estiver bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificações do perfil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificações"</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_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Baixa: sem som nem interrupção visual"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Média: sem som"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Alta: emitir som"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgente: emitir som e 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificação"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outros"</string>
     <string name="no_channels" msgid="3077375508177744586">"Este app não postou nenhuma notificação"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desativado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixação de tela"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Quando esta configuração está ativada, use a fixação de tela para manter a tela atual em exibição até ela ser liberada.\n\nPara usar a fixação de tela:\n\n1. Verifique se o recurso está ativado.\n\n2. Abra a tela que deseja fixar.\n\n3. Toque em \"Visão geral\".\n\n4. Deslize para cima e toque no ícone de alfinete."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Quando esta configuração está ativada, a tela fica fixa até que você a libere.\n\nPara usar a fixação de tela:\n\n1. Verifique se o recurso está ativado.\n\n2. Abra a tela que deseja fixar.\n\n3. Toque em \"Visão geral\".\n\n4. Deslize para cima e toque no ícone de alfinete."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pedir padrão de desbloqueio antes de desafixar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de desafixar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir senha antes de desafixar"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter a orientação atual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicialização segura"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Para proteger ainda mais o dispositivo, solicite um PIN ao ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Para proteger ainda mais o dispositivo, solicite um padrão ao ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Para proteger ainda mais o dispositivo, solicite uma senha ao ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo seu PIN antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo seu padrão antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Solicitar PIN para iniciar dispositivo"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Solicitar padrão para iniciar dispositivo"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Solicitar senha para iniciar dispositivo"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Não, obrigado."</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Não, obrigado."</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Não, obrigado."</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Para proteger ainda mais o dispositivo, solicite o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar o PIN para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Para proteger ainda mais o dispositivo, solicite um padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar um padrão para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Para proteger ainda mais o dispositivo, solicite uma senha antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar uma senha para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar o PIN para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando um padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar um padrão para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando uma senha antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar uma senha para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exigir PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Exigir padrão?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Exigir senha?"</string>
@@ -3128,7 +3125,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Usar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Usar USB para"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Carregamento deste dispositivo"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Para carregamento do dispositivo"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Fornecimento de energia"</string>
     <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>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Sim"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Não"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Permitir instalações de apps"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Permitido"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Não permitido"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Permitir desta fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Girar duas vezes para abrir a câmera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press. o botão liga/desliga duas vezes p/ abrir a câmera"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Conectado a"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Armazenamento do tablet"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazen. do smartphone"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Usados <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"Usados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Limpar app"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Deseja remover esse app instantâneo?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Serviço de preenchimento automático"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Tornar o <xliff:g id="APP_NAME_0">%1$s</xliff:g> seu app de preenchimento automático? O <xliff:g id="APP_NAME_1">%1$s</xliff:g> poderá ler sua tela e preencher campos em outros apps."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Você precisa confiar nesse app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
     <string name="default_theme" msgid="7085644992078579076">"Padrão"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gerenciador de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 3168905..c69a2e1 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Nenhum"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nenhum"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index de5beab..7a9dbfc 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Segurança e localização"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Encriptação e credenciais"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Dados do telemóvel encriptados"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Dados do telemóvel encriptados"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferências do ecrã de bloqueio"</string>
     <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="security_status_title" msgid="5848766673665944640">"Estado de segurança"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerir impressões dig."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impr. dig. para"</string>
@@ -353,7 +352,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> impressão digital configurada</item>
     </plurals>
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
-    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloq. c/ impressão digital"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"Desbloquear com impr. 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="4193477159493347679">"Basta tocar no sensor de impressões digitais para autorizar compras ou iniciar sessão em aplicações. Quaisquer impressões digitais adicionadas podem executar estas ações, pelo que deve ter cuidado com quem adiciona.\n\nNota: não é possível utilizar a sua impressão digital para desbloquear este dispositivo. Para mais informações, contacte o administrador da sua entidade."</string>
@@ -441,8 +440,8 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteger o dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Utilizar impressão digital"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear com a impressão digital"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Selec. bloq. do ecrã"</string>
-    <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Selec. bloq. trabalho"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloqueio de ecrã"</string>
+    <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Escolher bloqueio de trabalho"</string>
     <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>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notificar quando uma rede pública de alta qualidade estiver disponível"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ativar o Wi‑Fi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"O Wi‑Fi é reativado quando estiver perto de redes de alta qualidade guardadas, como a sua rede doméstica"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Não disponível porque a procura de Wi‑Fi está desativada"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar más ligações"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Não utilizar uma rede Wi-Fi exceto se tiver uma boa ligação à Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilize apenas redes com uma boa ligação à Internet"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar o Wi‑Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Redes guardadas"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Definições de IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"As definições avançadas de Wi-Fi não estão disponíveis para este utilizador"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desligado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar o que acontece quando o telemóvel está ancorado e/ou em suspensão, ative a proteção de ecrã."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quando iniciar"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Proteção de ecrã atual"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Iniciar agora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Definições"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ativar ao levantar"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Ecrã de notificações recebidas"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Visualização de ambiente"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar o ecrã quando recebe notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Aumentar ou diminuir o texto"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Loja"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalhes da aplicação"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplicação instalada a partir da <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Mais informações sobre <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Utilizações da aplicação"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Em execução"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca utilizado)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ajuda dos atalhos de teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar atalhos disponíveis"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predefinição"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Rato/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de Jogos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilizar vibração"</string>
@@ -1912,11 +1909,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"A aplicação pode ser executada em segundo plano quando não está a ser utilizada"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"A atividade em segundo plano da aplicação está limitada quando esta não está a ser utilizada"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"A aplicação não tem autorização para ser executada em segundo plano"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Utiliz. do ecrã desde o carregam. compl."</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Utilização do ecrã desde carregamento completo"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo do ecrã"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Procura de redes móveis"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilização de aplicações desde o carregamento completo (há <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilização de aplicações desde o carregamento completo (há <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tempo durante o qual o ecrã tem estado ativado desde o carregamento completo"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilização do dispositivo desde o carregamento completo"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Bateria utilizada desde que foi desligado"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Câmara"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"inactividade do telefone"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Modo de espera da rede móvel"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet inactivo"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone inactivo"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"A utilização da bateria é uma aproximação da utilização de energia e não inclui todas as fontes de descarregamento da bateria. Os diversos são a diferença entre a utilização de energia aproximada calculada e o descarregamento real observado na bateria."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Utilização de energia contabilizada em excesso"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Utilizada durante %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Utilizada durante <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> utilizado pela aplicação <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhes desde o último carregamento completo"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Definições de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa de voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado do Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Voz"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Definições de entrada de texto por voz"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Entrada de texto por voz"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Serviços de entrada de texto por voz"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Não foi possível apagar o armazenamento de credenciais."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"O armazenamento de credenciais está ativado."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Para poder utilizar o armazenamento de credenciais, é necessário definir primeiro um PIN ou palavra-passe do ecrã de bloqueio."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Aplic. com acesso de utiliz."</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Apps com acesso de utilização"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tom de emergência"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Definir o comportamento quando é efetuada uma chamada de emergência"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Cópia de segurança"</string>
@@ -2554,7 +2550,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Utilizar predefinição"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Sempre"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Exceto quanto estiver aberta outra aplicação de pagamento"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Num terminal compatível com a funcionalidade Tocar e pagar, pagar com:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Num terminal Tocar e pagar, pagar com:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Pagar num terminal"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Configure uma aplicação de pagamento. Basta aproximar a parte de trás do telemóvel a um terminal com o símbolo de contacto desnecessário."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Compreendi"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume de notificações"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Som de notificação predefinido"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Som fornecido pela aplicação"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Som de notificação predefinido"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Som de alarme predefinido"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrar também para chamadas"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Como pretende que as notificações do perfil sejam apresentadas quando o dispositivo está bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificações do perfil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificaçõ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_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Baixa: sem interrupção sonora ou visual"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Média: sem som"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Alta: emitir som"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgente: emitir som e 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificações"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está a bloquear a apresentação das notificações desta aplicação neste dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está a bloquear a apresentação desta categoria de notificações neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outra"</string>
     <string name="no_channels" msgid="3077375508177744586">"Esta aplicação não publicou notificações"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter na orientação atual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Arranque seguro"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"O utilizador pode proteger ainda mais este dispositivo, se solicitar o seu PIN antes do arranque. Até o dispositivo arrancar, não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"O utilizador pode proteger ainda mais este dispositivo se solicitar o seu padrão antes do arranque. Até o dispositivo arrancar, não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"O utilizador pode proteger ainda mais este dispositivo, se solicitar a sua palavra-passe antes do arranque. Até o dispositivo arrancar, não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Além de utilizar a sua impressão digital para desbloquear o dispositivo, pode proteger ainda mais o dispositivo ao solicitar o seu PIN antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados do dispositivo em caso de perda ou de roubo."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Além de utilizar a sua impressão digital para desbloquear o dispositivo, pode proteger ainda mais o dispositivo ao solicitar a sua sequência antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados do dispositivo em caso de perda ou de roubo."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Além de utilizar a sua impressão digital para desbloquear o dispositivo, pode proteger ainda mais o dispositivo ao solicitar a sua palavra-passe antes do arranque. Até que o dispositivo arranque, não pode receber chamadas, mensagens nem notificações, incluindo alarmes.\n\nIsso ajuda a proteger os dados do dispositivo em caso de perda ou de roubo."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Exigir PIN para iniciar o dispositivo"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Exigir sequência para iniciar o dispositivo"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Exigir palavra-passe para iniciar o dispositivo"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Não, obrigado"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Não, obrigado"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Não, obrigado"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Pode melhorar a proteção deste dispositivo através da solicitação do PIN antes do arranque do mesmo. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que o PIN seja solicitado para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Pode melhorar a proteção deste dispositivo através da solicitação do padrão antes do arranque do mesmo. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que o padrão seja solicitado para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Pode melhorar a proteção deste dispositivo através da solicitação da palavra-passe antes do arranque do mesmo. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Para além de utilizar a impressão digital para desbloquear o dispositivo, pode melhorar a proteção do mesmo através da solicitação do PIN antes do arranque. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que o PIN seja solicitado para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Para além de utilizar a impressão digital para desbloquear o dispositivo, pode melhorar a proteção do mesmo através da solicitação do padrão antes do arranque. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que o padrão seja solicitado para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Para além de utilizar a impressão digital para desbloquear o dispositivo, pode melhorar a proteção do mesmo através da solicitação da palavra-passe antes do arranque. Até arrancar, o dispositivo não pode receber chamadas, mensagens ou notificações, incluindo alarmes.\n\nIsto ajuda a proteger os dados em caso de perda ou roubo do dispositivo. Pretende que a palavra-passe seja solicitada para o arranque do dispositivo?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Solicitar PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Solicitar padrão?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Solicitar palavra-passe?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta autorização permite que uma aplicação modifique as definições do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Sim"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Não"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Permitir a instalação de aplicações"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Autorizada"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Não autorizada"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Permitir desta fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Torção dupla para a câmara"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir a aplicação de câmara ao torcer o dispositivo no seu pulso"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Premir ligar/desligar 2 vezes p/ câmara"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Ligado a"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mosaicos de definições rápidas do programador"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
@@ -3572,7 +3570,7 @@
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazenamento telemóvel"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Utilizado de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"utiliz."</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"utilizado"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Limpar aplicação"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Pretende remover esta aplicação instantânea?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Jogos"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativ. para o utilizador <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Serviço de preenchimento automático"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Pretende tornar o <xliff:g id="APP_NAME_0">%1$s</xliff:g> a sua aplicação de preenchimento automático? O <xliff:g id="APP_NAME_1">%1$s</xliff:g> será capaz de ler o ecrã e preencher campos noutras aplicações."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Certifique-se de que confia nesta aplicação&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; utiliza o que está no ecrã para determinar o que pode ser preenchido automaticamente."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predefinição"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gestor de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 5f58703..fc59d59 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Nenhum"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Nenhum"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 6c51a66..330d65b 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Contas"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Segurança e local"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptografia e credenciais"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Smartphone criptografado"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Smartphone criptografado"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferências da tela de bloqueio"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o 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="security_status_title" msgid="5848766673665944640">"Status da segurança"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Bloqueio de tela, impressão digital"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Bloqueio de tela"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Impressão digital"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gerenciar impressões digitais"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Usar impressão digital para"</string>
@@ -357,7 +356,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"Usar a impressão digital"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"Basta tocar no sensor de impressão digital para autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Não é possível usar sua impressão digital para desbloquear este dispositivo. Para ver mais informações, entre em contato com o administrador da sua organização."</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: Sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Basta tocar no sensor de impressão digital para desbloquear seu smartphone, autorizar compras ou fazer login em apps. Tome cuidado com as impressões digitais que adicionar. Uma única digital adicionada pode realizar todas essas ações.\n\nObservação: sua impressão digital pode ser menos segura que um PIN ou padrão forte."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Cancelar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Continuar"</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Pular"</string>
@@ -441,7 +440,7 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Proteger seu dispositivo"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Usar impressão digital"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Desbloquear com sua impressão digital"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloq. de tela"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Escolher bloqueio de tela"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Escolher bloq de trab."</string>
     <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>
@@ -458,7 +457,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Alterar tela bloqueio"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Alterar ou desativar o padrão, o PIN ou a segurança da senha"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Escolha um método para bloquear a tela"</string>
-    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nenhuma"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Nenhum"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Deslizar"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Sem segurança"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notificar quando uma rede pública de alta qualidade estiver disponível"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Ativar o Wi‑Fi automaticamente"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Reativar o Wi‑Fi automaticamente perto de redes salvas de alta qualidade como sua rede doméstica"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Indisponível porque a verificação Wi‑Fi está desativada"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitar conexões ruins"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Não usar uma rede Wi-Fi a menos que tenha uma boa conexão com a Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Use somente redes que têm uma boa conexão com a Internet"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurar Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Máscara de sub-rede"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Endereços IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Redes salvas"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Configurações de IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"As configurações avançadas de Wi-Fi não estão disponíveis para esse usuário"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Desativado"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Para controlar o que acontece quando o smartphone está ancorado e/ou no modo de suspensão, ative o protetor de tela."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Quando começar"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Protetor de tela atual"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Começar agora"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Configurações"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Levantar para ativar"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Tela de notificação de entrada"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Exibição de ambiente"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Ativar a tela ao receber notificações"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Tornar o texto maior ou menor"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Loja"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalhes do app"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"App instalado a partir da <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Mais informações em <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operações de apps"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Em execução"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nunca usado)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Assistente de atalhos do teclado"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Mostrar atalhos disponíveis"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Padrão"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Velocidade do ponteiro"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controlador de jogos"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Usar vibração"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Uso da tela desde a carga completa"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumo da tela"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Verificação de rede móvel"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"Há <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Uso do app desde a carga completa (há <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Por quanto tempo a tela ficou ativada desde a carga completa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Uso do dispositivo desde a carga completa"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso da bateria desde a desconexão do aparelho"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Câmera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Célula em espera"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Rede móvel em espera"</string>
     <string name="power_phone" msgid="5392641106474567277">"Chamadas de voz"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet ocioso"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefone ocioso"</string>
@@ -2007,14 +2004,14 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"O uso da bateria é uma estimativa do uso de energia e não inclui todas as fontes de consumo de bateria. \"Diversos\" refere-se à diferença entre a estimativa de uso de energia calculada e a utilização real observada na bateria."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumo de energia superestimado"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Usada por %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Usada por <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> usado por <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> da bateria total"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detalhamento desde a última carga completa"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Última carga completa"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"O tempo restante de bateria é aproximado e pode mudar de acordo com o uso"</string>
-    <string name="battery_detail_foreground" msgid="3350401514602032183">"Enquanto em uso ativo"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"Quando estiver em segundo plano"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"Ativo"</string>
+    <string name="battery_detail_background" msgid="1929644393553768999">"Em segundo plano"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Uso da bateria"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> do uso total do app (<xliff:g id="POWER">%2$d</xliff:g>mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Desde a carga completa"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configurações de entrada e saída de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Pesquisa por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Fala"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Configurações da entrada de texto por voz"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Entrada de texto por voz"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Serviços de entrada de texto por voz"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificações"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Som de notificação padrão"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Som fornecido pelo app"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Som de notificação padrão"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Som de alarme padrão"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Também vibrar para chamadas"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Como você deseja que as notificações sejam exibidas quando o dispositivo estiver bloqueado?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificações do perfil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificações"</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_blocked" msgid="7938180808339386300">"Nunca mostrar notificações"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Baixa: sem som nem interrupção visual"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Média: sem som"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Alta: emitir som"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgente: emitir som e 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Assistente de notificação"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"O Android está impedindo que as notificações desse app sejam exibidas neste dispositivo"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"O Android está impedindo que essa categoria de notificações seja exibida neste dispositivo"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorias"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Outros"</string>
     <string name="no_channels" msgid="3077375508177744586">"Este app não postou nenhuma notificação"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Desativado"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Fixação de tela"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Quando esta configuração está ativada, use a fixação de tela para manter a tela atual em exibição até ela ser liberada.\n\nPara usar a fixação de tela:\n\n1. Verifique se o recurso está ativado.\n\n2. Abra a tela que deseja fixar.\n\n3. Toque em \"Visão geral\".\n\n4. Deslize para cima e toque no ícone de alfinete."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Quando esta configuração está ativada, a tela fica fixa até que você a libere.\n\nPara usar a fixação de tela:\n\n1. Verifique se o recurso está ativado.\n\n2. Abra a tela que deseja fixar.\n\n3. Toque em \"Visão geral\".\n\n4. Deslize para cima e toque no ícone de alfinete."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pedir padrão de desbloqueio antes de desafixar"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pedir PIN antes de desafixar"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pedir senha antes de desafixar"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manter a orientação atual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Inicialização segura"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuar"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Para proteger ainda mais o dispositivo, solicite um PIN ao ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Para proteger ainda mais o dispositivo, solicite um padrão ao ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Para proteger ainda mais o dispositivo, solicite uma senha ao ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo seu PIN antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo seu padrão antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais exigindo sua senha antes da inicialização. O dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes, até que ele seja iniciado.\n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Solicitar PIN para iniciar dispositivo"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Solicitar padrão para iniciar dispositivo"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Solicitar senha para iniciar dispositivo"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Não, obrigado."</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Não, obrigado."</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Não, obrigado."</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Para proteger ainda mais o dispositivo, solicite o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar o PIN para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Para proteger ainda mais o dispositivo, solicite um padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar um padrão para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Para proteger ainda mais o dispositivo, solicite uma senha antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar uma senha para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando o PIN antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar o PIN para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando um padrão antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar um padrão para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Além de usar sua impressão digital para desbloquear o dispositivo, é possível protegê-lo ainda mais solicitando uma senha antes de ligá-lo. Até que seja inicializado, o dispositivo não receberá chamadas, mensagens ou notificações, incluindo alarmes. \n\nIsso ajuda a proteger os dados em dispositivos perdidos ou roubados. Deseja solicitar uma senha para ligar o dispositivo?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Sim"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Não"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Exigir PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Exigir padrão?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Exigir senha?"</string>
@@ -3128,7 +3125,7 @@
     <string name="usb_use_MIDI_desc" msgid="8473936990076693175">"Usar este dispositivo como MIDI"</string>
     <string name="usb_use" msgid="3256040963685055320">"Usar USB para"</string>
     <string name="usb_pref" msgid="1400617804525116158">"USB"</string>
-    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Carregamento deste dispositivo"</string>
+    <string name="usb_summary_charging_only" msgid="7544327009143659751">"Para carregamento do dispositivo"</string>
     <string name="usb_summary_power_only" msgid="3629517713817003738">"Fornecimento de energia"</string>
     <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>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Esta permissão permite que um app modifique configurações do sistema."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Sim"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Não"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Sim"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Não"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Permitir instalações de apps"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Permitido"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Não permitido"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Permitir desta fonte"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Girar duas vezes para abrir a câmera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Abrir o app Câmera girando o pulso duas vezes"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Press. o botão liga/desliga duas vezes p/ abrir a câmera"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Conectado a"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Blocos de desenvolvedor para configurações rápidas"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Estamos aqui para ajudar"</string>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Armazenamento do tablet"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Armazen. do smartphone"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Usados <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"Usados de <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"usado"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Limpar app"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Deseja remover esse app instantâneo?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(desativado para o usuário <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Serviço de preenchimento automático"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automático, preenchimento, preenchimento automático"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Tornar o <xliff:g id="APP_NAME_0">%1$s</xliff:g> seu app de preenchimento automático? O <xliff:g id="APP_NAME_1">%1$s</xliff:g> poderá ler sua tela e preencher campos em outros apps."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Você precisa confiar nesse app&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=O Preenchimento automático do Google&gt;%1$s&lt;/xliff:g&gt; usa o que está na sua tela para determinar o que pode ser preenchido automaticamente."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema do dispositivo"</string>
     <string name="default_theme" msgid="7085644992078579076">"Padrão"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Gerenciador de armazenamento: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index cc5c1e0..b42fe5e 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Niciuna"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Niciunul"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a3aa47f..8b40d70 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -319,7 +319,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Imediat după intervalul de inactivitate, cu excepția cazului când este păstrat deblocat prin <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> după intrarea în inactivitate, dacă dispozitivul nu este menținut în activitate de <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Afișați info. proprietar la blocarea ecranului"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Mesaj pentru ecranul de blocare"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Mesaj pe ecranul de blocare"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activați widgeturi"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Dezactivat de administrator"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Niciunul"</string>
@@ -331,20 +331,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Conturi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Securitate și locație"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Criptare și date de conectare"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon criptat"</string>
-    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferințe pentru ecranul de blocare"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon criptat"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
+    <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferințe ecran de blocare"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setați Locația mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setați Locația mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Confidențialitate"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Dezactivat de administrator"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Starea de securitate"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Blocarea ecranului, amprentă"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Blocarea ecranului"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Amprentă"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Gestionați amprentele"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Folosiți amprenta la"</string>
@@ -659,7 +658,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Ca difuzor"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Pentru muzică și fișiere media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Rețineți setările"</string>
-    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Proiectați"</string>
+    <string name="wifi_display_settings_title" msgid="8740852850033480136">"Proiectare"</string>
     <string name="wifi_display_enable_menu_item" msgid="4883036464138167674">"Activați ecranul wireless"</string>
     <string name="wifi_display_no_devices_found" msgid="1382012407154143453">"Nu s-au găsit dispozitive în apropiere."</string>
     <string name="wifi_display_status_connecting" msgid="5688608834000748607">"Se conectează"</string>
@@ -703,6 +702,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Notifică-mă atunci când este disponibilă o rețea publică de înaltă calitate"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Activează automat Wi-Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi se va reactiva automat lângă rețelele de înaltă calitate salvate, cum ar fi rețeaua dvs. de domiciliu"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Indisponibil, deoarece scanarea Wi-Fi este dezactivată"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Evitați conexiunile slabe"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nu utilizați o rețea Wi-Fi, cu excepția cazului în care aceasta are o conexiune la internet adecvată"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Utilizați numai rețelele care au conexiune bună la internet"</string>
@@ -825,11 +825,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Configurați Wi‑Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mască de subrețea"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adrese IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Rețele salvate"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Setări IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Setările avansate de Wi‑Fi nu sunt disponibile pentru acest utilizator"</string>
@@ -1029,13 +1027,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Dezactivat"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Pentru a stabili ce se întâmplă când telefonul este andocat și/sau inactiv, activați economizorul de ecran."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Când pornește"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Screensaver actual"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Începe acum"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Setări"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ridicați pentru a reactiva"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Ecranul de notificări primite"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Afișare Ambient"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Activează ecranul când primiți notificări"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Dimensiunea fontului"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Măriți sau micșorați textul"</string>
@@ -1375,7 +1372,7 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Utilizați <xliff:g id="NEW_APP">%s</xliff:g> pentru a gestiona conexiunile la rețea?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operator SIM necunoscut"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> nu are niciun site de provizionare cunoscut"</string>
-    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduceți cartela SIM și reporniți"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduceți cardul SIM și reporniți"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conectați-vă la internet"</string>
     <string name="location_title" msgid="1029961368397484576">"Locația mea"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Locație pt. profil de serviciu"</string>
@@ -1630,6 +1627,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Magazin"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detalii aplicație"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplicație instalată din <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Mai multe informații în <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operații ale aplicației"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Rulează"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nu este utilizată niciodată)"</string>
@@ -1706,7 +1704,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ajutor pentru comenzi rapide de la tastatură"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Afișați comenzile rapide disponibile"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Prestabilit"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Viteza indicatorului"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Controler de joc"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Utilizați mecanismul de vibrare"</string>
@@ -1796,7 +1793,7 @@
     <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ă de accesibilitate"</string>
+    <string name="accessibility_global_gesture_preference_title" msgid="6752037184140789970">"Comandă rapidă accesibilitate"</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>
@@ -1807,7 +1804,7 @@
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Cursor mare pentru mouse"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Audio mono"</string>
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Combinați canalele când redați conținutul audio"</string>
-    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Întârziere la atingere continuă"</string>
+    <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Întârziere la atingere lungă"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inversarea culorilor"</string>
     <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>
@@ -1903,7 +1900,7 @@
     <string name="print_no_printers_found" msgid="989018646884973683">"Nu au fost găsite imprimante"</string>
     <string name="print_menu_item_settings" msgid="6591330373682227082">"Setări"</string>
     <string name="print_menu_item_add_printers" msgid="2890738028215834012">"Adăugați imprimante"</string>
-    <string name="print_feature_state_on" msgid="8098901852502441048">"Activată"</string>
+    <string name="print_feature_state_on" msgid="8098901852502441048">"Activat"</string>
     <string name="print_feature_state_off" msgid="7294876968403966040">"Dezactiv."</string>
     <string name="print_menu_item_add_service" msgid="3811645167869797802">"Adăugați un serviciu"</string>
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Adăugați o imprimantă"</string>
@@ -1936,8 +1933,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Utilizarea ecranului de la încărcare"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Consumul ecranului"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Scanarea rețelei mobile"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"în urmă cu <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizarea de către aplicații de la ultima încărcare (în urmă cu <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"în urmă cu <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Utilizarea de către aplicații de la ultima încărcare (în urmă cu <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Perioada de timp de la încărcarea completă cât a fost pornit ecranul"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Utilizarea dispozitivului de la încărcarea completă"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utilizarea bateriei de la deconectare"</string>
@@ -1968,7 +1965,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Cameră foto"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Așteptare celulă"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Rețea mobilă în așteptare"</string>
     <string name="power_phone" msgid="5392641106474567277">"Apeluri vocale"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableta inactivă"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon inactiv"</string>
@@ -2028,7 +2025,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Utilizarea bateriei reprezintă o aproximare a energiei utilizate și nu include toate sursele de consumare a bateriei. Modurile diferite de utilizare a bateriei reprezintă diferența dintre energia consumată aproximativă calculată și consumul efectiv observat pentru baterie."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Consumul supraevaluat al bateriei"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"S-a utilizat %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Utilizată de <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> folosită de <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> din bateria încărcată complet"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Detaliere de la ultima încărcare completă"</string>
@@ -2100,7 +2097,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Setări de intrare și de ieșire a vocii"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Căutare vocală"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tastatură Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Voce"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Setări de intrare vocală"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Intrare vocală"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Servicii de intrare vocală"</string>
@@ -2190,7 +2186,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Dezactivați această aplicație pentru administratorul dispozitivului"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Dezinstalați aplicația"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Dezactivați și dezinstalați"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplicații pentru administratorul dispozitivului"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplicații pentru admin. dispozitivului"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Nu este disponibilă nicio aplicație pentru administratorul dispozitivului"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Serviciu"</string>
@@ -2471,10 +2467,10 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Date de conectare eliminate: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Nu s-au instalat date de conectare ale utilizatorului"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Verificator ortografic"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introduceți aici parola actuală pentru copia de rezervă completă"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduceți aici o parolă nouă pentru copiile de rezervă complete"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Reintroduceți aici noua parolă pentru copia de rezervă completă"</string>
-    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setați parola pentru copia de rezervă"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Introduceți aici parola actuală pentru backupul complet"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Introduceți aici o parolă nouă pentru backupurile complete"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Reintroduceți aici noua parolă pentru backupul complet"</string>
+    <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Setați parola pentru backup"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Anulați"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Actualizări de sistem suplimentare"</string>
     <string name="selinux_status_disabled" msgid="924551035552323327">"Dezactivat"</string>
@@ -2755,8 +2751,10 @@
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum alarmă"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volum sonerie"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumul notificărilor"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Ton de sonerie al telefonului"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Sunet de notificare prestabilit"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Sunet oferit de aplicație"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Sunet de notificare prestabilit"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Sunet de alarmă prestabilit"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrații și pentru apeluri"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Alte sunete"</string>
@@ -2808,7 +2806,7 @@
     <string name="profile_section_header" msgid="2320848161066912001">"Notificări profil de serviciu"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Lumină intermitentă"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Pe ecranul de blocare"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișați integral conținutul notificărilor"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișează integral conținutul notificărilor"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ascunde conținutul sensibil din notificări"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Nu afișa nicio notificare"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Când dispozitivul este blocat, cum doriți să se afișeze notificările?"</string>
@@ -2819,6 +2817,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Cum doriți să fie afișate notificările din profil când dispozitivul este blocat?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Notificări din profil"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Notificări"</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_blocked" msgid="7938180808339386300">"Nu afișați niciodată notificările"</string>
@@ -2826,10 +2825,10 @@
     <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_min_summary" msgid="8233873580287975662">"Scăzut: fără sunet sau întrerupere vizuală"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Mediu: fără sunet"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Ridicat: se emite un sunet"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgent: se emite un sunet și se evidențiază 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Asistent pentru notificări"</string>
@@ -2864,6 +2863,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Accesul 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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blochează notificările acestei aplicații pe acest dispozitiv"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blochează această categorie de notificări pe acest dispozitiv"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Categorii"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Altele"</string>
     <string name="no_channels" msgid="3077375508177744586">"Această aplicație nu a postat nicio notificare"</string>
@@ -2912,9 +2913,9 @@
     <string name="zen_mode_rule_type" msgid="2289413469580142888">"Tipul de regulă"</string>
     <string name="zen_mode_rule_type_unknown" msgid="3049377282766700600">"Necunoscut"</string>
     <string name="zen_mode_configure_rule" msgid="8865785428056490305">"Configurați regula"</string>
-    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Regula pentru timp"</string>
+    <string name="zen_schedule_rule_type_name" msgid="142936744435271449">"Regulă pentru timp"</string>
     <string name="zen_schedule_rule_enabled_toast" msgid="3379499360390382259">"Regulă automată setată pentru a activa modul „Nu deranja” în anumite perioade"</string>
-    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Regula pentru eveniment"</string>
+    <string name="zen_event_rule_type_name" msgid="2645981990973086797">"Regulă pentru eveniment"</string>
     <string name="zen_event_rule_enabled_toast" msgid="6910577623330811480">"Regulă automată setată pentru a activa modul „Nu deranja” în timpul evenimentelor specificate"</string>
     <string name="zen_mode_event_rule_calendar" msgid="8787906563769067418">"În timpul evenimentelor pentru"</string>
     <string name="zen_mode_event_rule_summary_calendar_template" msgid="5135844750232403975">"În timpul evenimentelor pentru <xliff:g id="CALENDAR">%1$s</xliff:g>"</string>
@@ -2950,7 +2951,7 @@
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Toți apelanții"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Apelanți selectați"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Apelanți care revin"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dacă aceeași persoană apelează a doua oară într-un interval de <xliff:g id="MINUTES">%d</xliff:g>   minute, permite apelul"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Dacă aceeași persoană apelează a doua oară într-un interval de <xliff:g id="MINUTES">%d</xliff:g> minute, permite apelul"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Activați automat"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Niciodată"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"În fiecare seară"</string>
@@ -3001,18 +3002,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Mențineți orientarea actuală"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Pornire securizată"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Continuați"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN pentru a-l porni. Nu se pot primi apeluri, mesaje sau notificări, nici alarme, pe dispozitiv până când acesta nu pornește. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând modelul pentru a-l porni. Nu se pot primi apeluri, mesaje sau notificări, nici alarme, pe dispozitiv până când acesta nu pornește. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând parola pentru a-l porni. Nu se pot primi apeluri, mesaje sau notificări, nici alarme, pe dispozitiv până când acesta nu pornește. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"În plus față de folosirea amprentei pentru deblocarea dispozitivului, puteți să protejați și mai bine dispozitivul setând solicitarea codului PIN înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări, inclusiv alarme, înainte ca acesta să pornească.\n\nAstfel, datele sunt protejate pe dispozitivele pierdute sau furate."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"În plus față de folosirea amprentei pentru deblocarea dispozitivului, puteți să protejați și mai bine acest dispozitiv setând solicitarea șablonului înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări, inclusiv alarme, înainte ca acesta să pornească.\n\nAstfel, datele sunt protejate pe dispozitivele pierdute sau furate."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"În plus față de folosirea amprentei pentru deblocarea dispozitivului, puteți să protejați și mai bine acest dispozitiv setând solicitarea parolei înainte de pornire. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări, inclusiv alarme, înainte ca acesta să pornească.\n\nAstfel, datele sunt protejate pe dispozitivele pierdute sau furate."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Solicitați un cod PIN pentru a porni dispozitivul"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Solicitați un model pentru a porni dispozitivul"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Solicitați o parolă pentru a porni dispozitivul"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nu, mulțumesc"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nu, mulțumesc"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nu, mulțumesc"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un cod PIN pentru a vă porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând modelul înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un model pentru a vă porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând parola înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit. \n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați o parolă pentru a vă porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"În plus față de folosirea amprentei digitale pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând codul PIN înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un cod PIN pentru a vă porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"În plus față de folosirea amprentei digitale pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând modelul înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați un model pentru a vă porni dispozitivul?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"În plus față de folosirea amprentei digitale pentru deblocarea dispozitivului, puteți lua măsuri de protecție suplimentară pe acest dispozitiv solicitând parola înainte de a-l porni. Pe dispozitiv nu se pot primi apeluri, mesaje sau notificări și nici alarme până când nu este pornit.\n\nAstfel vă puteți proteja datele de pe dispozitivele pierdute sau furate. Doriți să solicitați o parolă pentru a vă porni dispozitivul&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nu"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Solicitați codul PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Solicitați modelul?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Solicitați parola?"</string>
@@ -3106,7 +3103,7 @@
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Sunt de acord"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"Nu sunt de acord"</string>
     <string name="choose_voice_input_title" msgid="975471367067718019">"Alegeți intrarea vocală"</string>
-    <string name="default_browser_title" msgid="8101772675085814670">"Aplicația de navigare"</string>
+    <string name="default_browser_title" msgid="8101772675085814670">"Browser"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Niciun browser prestabilit"</string>
     <string name="default_phone_title" msgid="282005908059637350">"Aplicația Telefon"</string>
     <string name="default_app" msgid="6864503001385843060">"(Prestabilită)"</string>
@@ -3227,7 +3224,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Aplicații cu permisiune"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Da"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Nu"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Instalarea aplicațiilor necunoscute"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Instalare apl. necunoscute"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"instalare aplicații din surse necunoscute"</string>
     <string name="write_settings" msgid="4797457275727195681">"Modifică setările de sistem"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"scrie modifică setări de sistem"</string>
@@ -3241,9 +3238,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Având această permisiune, o aplicație poate să modifice setările de sistem."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nu"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Da"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nu"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Permiteți instalarea aplicațiilor"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Permise"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nepermise"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Permiteți din această sursă"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Două răsuciri pentru camera foto"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Deschideți aplicația Cameră foto răsucind din încheietura mâinii de două ori"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Apăsați pornire de 2 ori pentru cameră"</string>
@@ -3265,7 +3262,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Marți, la 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Marți, la 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Marți, la 18:03"</string>
-    <string name="disconnected" msgid="4836600637485526329">"Neconectată"</string>
+    <string name="disconnected" msgid="4836600637485526329">"Neconectat"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"Date folosite: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="few">Dezactivate pentru <xliff:g id="COUNT">%d</xliff:g> aplicații</item>
@@ -3273,7 +3270,7 @@
       <item quantity="one">Dezactivate pentru o aplicație</item>
     </plurals>
     <string name="notification_summary_none" msgid="4586376436702610">"Activat pentru toate aplicațiile"</string>
-    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g>   aplicații instalate"</string>
+    <string name="apps_summary" msgid="193158055537070092">"<xliff:g id="COUNT">%1$d</xliff:g> aplicații instalate"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"24 de aplicații instalate"</string>
     <string name="storage_summary" msgid="3801281635351732202">"S-au folosit <xliff:g id="PERCENTAGE">%1$s</xliff:g> - <xliff:g id="FREE_SPACE">%2$s</xliff:g> liber"</string>
     <string name="storage_summary_with_sdcard" msgid="3290457009629490121">"Memorie internă: <xliff:g id="PERCENTAGE">%1$s</xliff:g> folosită - <xliff:g id="FREE_SPACE">%2$s</xliff:g> liberă"</string>
@@ -3433,7 +3430,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Conectat la"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Casete dezvoltator pentru setări rapide"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Suntem aici pentru a vă ajuta"</string>
@@ -3632,7 +3630,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(dezactivat pentru <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Serviciu de completare automată"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automată, completare, completare automată"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Setați <xliff:g id="APP_NAME_0">%1$s</xliff:g> ca aplicație pentru completare automată? <xliff:g id="APP_NAME_1">%1$s</xliff:g> va putea să vă citească ecranul și să completeze câmpurile din alte aplicații."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Asigurați-vă că aveți încredere în această aplicație&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Completarea automată Google&gt;%1$s&lt;/xliff:g&gt; folosește conținutul de pe ecran pentru a stabili ce se poate completa automat."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema dispozitivului"</string>
     <string name="default_theme" msgid="7085644992078579076">"Prestabilită"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Managerul spațiului de stocare: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 34398eb..1f47436 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Нет"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Нет"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 606f974..c8351eb 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -321,7 +321,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Сразу после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> после перехода в спящий режим, если экран не поддерживается в разблокированном состоянии службой <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показывать данные о владельце на экране блокировки"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Текст на заблок. экране"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Текст на экране"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Включить виджеты"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Отключено администратором"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Нет текста"</string>
@@ -333,20 +333,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Аккаунты"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Аккаунты"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Безопасность и местоположение"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрование и учетные данные"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Телефон зашифрован"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон зашифрован"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Настройки заблокированного экрана"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Конфиденциальность"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Отключено администратором"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Статус безопасности"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Управление отпечатками"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Для чего использовать"</string>
@@ -646,7 +645,7 @@
     <string name="bluetooth_device_context_unpair" msgid="662992425948536144">"Отменить сопряжение"</string>
     <string name="bluetooth_device_context_disconnect_unpair" msgid="7644014238070043798">"Отключить и отменить сопряжение"</string>
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Параметры..."</string>
-    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Расширенные"</string>
+    <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Дополнительно"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Расш. настройки Bluetooth"</string>
     <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Включите Bluetooth, чтобы подключаться к другим Bluetooth-устройствам."</string>
     <string name="ble_scan_notify_text" msgid="1295915006005700650">"Чтобы точнее определять местоположение, системные приложения и сервисы продолжат искать находящиеся поблизости Bluetooth-устройства. Вы можете отключить эту функцию в <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>настройках сканирования<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
@@ -695,7 +694,7 @@
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Обмен данными по NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Выключено"</string>
-    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, так как отключена связь малого радиуса действия"</string>
+    <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Недоступно, так как NFC отключен"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Функция позволяет передавать различную информацию (включая контакты, веб-страницы и видео) между устройствами, приложив их друг к другу.\n\nПросто расположите устройства рядом (например, совместите их задние панели) и нажмите на экран. Передаваемые данные зависят от приложения."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi-Fi"</string>
@@ -714,6 +713,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недоступно, так как поиск сетей Wi‑Fi отключен"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Фильтр сетей Wi-Fi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Не использовать сети Wi-Fi с плохим интернет-соединением"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Использовать только сети с сильным сигналом"</string>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Настройка 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска подсети"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-адреса"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Сохраненные сети"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Настройки IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Расширенные настройки Wi‑Fi недоступны для этого пользователя"</string>
@@ -986,7 +984,7 @@
     <string name="brightness" msgid="8480105032417444275">"Яркость"</string>
     <string name="brightness_title" msgid="5746272622112982836">"Яркость"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивная регулировка"</string>
+    <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивная яркость"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"Менять яркость с учетом уровня освещенности"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"Откл."</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"Уровень яркости: очень низкий"</string>
@@ -1041,13 +1039,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Выкл."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Чтобы настроить поведение телефона при подключении к док-станции и в спящем режиме, включите заставку."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Когда запускать"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Текущая заставка"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Запустить"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Настройки"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Активация в вертикальном положении"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Экран при уведомлении"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Автоматическое включение экрана"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Включать экран, когда приходит уведомление"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Увеличение или уменьшение размера шрифта"</string>
@@ -1230,7 +1227,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Система"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"В разделе \"Другое\" находятся файлы с общим доступом, сохраненные приложениями, контент, скачанный из Интернета или по Bluetooth, файлы 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_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_wizard_init_title" msgid="5085400514028585772">"Настройте карту \"<xliff:g id="NAME">^1</xliff:g>\""</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Портативный носитель"</string>
@@ -1305,7 +1302,7 @@
     <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_dashboard_title" msgid="4412694650600342973">"Сброс"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Сброс сетевых настроек"</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>
@@ -1348,7 +1345,7 @@
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Точка доступа Wi-Fi"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth-модем"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Режим модема"</string>
-    <string name="tether_settings_title_all" msgid="3058586928118801157">"Точка доступа и режим модема"</string>
+    <string name="tether_settings_title_all" msgid="3058586928118801157">"Точка доступа и модем"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Точка доступа, режим модема"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Точка доступа"</string>
     <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Режим модема"</string>
@@ -1398,7 +1395,7 @@
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"По координатам сети"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"По спутникам GPS"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Отправка геоданных отключена"</string>
-    <string name="location_app_level_permissions" msgid="1825588230817081339">"Разрешения приложения"</string>
+    <string name="location_app_level_permissions" msgid="1825588230817081339">"Разрешения для приложений"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Последние геозапросы"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"В последнее время приложения не запрашивали геоданные"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Мое местоположение"</string>
@@ -1410,9 +1407,9 @@
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Использовать GPS для определения местоположения"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Поиск"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Поиск сетей Wi‑Fi"</string>
-    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Для более точного определения местоположения разрешите системным приложениям и сервисам постоянно искать сети Wi‑Fi."</string>
+    <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Точнее определять местоположение, разрешив системным приложениям и сервисам постоянно искать сети Wi‑Fi"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Поиск Bluetooth-устройств"</string>
-    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Для более точного определения местоположения разрешите системным приложениям и сервисам постоянно искать находящиеся поблизости Bluetooth-устройства."</string>
+    <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Точнее определять местоположение, разрешив системным приложениям и сервисам постоянно искать Bluetooth-устройства поблизости"</string>
     <string name="location_network_based" msgid="9134175479520582215">"По координатам сети"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Разрешить отправлять анонимные геоданные и позволить приложениям определять ваше местоположение с помощью Wi-Fi и мобильных сетей"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"С помощью Wi-Fi"</string>
@@ -1459,7 +1456,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Подтвердите PIN-код"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"Пароли не совпадают"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN-коды не совпадают"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Способ разблокировки"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Способ блокировки"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Пароль был установлен"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN-код был установлен"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Ключ был установлен"</string>
@@ -1570,7 +1567,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>
@@ -1645,6 +1642,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(не использовалось)"</string>
@@ -1694,7 +1692,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Отключение этой системной службы может повлиять на функциональность телефона. Чтобы восстановить работу устройства, потребуется перезагрузить его."</string>
     <string name="language_settings" msgid="8758655933029560944">"Язык и ввод"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Язык и ввод"</string>
-    <string name="input_assistance" msgid="7577795275222555487">"Помощь с вводом"</string>
+    <string name="input_assistance" msgid="7577795275222555487">"Помощь при вводе"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Клавиатура и способы ввода"</string>
     <string name="phone_language" msgid="7116581601133118044">"Языки"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1705,7 +1703,7 @@
     <string name="auto_punctuate" msgid="4595367243950425833">"Автопунктуация"</string>
     <string name="hardkeyboard_category" msgid="5957168411305769899">"Настройки внешней клавиатуры"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"Нажмите дважды клавишу \"Пробел\" для ввода точки"</string>
-    <string name="show_password" msgid="4837897357002495384">"Показать пароли"</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_quick_settings" msgid="246728645150092058">"Настройки"</string>
@@ -1719,9 +1717,8 @@
     <string name="show_ime" msgid="2658582193437188227">"Виртуальная клавиатура"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Показывать на экране, когда физическая клавиатура включена"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Быстрые клавиши"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Показать быстрые клавиши"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Показывать быстрые клавиши"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"По умолчанию"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Мышь и сенсорная панель"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Скорость указателя"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Игровые контроллеры"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Виброотклик"</string>
@@ -1919,7 +1916,7 @@
       <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="print_settings_title" msgid="3685449667822217816">"Средства печати"</string>
+    <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_menu_item_settings" msgid="6591330373682227082">"Настройки"</string>
@@ -1957,8 +1954,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Использование экрана с момента полной зарядки"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потребление энергии экраном"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканирование мобильной сети"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> назад"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Использование приложения с момента полной зарядки (<xliff:g id="TIME">%1$s</xliff:g> назад)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> назад"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Использование приложений с момента полной зарядки (<xliff:g id="TIME">^1</xliff:g> назад)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Время работы экрана с момента полной зарядки"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Использование устройства с момента полной зарядки"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Расход заряда батареи с момента отключения от сети питания"</string>
@@ -1978,7 +1975,7 @@
     <string name="awake" msgid="387122265874485088">"Время включения устройства"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Время работы Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Время работы Wi-Fi"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Расширенные настройки для заряда батареи"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Сведения о расходе заряда"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Подробная история"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Расход заряда батареи"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Расход батареи"</string>
@@ -1989,7 +1986,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Связь с сетью"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Мобильная сеть в режиме ожидания"</string>
     <string name="power_phone" msgid="5392641106474567277">"Голосовые вызовы"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Планшетный ПК в режиме ожидания"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Режим ожидания"</string>
@@ -2049,11 +2046,11 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Данные о расходе заряда батареи отдельными приложениями являются приблизительными и не включают всех возможных потребителей энергии. Этот показатель энергопотребления соответствует разнице между расчетным энергопотреблением и фактическим расходом заряда батареи."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Преувеличенное энергопотребление"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА·ч"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Использовано %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Продолжительность использования: <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_last_full_charge" msgid="7151251641099019361">"Последняя полная зарядка"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Оставшееся время работы указано приблизительно и может меняться в зависимости от интенсивности использования"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"В активном режиме"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"В фоновом режиме"</string>
@@ -2121,7 +2118,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Настройки голосового ввода и вывода"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Голосовой поиск"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Клавиатура Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Речь"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Настройки голосового ввода"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Голосовой ввод"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Голосовой ввод"</string>
@@ -2211,7 +2207,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Отключить приложение администратора устройства"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Удалить приложение"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Отключить и удалить"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Приложения администратора устройства"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Приложения администратора"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Нет доступных приложений администратора устройства"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Личный"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Рабочий"</string>
@@ -2365,7 +2361,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G/3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Моб. сети"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Нет сетей"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Моб. трафик"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Моб. Интернет"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Передача данных по сетям 2G/3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Передача данных 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Активный режим:"</string>
@@ -2381,12 +2377,12 @@
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Все изменения, внесенные в аккаунты на компьютере, будут автоматически скопированы на устройство.\n\nВ некоторых случаях также выполняется обратная синхронизация (например, для аккаунта Google)."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Отключить автосинхронизацию?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Это сократит трафик и расход энергии. Однако чтобы получать новые данные, необходимо будет синхронизировать каждый аккаунт вручную. При этом уведомления об обновлениях отображаться не будут."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Удаление статистики"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Расход трафика и энергии будет ниже, но для получения новых данных придется синхронизировать аккаунты вручную. Уведомления о наличии обновлений будут отключены."</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Сброс статистики"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"День месяца:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Сохранить"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Настройка предупреждения"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Лимитирование трафика"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Лимит трафика"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Лимит трафика данных"</string>
     <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"После достижения установленного лимита передача данных по мобильной сети будет отключена.\n\nПри выборе ограничения обратите внимание, что статистика оператора может отличаться от статистики планшета."</string>
     <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"После достижения установленного лимита передача данных по мобильной сети будет отключена.\n\nПри выборе ограничения обратите внимание, что статистика оператора может отличаться от статистики телефона."</string>
@@ -2559,7 +2555,7 @@
     <string name="user_cannot_manage_message" product="default" msgid="959315813089950649">"Только владелец может настроить устройство для других пользователей."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Пользователи с ограниченным доступом не могут добавлять аккаунты"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Удалить пользователя <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="user_lockscreen_settings" msgid="4965661345247084878">"Настройки заблокированного экрана"</string>
+    <string name="user_lockscreen_settings" msgid="4965661345247084878">"Заблокированный экран"</string>
     <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Добавление пользователей на заблокированном экране"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новый пользователь"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новый профиль"</string>
@@ -2598,7 +2594,7 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Бесконтактная оплата"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Как это работает"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Оплачивайте покупки в магазинах с помощью телефона"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Основное средство оплаты"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Оплата по умолчанию"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Не выбрано"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> – <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Использовать приложение по умолчанию"</string>
@@ -2777,12 +2773,14 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Включен вибросигнал"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Включен режим без звука"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Громкость звонка: 80%"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Музыка, видео, игры и другие медиафайлы"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Музыка, видео, игры"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Будильник"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Рингтон"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Громкость уведомлений"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Звук уведомления по умолчанию"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Звук приложения по умолчанию"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Звук уведомления по умолчанию"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Звук будильника по умолчанию"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрация при звонке"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Другие звуки"</string>
@@ -2846,6 +2844,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Отключить уведомления"</string>
@@ -2853,10 +2852,10 @@
     <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_min_summary" msgid="8233873580287975662">"Низкая: без уведомлений"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Средняя: без звука"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Высокая: со звуком"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Крайняя: всплывающее окно со звуком"</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="6585849855452076626">"Со звуком"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Отключить звуковой сигнал и вибрацию, не показывать оповещения поверх других приложений."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Настройка уведомлений"</string>
@@ -2868,14 +2867,14 @@
       <item quantity="many">%d приложений с доступом к уведомлениям</item>
       <item quantity="other">%d приложений с доступом к уведомлениям</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"Ни одному из установленных приложений не требуется доступ к уведомлениям."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"Установленные приложения не запрашивали доступ к уведомлениям"</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Открыть приложению \"<xliff:g id="SERVICE">%1$s</xliff:g>\" доступ к уведомлениям?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"Приложение \"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>\" сможет читать все уведомления, в том числе содержащие личную информацию (например, имена контактов и сообщения). Оно также получит право закрывать уведомления и нажимать кнопки в них.\n\nПриложение сможет включать и отключать режим \"Не беспокоить\", а также менять его настройки."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Если вы отключите доступ к уведомлениям для приложения \"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>\", также может быть отключен доступ к настройкам режима \"Не беспокоить\"."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Отключить"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Отмена"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"Вспомогательные VR-сервисы"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"Ни одно из установленных приложений не запрашивало разрешение на работу в качестве вспомогательного VR-сервиса."</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"Установленные приложения не запрашивали доступ для работы в качестве вспомогательного VR-сервиса"</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Разрешить VR-сервису доступ к сервису \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> сможет начать работу, когда вы будете использовать приложения в режиме виртуальной реальности."</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Когда устройство в VR-режиме"</string>
@@ -2890,12 +2889,14 @@
     <string name="picture_in_picture_on" msgid="6103704909710176555">"Да"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Нет"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ к функции \"Не беспокоить\""</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"Установленные приложения не требуют доступа к функции \"Не беспокоить\""</string>
+    <string name="zen_access_empty_text" msgid="8772967285742259540">"Установленные приложения не запрашивали доступ к функции \"Не беспокоить\""</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>
     <string name="notification_channels_other" msgid="5645317113885788226">"Другие"</string>
     <string name="no_channels" msgid="3077375508177744586">"Для этого приложения нет уведомлений."</string>
-    <string name="app_settings_link" msgid="8894946007543660906">"Дополнительные настройки в приложении"</string>
+    <string name="app_settings_link" msgid="8894946007543660906">"Доп. настройки в приложении"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"Включено для всех приложений"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
       <item quantity="one">Отключены для <xliff:g id="COUNT_1">%d</xliff:g> приложения</item>
@@ -2913,12 +2914,12 @@
     <string name="notification_toggle_on" msgid="650145396718191048">"Вкл."</string>
     <string name="notification_toggle_off" msgid="2142010737190671762">"Откл."</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"Блокировать все"</string>
-    <string name="app_notification_block_summary" msgid="4744020456943215352">"Не показывать эти уведомления."</string>
+    <string name="app_notification_block_summary" msgid="4744020456943215352">"Не показывать эти уведомления"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"Включить уведомления"</string>
     <string name="notification_content_block_summary" msgid="7746185794438882389">"Не показывать уведомления на фоне или на периферийных устройствах"</string>
     <string name="notification_badge_title" msgid="7166470350070693657">"Наклейка на значке"</string>
     <string name="notification_badge_summary" msgid="3944771498030335669">"Показывать уведомления в виде значков в приложении Home (если функция поддерживается)"</string>
-    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Переопределить режим \"Не беспокоить\""</string>
+    <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Переопределить \"Не беспокоить\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Разрешить эти уведомления, когда в режиме \"Не беспокоить\" выбрано \"Только важные\""</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокированном экране"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблокировано"</string>
@@ -3003,9 +3004,9 @@
     </plurals>
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Активировать режим \"Только будильник\" до <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Режим \"Не беспокоить\" отключен."</string>
-    <string name="zen_mode_screen_on" msgid="7712038508173845101">"Блокировать при включенном экране"</string>
+    <string name="zen_mode_screen_on" msgid="7712038508173845101">"При включенном экране"</string>
     <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Не показывать на экране уведомления, отключенные в режиме \"Не беспокоить\""</string>
-    <string name="zen_mode_screen_off" msgid="5026854939192419879">"Блокировать при отключенном экране"</string>
+    <string name="zen_mode_screen_off" msgid="5026854939192419879">"При отключенном экране"</string>
     <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Не включать экран и световой индикатор для уведомлений, отключенных в режиме \"Не беспокоить\""</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Не включать экран для уведомлений, отключенных в режиме \"Не беспокоить\""</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Отключено"</string>
@@ -3033,18 +3034,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Зафиксировать в текущей ориентации"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Безопасный запуск"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продолжить"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Для защиты данных вы можете активировать запрос PIN-кода при включении. Звонки, сообщения и оповещения, в том числе будильники, будут недоступны, пока вы не разблокируете устройство.\n\nЭто помогает защитить данные на утерянном или украденном устройстве."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Для защиты данных вы можете активировать запрос графического ключа при включении. Звонки, сообщения и оповещения, в том числе будильники, будут недоступны, пока вы не разблокируете устройство.\n\nЭто помогает защитить данные на утерянном или украденном устройстве."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Для защиты данных вы можете активировать запрос пароля при включении. Звонки, сообщения и оповещения, в том числе будильники, будут недоступны, пока вы не разблокируете устройство.\n\nЭто помогает защитить данные на утерянном или украденном устройстве."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Для разблокировки устройства вы можете настроить не только сканирование отпечатка пальца, но и дополнительный ввод PIN-кода. Пока вы не выполните нужные действия, звонки, сообщения и уведомления, в том числе будильники, будут недоступны.\n\nЭто поможет защитить данные на потерянном или украденном устройстве."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Для разблокировки устройства вы можете настроить не только сканирование отпечатка пальца, но и дополнительный ввод графического ключа. Пока вы не выполните нужные действия, звонки, сообщения и уведомления, в том числе будильники, будут недоступны.\n\nЭто поможет защитить данные на потерянном или украденном устройстве."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Для разблокировки устройства вы можете настроить не только сканирование отпечатка пальца, но и дополнительный ввод пароля. Пока вы не выполните нужные действия, звонки, сообщения и уведомления, в том числе будильники, будут недоступны.\n\nЭто поможет защитить данные на потерянном или украденном устройстве."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Запрашивать PIN-код при запуске устройства"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Запрашивать графический ключ при запуске устройства"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Запрашивать пароль при запуске устройства"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Не запрашивать"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Не запрашивать"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Не запрашивать"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Вы можете задать PIN-код для разблокировки, чтобы защитить данные, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать PIN-код?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Вы можете задать графический ключ для разблокировки, чтобы защитить данные, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать графический ключ?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Вы можете задать пароль для разблокировки, чтобы защитить данные, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать пароль?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Вы также можете задать PIN-код для разблокировки, чтобы обеспечить дополнительную защиту данных, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать PIN-код?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Вы также можете задать графический ключ для разблокировки, чтобы обеспечить дополнительную защиту данных, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать графический ключ?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Вы также можете задать пароль для разблокировки, чтобы обеспечить дополнительную защиту данных, например, в случае потери устройства. Пока телефон заблокирован, звонки, сообщения и уведомления (в том числе будильники) будут недоступны.\n\nЗадать пароль?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Нет"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Запрашивать PIN-код?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Запрашивать ключ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Запрашивать пароль?"</string>
@@ -3056,7 +3053,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Сведения, касающиеся IMEI-кода"</string>
     <string name="slot_number" msgid="3762676044904653577">"(разъем <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Открывать по умолчанию"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Ссылки для запуска"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Открытие ссылок"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Открывать поддерживаемые ссылки"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Открывать автоматически"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Поддерживаемые ссылки"</string>
@@ -3118,10 +3115,10 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Приложения, которым разрешен доступ (<xliff:g id="APPS">%1$s</xliff:g>)"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Включение нажатием"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Дважды нажмите в любом месте экрана, чтобы включить устройство"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Ссылки для запуска"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Открытие ссылок"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Не открывать поддерживаемые ссылки"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g>"</string>
-    <string name="domain_urls_summary_some" msgid="3950089361819428455">"Могут открывать <xliff:g id="DOMAIN">%s</xliff:g> и другие URL"</string>
+    <string name="domain_urls_summary_some" msgid="3950089361819428455">"Открывать <xliff:g id="DOMAIN">%s</xliff:g> и другие URL"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Нет приложений, которые могут открыть поддерживаемые ссылки"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
       <item quantity="one">Поддерживаемые ссылки можно открыть в <xliff:g id="COUNT">%d</xliff:g> приложении</item>
@@ -3165,7 +3162,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Экономия заряда батареи"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Расход батареи"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Предупреждения"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Показать все приложения"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Скрыть доп. приложения"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Не экономят заряд"</string>
@@ -3278,9 +3275,9 @@
     <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_trusted" msgid="6857780460845250885">"Да"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Нет"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Разрешить установку приложений"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Разрешено"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Запрещено"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Быстрый доступ к камере"</string>
@@ -3366,14 +3363,14 @@
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Автоматические обновления системы"</string>
     <string name="usage" msgid="2977875522080448986">"Передача данных"</string>
     <string name="cellular_data_usage" msgid="2155683719898158203">"Мобильный трафик"</string>
-    <string name="wifi_data_usage" msgid="686754111095324306">"Передача данных Wi-Fi"</string>
+    <string name="wifi_data_usage" msgid="686754111095324306">"Трафик Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Передача данных Ethernet"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
     <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> мобильного трафика"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"<xliff:g id="AMOUNT">^1</xliff:g> (Wi-Fi)"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> (Ethernet)"</string>
-    <string name="cell_warning_only" msgid="763147658209027140">"Предупреждения при передаче данных: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="cell_warning_only" msgid="763147658209027140">"Предупреждение передачи данных: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Предупреждения при передаче данных: <xliff:g id="ID_1">%1$s</xliff:g>/Лимит передачи данных: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Платежный цикл"</string>
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Платежный цикл начинается <xliff:g id="ID_1">%1$s</xliff:g>-го числа каждого месяца"</string>
@@ -3387,10 +3384,10 @@
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Статистика оператора связи может отличаться от статистики устройства"</string>
     <string name="data_used_template" msgid="3245919669966296505">"Передано: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Настройка предупреждения"</string>
-    <string name="data_warning" msgid="209133958008062117">"Предупреждения"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Установить предупреждение"</string>
+    <string name="data_warning" msgid="209133958008062117">"Предупреждение"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Установить лимит трафика"</string>
-    <string name="data_limit" msgid="1885406964934590552">"Установить лимит трафика"</string>
+    <string name="data_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="configure" msgid="1029654422228677273">"Настроить"</string>
     <string name="data_usage_other_apps" msgid="3272872663517382050">"Другие приложения"</string>
@@ -3405,7 +3402,7 @@
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Фоновый режим выключен"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Включено"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Отключено"</string>
-    <string name="unrestricted_app_title" msgid="4465437191723332066">"Неограниченная передача данных"</string>
+    <string name="unrestricted_app_title" msgid="4465437191723332066">"Неогранич. передача данных"</string>
     <string name="unrestricted_app_summary" msgid="6458008993501723912">"Разрешить в режиме экономии трафика"</string>
     <string name="home_app" msgid="4066188520886810030">"Главное приложение"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Главное приложение не выбрано"</string>
@@ -3470,11 +3467,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Поддержка"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Минимальная ширина"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Нет приложений с доступом к платным SMS"</string>
+    <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_connected_summary" msgid="8733997010923307915">"Подключено к"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Фрагменты быстрых настроек"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Мы всегда рады помочь"</string>
@@ -3543,23 +3541,23 @@
     <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>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Быстрое переключение между камерами"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Включение камеры двойным нажатием кнопки питания в любом приложении"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Смена камеры"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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="2521630136233865893">"Чтобы увидеть уведомления, дважды нажмите на экран устройства."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Просмотр уведомлений в вертикальном положении телефона"</string>
+    <string name="ambient_display_summary" msgid="2521630136233865893">"Чтобы увидеть уведомления, дважды нажмите на экран устройства"</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="8696432220086951466">"Чтобы увидеть уведомления, возьмите телефон в руки."</string>
-    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Чтобы увидеть уведомления, возьмите планшет в руки."</string>
-    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Чтобы увидеть уведомления, возьмите устройство в руки."</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>
+    <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Чтобы увидеть уведомления, возьмите телефон в руки"</string>
+    <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Чтобы увидеть уведомления, возьмите планшет в руки"</string>
+    <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Чтобы увидеть уведомления, возьмите устройство в руки"</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>
     <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>
@@ -3673,7 +3671,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Память планшета"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Хранилище телефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Всего: <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"занято из <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"занято"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Удалить данные приложения"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Удалить приложение с мгновенным запуском?"</string>
@@ -3683,7 +3681,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(отключено для пользователя <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Автозаполнение"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматически, заполнять, автозаполнение"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> будет автоматически заполнять поля в других приложениях. <xliff:g id="APP_NAME_1">%1$s</xliff:g> сможет считывать данные с экрана. Согласны?"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Убедитесь, что это приложение безопасно&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; анализирует содержимое экрана и находит поля, которые можно заполнить автоматически."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема устройства"</string>
     <string name="default_theme" msgid="7085644992078579076">"По умолчанию"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менеджер хранилища: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index fa359f2..3745655 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"කිසිවක් නැත"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"කිසිවක් නැත"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 3d0801f..ff45775 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ගිණුම්"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ස්ථානය"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ගිණුම්"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"ආරක්ෂාව සහ ස්ථානය"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"සංකේතනය සහ අක්තපත්‍ර"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"දුරකතනය සංකේතනය කර ඇත"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"දුරකතනය සංකේතනය කර ඇත"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"අගුලු තිර අභිරුචි"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"මගේ ස්ථානය, තිර අගුළු ඇරීම, SIM පත් අගුල, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"මගේ ස්ථානය, තිර අගුළු ඇරීම, අක්තපත්‍ර ආචයන අගුල සකසන්න"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"රහස්‍යතාව"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ඔබගේ පරිපාලක විසින් අබල කර ඇත"</string>
     <string name="security_status_title" msgid="5848766673665944640">"ආරක්ෂක තත්ත්වය"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"ඇඟිලි සලකුණු කළමනාකරණය කරන්න"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"මෙය සඳහා ඇඟිලි සලකුණු භාවිත කරන්න"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi-Fi ස්කෑන් කිරීම ක්‍රියාවිරහිත කර ඇති නිසා ලබා ගත නොහැකිය"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"සබ්නෙට් මාස්ක්"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 ලිපින"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"සුරකින ලද ජාල"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP සැකසීම්"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"මෙම පරිශීලකයා සඳහා Wi‑Fi උසස් සැකසීම් නැත"</string>
@@ -999,7 +997,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"කිසි විටෙක ස්වයංක්‍රියව ක්‍රියාවිරහිත නොකරනු ඇත."</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"<xliff:g id="ID_1">%1$s</xliff:g> දී ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත."</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"හිරු නැගීමේදී ස්වයංක්‍රියව ක්‍රියාවිරහිත කරනු ඇත."</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"නිද්‍රාව"</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="wallpaper_settings_title" msgid="5449180116365824625">"වෝල්පේපරය"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"අක්‍රියයි"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"දුරකථනය රඳවා ඇති විට සහ/හෝ නිද්‍රාවේ ඇති විට සිදු වන දේ පාලනය කිරීමට, තිර සුරැකුම ක්‍රියාත්මක කරන්න."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"පටන් ගන්න මොන වේලාවටද"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"වර්තමාන තිර සුරැකුම"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"දැන් අරඹන්න"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"සැකසීම්"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ස්වයංක්‍රිය දීප්තිය"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"අවදි කිරීමට ඔසවන්න"</string>
-    <string name="doze_title" msgid="5389406335828323273">"එන දැනුම්දීම් තිරය"</string>
+    <string name="doze_title" msgid="2259176504273878294">"ස්ථානික දර්ශනය"</string>
     <string name="doze_summary" msgid="3846219936142814032">"ඔබට දැනුම්දීම් ලැබුණ විට තිරය අවදි කරන්න"</string>
     <string name="title_font_size" msgid="4405544325522105222">"අකුරු ප්‍රමාණය"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"පෙළ වඩාත් විශාල හෝ කුඩා කරන්න"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"පද්ධතිය"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g> ගවේෂණය කරන්න"</string>
     <string name="storage_detail_dialog_other" msgid="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_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_wizard_init_title" msgid="5085400514028585772">"ඔබගේ <xliff:g id="NAME">^1</xliff:g> සකසන්න"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"අතේ ගෙන යා හැකි ආචයනයක් ලෙස භාවිතා කරන්න"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(කිසිදිනෙක භාවිතා කර නැත)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"යතුරු පුවරු කෙටිමං සහායක"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"ලබා ගත හැකි කෙටි මං සංදර්ශනය කරන්න"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"පෙරනිමි"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"මූසිකය/ට්‍රැක් පෑඩ්"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"දර්ශක වේගය"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"ක්‍රීඩා පාලකය"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"කම්පකය භාවිතා කරන්න"</string>
@@ -1824,7 +1821,7 @@
     </plurals>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"සැකසීම්"</string>
     <string name="accessibility_feature_state_on" msgid="2864292320042673806">"ක්‍රියාත්මකයි"</string>
-    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"අක්‍රියයි"</string>
+    <string name="accessibility_feature_state_off" msgid="4172584906487070211">"ක්‍රියාවිරහිතයි"</string>
     <string name="captioning_preview_title" msgid="1234015253497016890">"පෙරදසුන"</string>
     <string name="captioning_standard_options_title" msgid="3284211791180335844">"සාමාන්‍ය විකල්ප"</string>
     <string name="captioning_locale" msgid="4559155661018823503">"භාෂාව"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"පූර්ණ ආරෝපණයෙන් පසුව තිර භාවිතය"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"තිර පරිභෝජනය"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"ජංගම ජාල පරිලෝකනය කරමින්"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g>කට පෙර"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"පූර්ණ ආරෝපණය සිට යෙදුම් භාවිතය (<xliff:g id="TIME">%1$s</xliff:g>කට පෙර)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>කට පෙර"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"පූර්ණ ආරෝපණයේ සිට යෙදුම භාවිතය (<xliff:g id="TIME">^1</xliff:g> පෙර)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"පූර්ණ ආරෝපණය සිට තිරය සක්‍රියව තිබූ වේලාව"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"පූර්ණ ආරෝපණයෙන් පසුව උපාංග භාවිතය"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"පේනුවෙන් ඉවත් කළ පසු බැටරි භාවිතය"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"කැමරාව"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"බ්ලූටූත්"</string>
-    <string name="power_cell" msgid="6596471490976003056">"සෙල් ස්ටෑන්ඩ්බයි"</string>
+    <string name="power_cell" msgid="3392999761958982492">"ජංගම ජාලය පොරොත්තු"</string>
     <string name="power_phone" msgid="5392641106474567277">"හඬ ඇමතුම්"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"අක්‍රිය ටැබ්ලටය"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"අක්‍රිය දුරකථනය"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"බැටරි භාවිතය බලය භාවිතයේ ආසන්නය වේ සහ බැටරි අඩු වීමේ සෑම ප්‍රභවයවයක්ම ඇතුළත් නොවේ. විවිධත්වය වනුයේ ගණනය කරන ලද ආසන්න බලයේ භාවිතය සහ බැටරියේ නිරීක්ෂිත ඇත්තට අඩු වීම අතර වෙනසය."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"වැඩියෙන් ගණනය කළ බල භාවිතය"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$sක් භාවිත කරන ලදී"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>ක් භාවිත කරන ලදී"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> වෙතින් <xliff:g id="PERCENT">%1$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>
@@ -2030,7 +2027,7 @@
     <string name="process_mediaserver_label" msgid="6500382062945689285">"මාධ්‍යසේවාදායකය"</string>
     <string name="process_dex2oat_label" msgid="2592408651060518226">"යෙදුම් ප්‍රශස්තකරණය"</string>
     <string name="battery_saver" msgid="1426682272004907982">"බැටරිය සුරකින්නා"</string>
-    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ස්වයන්ක්‍රියව සක්‍රිය කරන්න"</string>
+    <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"ස්වයන්ක්‍රියව ක්‍රියාත්මක කරන්න"</string>
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"කවදාවත් නෑ"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"බැටරිය <xliff:g id="PERCENT">%1$s</xliff:g> හි"</string>
     <string name="battery_percentage" msgid="723291197508049369">"බැටරි ප්‍රතිශතය"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"හඬ ආදාන සහ ප්‍රතිදාන සැකසීම්"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"හඬ සෙවීම"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android යතුරුපුවරුව"</string>
-    <string name="voice_category" msgid="1430370497125803904">"කථනය"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"හඬ ආදාන සැකසීම්"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"හඬ ආදානය"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"හඬ ආදානය සේවා"</string>
@@ -2146,7 +2142,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">"අක්තපත්‍ර ආචයනය ඔබ භාවිතා කිරීමට පෙර අගුළු තිර PIN එකක් හෝ මුරපදයක් ඔබ දැමිය යුතුය."</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>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"දැනුම්දීමේ ශබ්ද ත්‍රීවතාව"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"දුරකථන රිගින්ටෝනය"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"පෙරනිමි දැනුම්දීම් හඬ"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"යෙදුම සපයන හඬ"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"පෙරනිමි දැනුම්දීම් හඬ"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"පෙරනිමි එලාම හඬ"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"ඇමතුම් සඳහාත් කම්පනය කරන්න"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"වෙනත් ශබ්ද"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"දැනුම්දීම් කිසිදා නොපෙන්වන්න"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"පහළ: ශබ්ද හෝ දෘශ්‍ය බාධා නැත"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"මධ්‍යම: ශබ්ද නැත"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ඉහළ: ශබ්ද කරන්න"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"හදිසි: ශබ්ද කර තිරය මත උත්පතනය කරන්න"</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="6585849855452076626">"ශබ්දයට ඉඩ දීම"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ශබ්ද කිරීම, කම්පනය කිරීම, හෝ මෙම දැනුම්දීම් වත්මන් තිරයේ දසුන මතට එබිකම් කිරීම නොකරන්න."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"දැනුම්දීම් සහායක"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ප්‍රවේශය බාධා නොකරන්න"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ස්ථාපිත යෙදුම් කිසිවක් ප්‍රවේශය බාධා නොකරන්න ඉල්ලා නැත"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"යෙදුම් පූරණය වේ..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android මෙම යෙදුමෙහි දැනුම්දීම් මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android දැනුම්දීම්වල මෙම ප්‍රවර්ගය මෙම උපාංගය මත දිස් වීම අවහිර කරමින් ඇත"</string>
     <string name="notification_channels" msgid="5346841743182627500">"ප්‍රවර්ග"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"වෙනත්"</string>
     <string name="no_channels" msgid="3077375508177744586">"මෙම යෙදුම දැනුම්දීම් කිසිවක් පළ කර නැත"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"දැනට තිබෙන දිශානතියේ සිටින්න"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"ආරක්ෂිත ආරම්භය"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ඉදිරියට යන්න"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN එක අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ රටාව අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ රටාව අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"උපාංගය ආරම්භ කිරීමට PIN එක අවශ්‍යය"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"උපාංගය ආරම්භ කිරීමට රටාව අවශ්‍යය"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"උපාංගය ආරම්භ කිරීමට මුරපදය අවශ්‍යය"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"එපා ස්තූතියි"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"එපා ස්තූතියි"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"එපා ස්තූතියි"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN එක අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට PIN එක අවශ්‍යද?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ රටාව අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට රටාවක් අවශ්‍යද?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැක. උපාංගය ආරම්භ වන තෙක්, එයට සීනු ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබාගත නොහැක.\n\nනැතිවූ හෝ සොරකම් කළ උපාංග වල දත්ත ආරක්ෂා කිරීමට මෙය උදව් කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට මුරපදයක් අවශ්‍යද?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ PIN අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට PIN එක අවශ්‍යද?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ රටාව අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට රටාවක් අවශ්‍යද?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"ඔබේ උපාංගය අගුලු හැරීමට ඔබේ ඇඟිලි සලකුණ භාවිත කිරීමට අමතරව, උපාංගය ආරම්භ වීමට පෙර ඔබගේ මුරපදය අවශ්‍ය වීම මඟින් ඔබට එය තව දුරටත් ආරක්ෂා කළ හැකිය. උපාංගය ආරම්භ වන තෙක්, එයට එලාම ඇතුළත්ව ඇමතුම්, පණිවිඩ හෝ දැනුම්දීම් ලබා ගත නොහැකිය.\n\nනැතිවූ හෝ සොරකම් කළ උපාංගවල දත්ත ආරක්ෂා කිරීමට මෙය උදවු කරයි. ඔබගේ උපාංගය පණ ගැන්වීමට මුරපදයක් අවශ්‍යයි&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ඔව්"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"නැත"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN එක අවශ්‍යද?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"රටාව අවශ්‍යද?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"මුරපදය අවශ්‍යද?"</string>
@@ -3076,7 +3073,7 @@
     <string name="default_app" msgid="6864503001385843060">"(සුපුරුදු)"</string>
     <string name="system_app" msgid="9068313769550747372">"(පද්ධතිය)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(පද්ධතිය පෙරනිමි)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"යෙදුම් ආචයනය"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"යෙදුම් ගබඩාව"</string>
     <string name="usage_access" msgid="5479504953931038165">"පරිශීලන ප්‍රවේශය"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"පරිශීලන ප්‍රවේශ අවසර දීම"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"යෙදුම් පරිශීලන මනාප"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"ඔව්"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"එපා"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"යෙදුම ස්ථාපනයට ඉඩ දීම"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"ඉඩ දුන්"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"ඉඩ නොදෙන"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"කැමරාව සඳහා බල බොත්තම දෙවරක් ඔබන්න"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"වෙත සම්බන්ධිතයි"</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>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"ටැබ්ලට ආචයනය"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"දුරකථන ගබඞාව"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g> න් භාවිත කළ"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"<xliff:g id="TOTAL">%1$s</xliff:g>න් භාවිත කළ"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"භාවිතා කළ"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"යෙදුම හිස් කරන්න"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"ඔබට මෙම ක්ෂණික යෙදුම ඉවත් කිරීමට අවශ්‍යද?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> පරිශීලක සඳහා අබල කෙරිණි)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"ස්වයං පිරවුම් සේවාව"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ස්වයං, පිරවුම, ස්වයං පිරවුම"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> ඔබේ ස්වයං පිරවුම් යෙදුම බවට පත් කරන්නද? <xliff:g id="APP_NAME_1">%1$s</xliff:g> හට ඔබේ තිරය කියවීමට සහ වෙනත් යෙදුම්වල ක්ෂේත්‍ර පිරවීමට හැකි වනු ඇත."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ඔබ මෙම යෙදුම විශ්වාස කරන බව සහතික කර ගන්න&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ස්වයං පිරවිය හැකි දේවල් නිර්ණය කිරීමට ඔබේ තිරයෙහි ඇති දේවල් භාවිත කරයි."</string>
     <string name="device_theme" msgid="4571803018917608588">"උපාංග තේමාව"</string>
     <string name="default_theme" msgid="7085644992078579076">"පෙරනිමි"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ගබඩා කළමනාකරු: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index b1eaa3f..cd29ee5 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -135,7 +135,7 @@
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"2 min."</item>
     <item msgid="8675215713017289017">"5 min."</item>
-    <item msgid="477015974247590543">"1 hod."</item>
+    <item msgid="477015974247590543">"1 h"</item>
     <item msgid="5198271470953124739">"Bez časového limitu"</item>
   </string-array>
   <string-array name="wifi_signal">
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Žiadne"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Žiadne"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -262,7 +264,7 @@
     <item msgid="8181415497109310680">"čítanie správ SMS"</item>
     <item msgid="6816551144382117307">"písanie správ SMS"</item>
     <item msgid="4600463921908905030">"príjem správ SMS"</item>
-    <item msgid="5958926493289432745">"príjem núdzových správ SMS"</item>
+    <item msgid="5958926493289432745">"príjem tiesňových SMS"</item>
     <item msgid="4945269495221089540">"príjem správ MMS"</item>
     <item msgid="5570472453573929087">"príjem správ WAP push"</item>
     <item msgid="7125408150230860501">"odosielanie správ SMS"</item>
@@ -302,7 +304,7 @@
     <item msgid="6108267038969274380">"spracovanie odchádzajúcich hovorov"</item>
     <item msgid="4823402479973873358">"odtlačok prsta"</item>
     <item msgid="5895843015407713543">"telesné senzory"</item>
-    <item msgid="1436446526955010826">"čítanie vysielaní cell broadcast"</item>
+    <item msgid="1436446526955010826">"čítať správy informačných služieb"</item>
     <item msgid="884172201575690484">"napodobnenie miesta"</item>
     <item msgid="3591971310048485247">"čítanie úložiska"</item>
     <item msgid="4041187808621866119">"zápis do úložiska"</item>
@@ -369,7 +371,7 @@
     <item msgid="1958009349883195116">"Spracovanie odchádzajúcich hovorov"</item>
     <item msgid="8526563410140613458">"Odtlačok prsta"</item>
     <item msgid="7864822459293570891">"Telesné senzory"</item>
-    <item msgid="6798698496904810960">"Čítanie vysielaní cell broadcast"</item>
+    <item msgid="6798698496904810960">"Čítať správy informačných služieb"</item>
     <item msgid="5242052845700875820">"Napodobnenie miesta"</item>
     <item msgid="1246296877820358565">"Čítanie úložiska"</item>
     <item msgid="2404067308793740341">"Zápis do úložiska"</item>
@@ -462,7 +464,7 @@
     <item msgid="5779398140277006695">"Najčastejšia aktivita"</item>
     <item msgid="1439598363694578255">"Dôležitý (v popredí)"</item>
     <item msgid="3396458970745718652">"Dôležitý (v pozadí)"</item>
-    <item msgid="5214825238247511992">"Záloha"</item>
+    <item msgid="5214825238247511992">"Zálohovanie"</item>
     <item msgid="311372689168254967">"Vysoké vyťaženie"</item>
     <item msgid="7438189122367820362">"Služba (spustená)"</item>
     <item msgid="918687422516982498">"Služba (reštartuje sa)"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 96f87bb..c12f084 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -333,20 +333,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Účty"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Zabezpečenie a poloha"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifrovanie a poverenia"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Šifrované telefónom"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefón zašifrovaný"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Predvoľby uzamknutej obrazovky"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie úložiska poverení"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Ochrana súkromia"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Zakázané správcom"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stav zabezpečenia"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Zámka obrazovky, odtlačok prsta"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zámka obrazovky"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Odtlačok prsta"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Správa odtlačkov"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Použiť odtlačok na"</string>
@@ -452,7 +451,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">"Zaistite si ďalšiu úroveň zabezpečenia – nastavte si záložnú zámku obrazovky."</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="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>
@@ -480,7 +479,7 @@
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Odtlačok prsta + kód PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Odtlačok prsta + heslo"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"Pokračovať bez odtlačku prsta"</string>
-    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Telefón môžete odomykať pomocou odtlačku prsta. Táto možnosť vyžaduje z bezpečných dôvodov záložnú zámku obrazovky."</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"Telefón môžete odomknúť odtlačkom prsta. Táto možnosť vyžaduje z bezpečnostných dôvodov dodatočnú zámku obrazovky."</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"Zakázané správcom, pravidlom šifrovania alebo úložiskom poverení"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Žiadna"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"Prejdenie prstom"</string>
@@ -597,7 +596,7 @@
       <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> aktívna aplikácia</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agenty dôvery"</string>
-    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Pred použitím musíte nastaviť zámku obrazovky"</string>
+    <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"Pred použitím treba nastaviť zámku obrazovky"</string>
     <string name="manage_trust_agents_summary" msgid="1475819820389620546">"Žiadne"</string>
     <plurals name="manage_trust_agents_summary_on" formatted="false" msgid="3935182396726101824">
       <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> aktívne agenty dôvery</item>
@@ -648,8 +647,8 @@
     <string name="bluetooth_device_context_connect_advanced" msgid="2643129703569788771">"Možnosti…"</string>
     <string name="bluetooth_menu_advanced" msgid="8572178316357220524">"Rozšírené"</string>
     <string name="bluetooth_advanced_titlebar" msgid="2142159726881547669">"Rozšírené nastavenia Bluetooth"</string>
-    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Keď je zapnuté pripojenie Bluetooth, zariadenie môže komunikovať s ostatnými zariadeniami Bluetooth v okolí."</string>
-    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Systémové aplikácie a služby môžu stále rozpoznať zariadenia Bluetooth, aby tak zlepšili presnosť polohy. Môžete to zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania zariadení<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
+    <string name="bluetooth_empty_list_bluetooth_off" msgid="6351930724051893423">"Keď je zapnuté pripojenie Bluetooth, zariadenie môže komunikovať s ostatnými zariadeniami s funkciou Bluetooth v okolí."</string>
+    <string name="ble_scan_notify_text" msgid="1295915006005700650">"Systémové aplikácie a služby môžu stále rozpoznávať zariadenia Bluetooth, aby tak zlepšili presnosť polohy. Môžete to zmeniť v <xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>nastaveniach vyhľadávania zariadení<xliff:g id="LINK_END_1">LINK_END</xliff:g>."</string>
     <string name="bluetooth_connect_specific_profiles_title" msgid="6952214406025825164">"Pripojiť k…"</string>
     <string name="bluetooth_disconnect_a2dp_profile" msgid="3524648279150937177">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky média."</string>
     <string name="bluetooth_disconnect_headset_profile" msgid="8635908811168780720">"Zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> bude odpojené od zvukovej jednotky handsfree."</string>
@@ -688,13 +687,13 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> chce zapnúť Wi-Fi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> chce vypnúť Wi-Fi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Povoliť výmenu dát, ak sa tablet dotýka iného zariadenia"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Povoliť výmenu dát, ak sa telefón dotýka iného zariadenia"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Zapnutie NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC posiela dáta medzi týmto zariadením a ďalšími zariadeniami alebo cieľmi v okolí, ako sú platobné terminály, čítačky prístupových médií a interaktívne reklamy alebo značky."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Prenos obsahu aplikácie prostredníctvom technológie NFC je pripravený"</string>
-    <string name="android_beam_off_summary" msgid="4663095428454779138">"Vyp."</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Prenos obsahu aplikácie prostredníctvom NFC je pripravený"</string>
+    <string name="android_beam_off_summary" msgid="4663095428454779138">"Vypnuté"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Nedostupné, pretože je vypnutá technológia NFC"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
     <string name="android_beam_explained" msgid="1810540319385192758">"Keď je táto funkcia zapnutá a podržíte zariadenia blízko pri sebe, môžete odosielať obsah aplikácií do iného zariadenia s technológiou NFC. Môžete napríklad odosielať webové stránky, videá YouTube, kontakty a ďalší obsah.\n\nStačí priložiť zariadenia k sebe (obyčajne zadnými stranami) a potom klepnúť na obrazovku. Aplikácia určí, aký obsah sa prenesie."</string>
@@ -710,10 +709,11 @@
     <string name="wifi_error" msgid="3207971103917128179">"Chyba"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"V tejto krajine nie je pásmo 5 GHz k dispozícii"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Režim v lietadle"</string>
-    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Otvárať upozornenie na siete"</string>
+    <string name="wifi_notify_open_networks" msgid="76298880708051981">"Oznamovať verejné siete"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Upozorniť na dostupnosť verejnej siete vysokej kvality"</string>
-    <string name="wifi_wakeup" msgid="8815640989361538036">"Zapnúť Wi‑Fi automaticky"</string>
+    <string name="wifi_wakeup" msgid="8815640989361538036">"Zapínať Wi‑Fi automaticky"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi sa znova zapne v blízkosti uložených sietí vysokej kvality, ako je napríklad vaša domáca sieť"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nedostupné, pretože vyhľadávanie cez Wi‑Fi je vypnuté"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Vyhnúť sa nekvalitným pripojeniam"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Nepoužívať sieť Wi-Fi, pokiaľ nemá dostatočne kvalitné internetové pripojenie"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Použiť iba siete s dobrým pripojením k internetu"</string>
@@ -736,7 +736,7 @@
     <string name="wifi_add_network" msgid="6234851776910938957">"Pridať sieť"</string>
     <string name="wifi_configure_settings_preference_title" msgid="2913345003906899146">"Predvoľby siete Wi‑Fi"</string>
     <string name="wifi_configure_settings_preference_summary_wakeup_on" msgid="646393113104367290">"Wi‑Fi sa automaticky znova zapne"</string>
-    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi sa automaticky znova nezapne"</string>
+    <string name="wifi_configure_settings_preference_summary_wakeup_off" msgid="2782566279864356713">"Wi‑Fi sa nezapína automaticky znova"</string>
     <string name="wifi_access_points" msgid="7053990007031968609">"Siete Wi-Fi"</string>
     <string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"Tlačidlo WPS"</string>
     <string name="wifi_menu_more_options" msgid="2448097861752719396">"Ďalšie možnosti"</string>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurácia 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 IP"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podsiete"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresy IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Uložené siete"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavenia adresy IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Rozšírené nastavenia Wi-Fi nie sú pre tohto používateľa dostupné"</string>
@@ -922,7 +920,7 @@
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
     <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"Ak je zapnuté volanie Wi-Fi, váš telefón môže smerovať volania cez siete Wi-Fi alebo cez sieť vášho operátora. Závisí to od vašich nastavení a od toho, ktorý signál je silnejší. Pred zapnutím tejto funkcie kontaktujte svojho operátora a informujte sa o poplatkoch a ďalších podrobnostiach."</string>
-    <string name="emergency_address_title" msgid="3571902448699714454">"Aktualizácia núdzovej adresy"</string>
+    <string name="emergency_address_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="display_settings_title" msgid="1708697328627382561">"Obrazovka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
@@ -930,12 +928,12 @@
     <string name="musicfx_title" msgid="3415566786340790345">"Hudobné efekty"</string>
     <string name="ring_volume_title" msgid="5592466070832128777">"Hlasitosť zvonenia"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
-    <string name="notification_sound_title" msgid="5137483249425507572">"Predvolené zvukové upozornenie"</string>
+    <string name="notification_sound_title" msgid="5137483249425507572">"Predvolený zvuk upozornenia"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tón zvonenia"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Upozornenie"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Použije hlasitosť prichádzajúcich hovorov aj pre upozornenia"</string>
     <string name="home_work_profile_not_supported" msgid="1357721012342357037">"Nepodporuje pracovné profily"</string>
-    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Predvolené zvukové upozornenie"</string>
+    <string name="notification_sound_dialog_title" msgid="3805140135741385667">"Predvolený zvuk upozornenia"</string>
     <string name="media_volume_title" msgid="3576565767317118106">"Médiá"</string>
     <string name="media_volume_summary" msgid="5363248930648849974">"Umožňuje nastaviť hlasitosť hudby a videí"</string>
     <string name="alarm_volume_title" msgid="2285597478377758706">"Budík"</string>
@@ -1031,7 +1029,7 @@
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Vlastná"</string>
     <string name="wallpaper_suggestion_title" msgid="8583988696513822528">"Zmena tapety"</string>
     <string name="wallpaper_suggestion_summary" msgid="1579144009898110491">"Prispôsobte si obrazovku"</string>
-    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
+    <string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu"</string>
     <string name="screensaver_settings_title" msgid="1770575686476851778">"Šetrič obrazovky"</string>
     <string name="screensaver_settings_summary_either_long" msgid="7302740999250873332">"Počas nabíjania alebo v doku"</string>
     <string name="screensaver_settings_summary_either_short" msgid="6140527286137331478">"V oboch prípadoch"</string>
@@ -1041,13 +1039,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Vypnuté"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Ak chcete ovládať, čo sa má stať, keď je telefón v doku alebo v režime spánku, zapnite šetrič obrazovky."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Čas spustenia"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Aktuálny šetrič obrazovky"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Spustiť"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavenia"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Prebudiť zdvihnutím"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Obrazovka prichádz. upozornenia"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambientné zobrazenie"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Prebudiť obrazovku, keď dostanete upozornenie"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Zväčšite alebo zmenšite text"</string>
@@ -1056,14 +1053,14 @@
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Vypnuté"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Zamknuté"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"Zámka SIM karty"</string>
-    <string name="sim_pin_toggle" msgid="1742123478029451888">"Uzamykať SIM kartu"</string>
+    <string name="sim_pin_toggle" msgid="1742123478029451888">"Zamykať SIM kartu"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Na použitie tabletu vyžadovať PIN"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Na použitie telefónu vyžadovať PIN"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Na použitie tabletu vyžadovať PIN"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"Na použitie telefónu vyžadovať PIN"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Zmeniť PIN SIM karty"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"Kód PIN SIM karty"</string>
-    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Uzamykať SIM kartu"</string>
+    <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Zamykať SIM kartu"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"Odomknúť SIM kartu"</string>
     <string name="sim_enter_old" msgid="6074196344494634348">"Starý kód PIN SIM karty"</string>
     <string name="sim_enter_new" msgid="8742727032729243562">"Nový kód PIN SIM karty"</string>
@@ -1116,7 +1113,7 @@
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"Umožňuje odpojiť SD kartu a zobraziť dostupný ukladací priestor"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Moje telefónne číslo"</string>
-    <string name="status_min_number" msgid="3519504522179420597">"Min."</string>
+    <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
     <string name="status_msid_number" msgid="909010114445780530">"MSID"</string>
     <string name="status_prl_version" msgid="1007470446618081441">"Verzia PRL"</string>
     <string name="status_meid_number" msgid="1751442889111731088">"MEID"</string>
@@ -1189,7 +1186,7 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Odstrániť záznam"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Nastaviť"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Preskúmať"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"Uvoľnite miesto"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Uvoľniť miesto"</string>
     <string name="storage_menu_manage" msgid="5914482953856430780">"Spravovať úložisko"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Pripojenie USB k počítaču"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Pripojiť ako"</string>
@@ -1308,7 +1305,7 @@
     <string name="reset_dashboard_title" msgid="4412694650600342973">"Obnoviť"</string>
     <string name="reset_network_title" msgid="4557113742173895074">"Obnovenie nastavení siete"</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">"Resetovať nastavenia"</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>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"Resetovať nastavenia"</string>
     <string name="reset_network_confirm_title" msgid="1759888886976962773">"Resetovať?"</string>
@@ -1344,17 +1341,17 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"Čakajte..."</string>
     <string name="call_settings_title" msgid="5188713413939232801">"Nastavenia hovorov"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"Nastavenie hlasovej schránky, presmerovania hovorov, čakajúcich hovorov a identifikácie volajúceho"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Zdieľané pripojenie cez USB"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"Pripojenie cez USB"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prenosný prístupový bod"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Pripojenie cez Bluetooth"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Zdieľanie dát. pripojenia"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Zdieľané pripojenie"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"Hotspot a tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"Hotspot je zapnutý, tethering"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"Hotspot je zapnutý"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Tethering"</string>
-    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Keď je Šetrič dát zapnutý, nie je možné zdieľať internetové pripojenie ani používať prenosné hotspoty"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"Zdieľané pripojenie"</string>
+    <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Keď je šetrič dát zapnutý, nie je možné zdieľať dátové pripojenie ani používať prenosné hotspoty"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"Zdieľané pripojenie cez USB"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"Pripojenie cez USB"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"Prepojené cez USB. Ak chcete zdieľať dátové pripojenie, zapnite túto voľbu."</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Zdieľané dátové pripojenie"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Internetové pripojenie nie je možné zdieľať, pokiaľ sa používa úložisko USB"</string>
@@ -1374,11 +1371,11 @@
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Internetové pripojenie nie je zdieľané"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Maximálny počet zariadení na zdieľanie dátového pripojenia: <xliff:g id="MAXCONNECTION">%1$d</xliff:g>."</string>
     <string name="bluetooth_untether_blank" msgid="2871192409329334813">"Ukončí sa zdieľané dát. pripojenie zariad. <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
-    <string name="tethering_footer_info" msgid="7287131664937054043">"Hotspot a tethering umožňujú poskytovať internetové pripojenie ostatným zariadeniam prostredníctvom vášho mobilného dátového pripojenia."</string>
+    <string name="tethering_footer_info" msgid="7287131664937054043">"Hotspot a zdieľané pripojenie umožňujú poskytovať internet ostatným zariadeniam prostredníctvom vášho mobilného dátového pripojenia."</string>
     <string name="tethering_help_button_text" msgid="656117495547173630">"Pomocník"</string>
     <string name="network_settings_title" msgid="2876509814832830757">"Mobilná sieť"</string>
     <string name="manage_mobile_plan_title" msgid="7630170375010107744">"Mobilný plán"</string>
-    <string name="sms_application_title" msgid="4903928270533250448">"Aplikácia pre SMS"</string>
+    <string name="sms_application_title" msgid="4903928270533250448">"Aplikácia na SMS"</string>
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmeniť aplikáciu na SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Použiť aplikáciu <xliff:g id="NEW_APP">%1$s</xliff:g> namiesto <xliff:g id="CURRENT_APP">%2$s</xliff:g> ako aplikáciu na SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Použiť aplikáciu <xliff:g id="NEW_APP">%s</xliff:g> ako aplikáciu pre SMS?"</string>
@@ -1409,9 +1406,9 @@
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Na určenie polohy používať Wi-Fi, Bluetooth alebo mobilné siete"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Na určenie polohy používať GPS"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Vyhľadávanie"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhľadávanie sietí Wi-Fi"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Vyhľadávať siete Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Vylepšite určovanie polohy tým, že systémovým aplikáciám a službám umožníte kedykoľvek rozpoznávať siete Wi-Fi."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Vyhľadávanie zariadení Bluetooth"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Vyhľadávať zariadenia Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Vylepšite určovanie polohy tým, že systémovým aplikáciám a službám umožníte kedykoľvek rozpoznávať zariadenia Bluetooth."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Poloha Wi-Fi a mobilnej siete"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Povoliť apl. používať službu urč. polohy Google a rýchl. odhad. vašu polohu. Anonym. údaje o polohe sa budú odosielať spol. Google."</string>
@@ -1517,7 +1514,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Rovnaká ako zámka obrazovky zariadenia"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Spravovať aplikácie"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Správa a odstraňovanie nainštalovaných aplikácií"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Informácie o aplikácii"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Informácie o aplikáciách"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Správa aplikácií a nastavenie rýchleho spustenia"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Nastavenia aplikácie"</string>
     <string name="install_applications" msgid="4872012136210802181">"Neznáme zdroje"</string>
@@ -1578,14 +1575,14 @@
     <string name="filter" msgid="2018011724373033887">"Filtrovať"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Zvoľte možnosti filtra"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"Všetky aplikácie"</string>
-    <string name="filter_apps_disabled" msgid="5862632369555319938">"Zakázané aplikácie"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Deaktivované aplikácie"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Stiahnuté"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Spustené"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Ukladací priestor USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Na SD karte"</string>
     <string name="disabled" msgid="9206776641295849915">"Zakázané"</string>
     <string name="not_installed" msgid="2797554494953450291">"Pre tohto používateľa nenainš."</string>
-    <string name="installed" msgid="3070865169422600098">"Nainštalovaná"</string>
+    <string name="installed" msgid="3070865169422600098">"Nainštalované"</string>
     <string name="no_applications" msgid="7336588977497084921">"Žiadne aplikácie."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Interný ukl. priestor"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"interné úložisko"</string>
@@ -1636,15 +1633,16 @@
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferované umiestnenie pre inštaláciu"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"Zmena preferovaného umiestnenia pre inštaláciu nových aplikácií"</string>
     <string name="app_disable_dlg_title" msgid="3916469657537695436">"Chcete deaktivovať vstavanú aplikáciu?"</string>
-    <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Zakázať aplikáciu"</string>
-    <string name="app_disable_dlg_text" msgid="5632072173181990531">"Ak zakážete túto aplikáciu, systém Android a ďalšie aplikácie už nemusia fungovať podľa očakávaní."</string>
-    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Odstrániť údaje a zakázať aplikáciu?"</string>
-    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ak zakážete túto aplikáciu, systém Android a ďalšie aplikácie už nemusia fungovať podľa očakávaní. Taktiež sa odstránia vaše údaje."</string>
+    <string name="app_disable_dlg_positive" msgid="7375627244201714263">"Deaktivovať aplikáciu"</string>
+    <string name="app_disable_dlg_text" msgid="5632072173181990531">"Ak aplikáciu deaktivujete, systém a ďalšie aplikácie už nemusia fungovať podľa očakávaní."</string>
+    <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"Chcete odstrániť dáta a deaktivovať aplikáciu?"</string>
+    <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"Ak aplikáciu deaktivujete, systém a ďalšie aplikácie už nemusia fungovať podľa očakávaní. Taktiež sa odstránia vaše dáta."</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"Vypnúť upozornenia?"</string>
     <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"Ak v tejto aplikácii vypnete upozornenia, môžete prísť o dôležité upozornenia a aktuálne informácie."</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Obchod"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Podrobnosti o aplikácii"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikácia bola nainštalovaná z obchodu <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Ďalšie informácie: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Fungovanie aplikácií"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Spustené"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikdy nepoužité)"</string>
@@ -1673,7 +1671,7 @@
     <string name="running_processes_header_system_prefix" msgid="6104153299581682047">"Systém"</string>
     <string name="running_processes_header_apps_prefix" msgid="5787594452716832727">"Aplikácie"</string>
     <string name="running_processes_header_free_prefix" msgid="4620613031737078415">"Voľné"</string>
-    <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Použité"</string>
+    <string name="running_processes_header_used_prefix" msgid="5924288703085123978">"Využité"</string>
     <string name="running_processes_header_cached_prefix" msgid="7950853188089434987">"Vo vyr. pamäti"</string>
     <string name="running_processes_header_ram" msgid="996092388884426817">"<xliff:g id="RAM_0">%1$s</xliff:g> RAM"</string>
     <string name="runningservicedetails_settings_title" msgid="3224004818524731568">"Spustená aplikácia"</string>
@@ -1694,7 +1692,7 @@
     <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"Ak túto službu zastavíte, niektoré funkcie vášho telefónu nemusia fungovať. Ich funkčnosť sa obnoví až po vypnutí telefónu a jeho opätovnom zapnutí."</string>
     <string name="language_settings" msgid="8758655933029560944">"Jazyky a vstup"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"Jazyky a vstup"</string>
-    <string name="input_assistance" msgid="7577795275222555487">"Pomoc vstupu"</string>
+    <string name="input_assistance" msgid="7577795275222555487">"Pomoc so zadávaním"</string>
     <string name="keyboard_settings_category" msgid="8275523930352487827">"Klávesnica a metódy vstupu"</string>
     <string name="phone_language" msgid="7116581601133118044">"Jazyky"</string>
     <string name="phone_language_summary" msgid="3871309445655554211"></string>
@@ -1714,15 +1712,14 @@
     <string name="virtual_keyboard_category" msgid="1012830752318677119">"Virtuálna klávesnica"</string>
     <string name="available_virtual_keyboard_category" msgid="7645766574969139819">"Dostupná virtuálna klávesnica"</string>
     <string name="add_virtual_keyboard" msgid="3302152381456516928">"Spravovať klávesnice"</string>
-    <string name="keyboard_assistance_category" msgid="5843634175231134014">"Pomoc pre klávesnicu"</string>
+    <string name="keyboard_assistance_category" msgid="5843634175231134014">"Pomoc s klávesnicou"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Fyzická klávesnica"</string>
     <string name="show_ime" msgid="2658582193437188227">"Zobraziť virtuálnu klávesnicu"</string>
     <string name="show_ime_summary" msgid="8164993045923240698">"Ponechať na obrazovke, keď je aktívna fyzická klávesnica"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomocník pre klávesové skratky"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Zobraziť dostupné klávesové skratky"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Predvolené"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Myš alebo trackpad"</string>
-    <string name="pointer_speed" msgid="1221342330217861616">"Rýchlosť ukazovateľa"</string>
+    <string name="pointer_speed" msgid="1221342330217861616">"Rýchlosť kurzora"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Herné ovládače"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Použiť vibrovanie"</string>
     <string name="vibrate_input_devices_summary" msgid="4595570516865299153">"Presmerovať vibrácie do herného ovládača, pokiaľ je pripojený."</string>
@@ -1747,7 +1744,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Upraviť slovo"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Upraviť"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Odstrániť"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"V používateľskom slovníku sa nenachádzajú žiadne slová. Slovo môžete pridať klepnutím na tlačidlo Pridať (+)."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"V používateľskom slovníku nie sú žiadne slová. Klepnutím na tlačidlo + môžete pridať slovo."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"pre všetky jazyky"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Ďalšie jazyky..."</string>
     <string name="testing" msgid="6584352735303604146">"Testovanie"</string>
@@ -1777,9 +1774,9 @@
     <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> hod. <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> hod. <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="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>
@@ -1789,7 +1786,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Dostupnosť"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Nastavenia dostupnosti"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Čítačky obrazovky, zobrazenie, ovládacie prvky interakcie"</string>
-    <string name="vision_settings_title" msgid="4204111425716868288">"Nastavenia viditeľnosti"</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="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>
@@ -1801,15 +1798,15 @@
     <string name="talkback_summary" msgid="8331244650729024963">"Čítačka obrazovky je určená hlavne pre nevidiacich a slabozrakých ľudí"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Položky na obrazovke si môžete vypočuť nahlas klepnutím"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Titulky"</string>
-    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Lupa"</string>
+    <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Priblíženie"</string>
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Priblíženie trojitým klepnutím"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Priblíženie tlačidlom"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Priblíženie tlačidlom a trojitým klepnutím"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Priblížiť obrazovku"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Zobrazenie priblížite/oddialite trojitým klepnutím"</string>
-    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Klepnutím na tlačidlo priblížite"</string>
-    <string name="accessibility_screen_magnification_summary" msgid="5258868553337478505"><b>"Ak chcete zobrazenie priblížiť"</b>", rýchlo trikrát 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ím prst pridržíte.\n"<ul><li>"Obrazovku môžete posúvať presunutím prsta."</li>\n<li>"Zdvihnutím prsta zobrazenie oddialite."</li></ul>\n\n"Nemôžete priblížiť klávesnicu ani navigačný panel."</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ť presunutím prsta."</li>\n<li>"Zdvihnutím prsta zobrazenie oddialite."</li></ul>\n\n"Nemôžete priblížiť klávesnicu ani navigačný panel."</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Priblížte si obrazovku"</string>
+    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Na priblíženie trikrát klepnite"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Na priblíženie klepnite na tlačidlo"</string>
+    <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_shortcut_service_title" msgid="4779360749706905640">"Služba klávesových skratiek"</string>
@@ -1818,18 +1815,18 @@
     <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>
-    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Vypínač ukončí hovor"</string>
+    <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Ukončiť hovor vypínačom"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Veľký kurzor myši"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Zvuk mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Pri prehrávaní zvuku kombinovať kanály"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Pri prehrávaní zvuku zlúčiť kanály"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Oneskorenie pridržania"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inverzia farieb"</string>
     <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">"ZAP."</string>
-    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"VYP."</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>
     <string name="daltonizer_type" msgid="1124178250809091080">"Režim korekcie"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -1914,10 +1911,10 @@
     <string name="print_settings" msgid="4742428530112487843">"Tlač"</string>
     <string name="print_settings_summary_no_service" msgid="6354322414246865875">"Vypnutá"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
-      <item quantity="few">Sú zapnuté <xliff:g id="COUNT">%1$d</xliff:g> tlačové služby</item>
-      <item quantity="many">Je zapnutej <xliff:g id="COUNT">%1$d</xliff:g> tlačovej služby</item>
-      <item quantity="other">Je zapnutých <xliff:g id="COUNT">%1$d</xliff:g> tlačových služieb</item>
-      <item quantity="one">Je zapnutá 1 tlačová služba</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> zapnuté tlačové služby</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> print services on</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> zapnutých tlačových služieb</item>
+      <item quantity="one">1 zapnutá tlačová služba</item>
     </plurals>
     <string name="print_settings_title" msgid="3685449667822217816">"Tlačové služby"</string>
     <string name="print_no_services_installed" msgid="8443039625463872294">"Nie sú nainštalované žiadne služby"</string>
@@ -1954,11 +1951,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Keď sa aplikácia nepoužíva, môže byť spustená na pozadí"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Keď sa aplikácia nepoužíva, jej aktivita na pozadí je obmedzená"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Aplikácia nemá povolené spustenie na pozadí"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Využitie obrazovky od úplného dobitia"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Využitie obrazovky od úplného nabitia"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Spotreba obrazovkou"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Vyhľadávanie mobilnej siete"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Využitie aplikácií od úplného dobitia (pred <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Spotreba aplikácií od úplného nabitia (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Ako dlho bola zapnutá obrazovka od úplného dobitia"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Využitie zariadenia od úplného dobitia"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Využitie batérie od odpojenia"</string>
@@ -1978,7 +1975,7 @@
     <string name="awake" msgid="387122265874485088">"Doba používania zariadenia"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi-Fi"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Rozšírené využitie batérie"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Podrobnosti využitia batérie"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Podrobnosti histórie"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Využitie batérie"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Využitie"</string>
@@ -1989,7 +1986,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparát"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Telefón v pohotovostnom režime"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Pohotovostný režim mobilnej siete"</string>
     <string name="power_phone" msgid="5392641106474567277">"Hlasové hovory"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet je nečinný"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefón v stave nečinnosti"</string>
@@ -2049,16 +2046,16 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Využitie batérie je približný údaj o spotrebe energie a nezahrnuje každý zdroj využívajúci batériu. Režim Rôzne predstavuje rozdiel medzi vypočítanou spotrebou energie a skutočnou pozorovanou spotrebou batérie."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Nadsadená spotreba energie"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Využívaná %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Používané <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> využila aplikácia <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celkovej výdrže batérie"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Prehľad od posledného úplného dobitia"</string>
-    <string name="battery_last_full_charge" msgid="7151251641099019361">"Posledné úplné dobitie"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Údaje o zostávajúcej výdrži batérie sú približné a môžu sa meniť v závislosti od využitia"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Prehľad od posledného úplného nabitia"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Posledné úplné nabitie"</string>
+    <string name="battery_footer_summary" msgid="4701358808575132647">"Zostávajúci čas výdrže batérie je približný a môže sa meniť podľa spôsobu používania"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Pri aktívnom používaní"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Na pozadí"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Využitie batérie"</string>
-    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> celkového využitia aplikáciou (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> celkovej spotreby aplikácií (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Od úplného dobitia"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"Správa využitia batérie"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Odhadovaný zostávajúci čas:"</string>
@@ -2076,7 +2073,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Nikdy"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"pri <xliff:g id="PERCENT">%1$s</xliff:g> batérie"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Percentá batérie"</string>
-    <string name="battery_percentage_description" msgid="8511658577507384014">"Zobrazovanie percent batérie v stavovom riadku"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Zobrazovať percentá v stavovom riadku"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Štatistiky procesov"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Podrobné štatistiky spustených procesov"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Využitie pamäte"</string>
@@ -2121,7 +2118,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavenia hlasového vstupu a výstupu"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Hlasové vyhľadávanie"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Klávesnica Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Reč"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Nastavenia hlasového vstupu"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Hlasový vstup"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Služby hlasového vstupu"</string>
@@ -2187,11 +2183,11 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Úložisko poverení bolo vymazané"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Úlož. poverení nemožno vymazať"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Úložisko poverení je aktivované."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Pred použitím úložiska poverení musíte nastaviť kód PIN alebo heslo zámky obrazovky."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Pred použitím úložiska poverení musíte nastaviť PIN alebo heslo na uzamknutie obrazovky."</string>
     <string name="usage_access_title" msgid="332333405495457839">"Prístup k dátam o používaní"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tiesňové vyzváňanie"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Nastaviť správanie pri tiesňovom volaní"</string>
-    <string name="privacy_settings_title" msgid="2978878794187459190">"Záloha"</string>
+    <string name="privacy_settings_title" msgid="2978878794187459190">"Zálohovanie"</string>
     <string name="backup_section_title" msgid="7952232291452882740">"Zálohovať a obnoviť"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Osobné údaje"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Zálohovať moje dáta"</string>
@@ -2328,7 +2324,7 @@
     <string name="data_usage_app" msgid="4970478397515423303">"Využitie aplikáciami"</string>
     <string name="data_usage_app_info_label" msgid="3409931235687866706">"O APLIKÁCII"</string>
     <string name="data_usage_cellular_data" msgid="9168928285122125137">"Mobilné dáta"</string>
-    <string name="data_usage_data_limit" msgid="1193930999713192703">"Nastavenie dátového limitu"</string>
+    <string name="data_usage_data_limit" msgid="1193930999713192703">"Nastaviť dátový limit"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Cyklus počítania dát"</string>
     <string name="data_usage_app_items_header_text" msgid="5017850810459372828">"Využitie aplikáciami"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dátový roaming"</string>
@@ -2365,7 +2361,7 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G-3G"</string>
     <string name="data_usage_list_mobile" msgid="5588685410495019866">"Mobil"</string>
     <string name="data_usage_list_none" msgid="3933892774251050735">"Žiadne"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobilné dátové prenosy"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Mobilné dáta"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Dátové prenosy 2G a 3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Dátové prenosy 4G"</string>
     <string name="data_usage_forground_label" msgid="7654319010655983591">"Na popredí:"</string>
@@ -2382,19 +2378,19 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Zmeny, ktoré v rámci svojich účtov vykonáte na webe, sa automaticky skopírujú do telefónu.\n\nNiektoré účty tiež automaticky skopírujú na web akékoľvek zmeny vykonané v telefóne. Týmto spôsobom funguje napríklad účet Google."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Vypnúť automatickú synchronizáciu dát?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Toto nastavenie šetrí spotrebu dát a batérie. Na získanie najnovších informácií však budete musieť každý účet synchronizovať ručne. Nebudete tiež dostávať upozornenia na dostupné aktualizácie."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dátum obnovenia cyklu sledovania prenesených dát"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Dátum obnovenia cyklu spotreby"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Dátum v každom mesiaci:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Nastaviť"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Nastaviť upozornenie o využívaní údajov"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastaviť limit využívania údajov"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Nastavenie limitu spotreby dát"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Obmedzenie spotreby dát"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Po dosiahnutí nastaveného limitu váš tablet vypne mobilné dáta.\n\nKeďže využitie dát meria tablet, ale váš operátor môže spotrebu vyčísliť inak, nastavte si nižší limit."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Po dosiahnutí nastaveného limitu váš telefón vypne mobilné dáta.\n\nKeďže využitie dát meria telefón, ale váš operátor môže spotrebu vyčísliť inak, nastavte si nižší limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Po dosiahnutí nastaveného limitu váš tablet vypne mobilné dátové pripojenie.\n\nKeďže spotrebu dát meria tablet, ale váš operátor môže spotrebu vyčísliť inak, je vhodné si nastaviť nižší limit."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Po dosiahnutí nastaveného limitu váš telefón vypne mobilné dátové pripojenie.\n\nKeďže spotrebu dát meria telefón, ale váš operátor môže spotrebu vyčísliť inak, je vhodné nastaviť si nižší limit."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Obmedziť prenosy na pozadí?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi-Fi."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi‑Fi.\n\nToto nastavenie platí pre všetkých používateľov tabletu."</string>
     <string name="data_usage_restrict_background_multiuser" product="default" msgid="7910798414964288424">"Ak obmedzíte mobilné dáta na pozadí, niektoré aplikácie a služby nebudú fungovať, dokým sa nepripojíte k sieti Wi‑Fi.\n\nToto nastavenie platí pre všetkých používateľov telefónu."</string>
-    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozornenie"</font></string>
+    <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"upozorn."</font></string>
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="18">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limit"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Odstránené aplikácie"</string>
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Odstránené aplikácie a používatelia"</string>
@@ -2560,7 +2556,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Profily s obmedzeniami nemôžu pridávať účty"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Odstrániť zo zariadenia (<xliff:g id="USER_NAME">%1$s</xliff:g>)"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Nastavenia uzamknutej obrazovky"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Pridávať používateľov na uzamknutej obrazovke"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Pridávať používateľov z uzamknutej obrazovky"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Nový používateľ"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Nový profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Chcete odstrániť svoj profil?"</string>
@@ -2581,13 +2577,13 @@
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"Všetky aplikácie a údaje v tejto relácii budú odstránené."</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"Odstrániť"</string>
     <string name="user_enable_calling" msgid="5128605672081602348">"Zapnúť telefonické hovory"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Zapnúť telefonické hovory a správy SMS"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"Zapnúť telefonáty a SMS"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"Odstrániť používateľa"</string>
     <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"Zapnúť telefonické hovory?"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"S týmto používateľom sa bude zdieľať história hovorov."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Zapnúť telefonické hovory a správy SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"S týmto používateľom sa bude zdieľať história hovorov a správ SMS."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Núdzové informácie"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Tiesňové informácie"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Informácie a kontakty používateľa <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Povoliť aplikácie a obsah"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Aplikácie s obmedzením"</string>
@@ -2604,7 +2600,7 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Použiť predvolenú"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Vždy"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Okrem prípadov, keď je spustená iná platobná aplikácia"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Na platobnom termináli podporujúcom platby priložením platiť pomocou aplikácie:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Aplikácia na platby mobilom"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Platenie pri termináli"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Nastavte si platobnú aplikáciu. Potom iba priložte zadnú časť vášho telefónu k akémukoľvek terminálu so symbolom pre bezkontaktné platby."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Dobre"</string>
@@ -2632,7 +2628,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">"Núdzové vysielania"</string>
+    <string name="cell_broadcast_settings" msgid="2451014351355183338">"Tiesňové správy"</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>
@@ -2651,9 +2647,9 @@
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Povoliť úpravy párovania a nastavení rozhrania Bluetooth"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
-    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Povoliť výmenu dát, keď sa toto zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> dotkne iného zariadenia s funkciou NFC"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Povoliť výmenu údajov, ak sa tablet dotýka iného zariadenia"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Povoliť výmenu údajov, ak sa telefón dotýka iného zariadenia"</string>
+    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"Povoliť výmenu dát, ak sa toto zariadenie <xliff:g id="DEVICE_NAME">%1$s</xliff:g> dotýka iného zariadenia s funkciou NFC"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Povoliť výmenu dát, ak sa tablet dotýka iného zariadenia"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Povoliť výmenu dát, ak sa telefón dotýka iného zariadenia"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Poloha"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Povoliť aplikáciám používať informácie o polohe"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Späť"</string>
@@ -2782,7 +2778,9 @@
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Hlasitosť zvonenia"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitosť upozornení"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
-    <string name="notification_ringtone_title" msgid="4468722874617061231">"Predvolené zvukové upozornenie"</string>
+    <string name="notification_ringtone_title" msgid="4468722874617061231">"Predvolený zvuk upozornenia"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvuk z aplikácie"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Predvolený zvuk upozornenia"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Predvolený zvuk budíka"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Pri hovoroch aj vibrovať"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Iné zvuky"</string>
@@ -2806,7 +2804,7 @@
       <item quantity="other">Je zapnutých <xliff:g id="ON_COUNT">%d</xliff:g> automatických pravidiel</item>
       <item quantity="one">Je zapnuté 1 automatické pravidlo</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Predvoľby funkcie Nerušiť"</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Nastavenia režimu Nerušiť"</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Prioritné"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Automatické pravidlá"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Nastavenie pravidiel Nerušiť"</string>
@@ -2833,7 +2831,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Upozornenia"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Rozšírené"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Pracovné upozornenia"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"Blikajúce svetlo"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Blikať"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Na uzamknutej obrazovke"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazovať všetok obsah upozornení"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skryť citlivý obsah upozornení"</string>
@@ -2846,6 +2844,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Akým spôsobom chcete zobrazovať profilové upozornenia na uzamknutom zariadení?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilové upozornenia"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Upozornenia"</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_blocked" msgid="7938180808339386300">"Nikdy nezobrazovať upozornenia"</string>
@@ -2853,10 +2852,10 @@
     <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_min_summary" msgid="8233873580287975662">"Nízka: Bez zvuku a vizuálneho vyrušenia"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Stredná: Bez zvuku"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Vysoká: Vydať zvukový signál"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Neodkladná: Vydať zvukový signál a vyskočiť na obrazovku"</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="6585849855452076626">"Povoliť zvuk"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Bez zvukov, vibrovania alebo posunutia do zobrazenia na aktuálnej obrazovke"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Asistent upozornení"</string>
@@ -2889,9 +2888,11 @@
     <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_on" msgid="6103704909710176555">"Áno"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Nie"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Prístup k nastaveniu Nerušiť"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android blokuje zobrazovanie upozornení z danej aplikácie na tomto zariadení"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android blokuje zobrazovanie danej kategórie upozornení na tomto zariadení"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategórie"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Iné"</string>
     <string name="no_channels" msgid="3077375508177744586">"Táto aplikácia ešte neposlala žiadne upozornenia"</string>
@@ -2926,7 +2927,7 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Citlivé"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Dôležitosť"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blikajúce svetlo"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Blikať"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"Vibrovať"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Zvuk"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Odstrániť"</string>
@@ -2934,7 +2935,7 @@
     <string name="zen_mode_rule_name" msgid="5149068059383837549">"Názov pravidla"</string>
     <string name="zen_mode_rule_name_hint" msgid="3781174510556433384">"Zadajte názov pravidla"</string>
     <string name="zen_mode_rule_name_warning" msgid="4517805381294494314">"Názov pravidla sa už používa"</string>
-    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Pridať viac"</string>
+    <string name="zen_mode_add_rule" msgid="7459154136384467057">"Pridať ďalšie"</string>
     <string name="zen_mode_delete_rule" msgid="2985902330199039533">"Odstrániť pravidlo"</string>
     <string name="zen_mode_choose_rule_type" msgid="5423746638871953459">"Výber typu pravidla"</string>
     <string name="zen_mode_delete_rule_confirmation" msgid="6237882294348570283">"Chcete odstrániť pravidlo <xliff:g id="RULE">%1$s</xliff:g>?"</string>
@@ -2980,7 +2981,7 @@
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Všetci volajúci"</string>
     <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Vybraní volajúci"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Opakované volania"</string>
-    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ak tá istá osoba zavolá druhýkrát do <xliff:g id="MINUTES">%d</xliff:g> min, povoliť hovor"</string>
+    <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Ak tá istá osoba zavolá druhýkrát do <xliff:g id="MINUTES">%d</xliff:g> min, povoliť hovor"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Zapínať automaticky"</string>
     <string name="zen_mode_when_never" msgid="8809494351918405602">"Nikdy"</string>
     <string name="zen_mode_when_every_night" msgid="3122486110091921009">"Každú noc"</string>
@@ -3004,10 +3005,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Zmena na možnosť Iba budíky platná do <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Zmena na možnosť Vždy prerušiť"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Blokovať, keď je obrazovka zapnutá"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Zabrániť, aby sa upozornenia stlmené nastavením Nerušiť čiastočne alebo úplne zobrazovali na obrazovke"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Zabrániť, aby sa v režime Nerušiť upozornenia čiastočne alebo úplne zobrazovali na obrazovke"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Blokovať, keď je obrazovka vypnutá"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Zabrániť, aby upozornenia stlmené nastavením Nerušiť spúšťali obrazovku alebo blikajúce svetlo upozornení"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Zabrániť, aby upozornenia stlmené nastavením Nerušiť spúšťali obrazovku"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Zabrániť, aby v režime Nerušiť upozornenia zapínali obrazovku alebo blikali svetlom upozornení"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Zabrániť, aby v režime Nerušiť upozornenia spúšťali obrazovku"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Vypnuté"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Keď je obrazovka zapnutá"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Keď je obrazovka vypnutá"</string>
@@ -3018,11 +3019,11 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Pripnutie obrazovky"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Keď je toto nastavenie zapnuté, môžete pomocou pripnutia obrazovky ponechať aktuálnu obrazovku zobrazenú, dokým ju neuvoľníte.\n\nAk chcete použiť pripnutie obrazovky:\n\n1. Skontrolujte, či je pripnutie obrazovky zapnuté.\n\n2. Otvorte obrazovku, ktorú chcete pripnúť.\n\n3. Klepnite na položku Prehľad.\n\n4. Prejdite prstom nahor a potom klepnite na ikonu špendlíka."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Keď je toto nastavenie zapnuté, môžete pripnúť aktuálnu obrazovku a nechať ju zobrazenú, dokým ju neodopnete.\n\nPostup pripnutia obrazovky:\n\n1. Skontrolujte, či je pripnutie obrazovky zapnuté.\n\n2. Otvorte obrazovku, ktorú chcete pripnúť.\n\n3. Klepnite na ikonu Prehľad.\n\n4. Prejdite prstom nahor a potom klepnite na ikonu špendlíka."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Pred uvoľnením žiadať bezpečnostný vzor"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Pred uvoľnením požiadať o PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Pred uvoľnením požiadať o heslo"</string>
-    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Uzamknúť zariadenie počas uvoľňovania"</string>
+    <string name="screen_pinning_unlock_none" msgid="3814188275713871856">"Pri odopnutí zamknúť zariadenie"</string>
     <string name="opening_paragraph_delete_profile_unknown_company" msgid="2232461523882170874">"Tento pracovný profil spravuje aplikácia:"</string>
     <string name="managing_admin" msgid="8843802210377459055">"Spravované aplikáciou <xliff:g id="ADMIN_APP_LABEL">%s</xliff:g>"</string>
     <string name="experimental_preference" msgid="7083015446690681376">"(Experimentálne)"</string>
@@ -3033,18 +3034,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ponechať obrazovku v súčasnej orentácii"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Bezpečné spustenie"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Pokračovať"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním kódu PIN pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť údaje na stratených alebo ukradnutých zariadeniach."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním vzoru pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia, vrátane budíkov, dokým sa nespustí. \n\nPomáha to chrániť dáta na stratených alebo ukradnutých zariadeniach."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním hesla pred jeho spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť údaje na stratených alebo ukradnutých zariadeniach."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Okrem odomknutia pomocou odtlačku prsta môžete toto zariadenie ochrániť aj vyžadovaním kódu PIN pred spustením. Na nespustenom zariadení nie je možné prijímať hovory, správy či upozornenia ani používať budíky.\n\nUmožňuje to ochrániť údaje v stratených alebo ukradnutých zariadeniach."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Okrem odomknutia pomocou odtlačku prsta môžete toto zariadenie ochrániť aj vyžadovaním bezpečnostného vzoru pred spustením. Na nespustenom zariadení nie je možné prijímať hovory, správy či upozornenia ani používať budíky.\n\nUmožňuje to ochrániť údaje v stratených alebo ukradnutých zariadeniach."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Okrem odomknutia pomocou odtlačku prsta môžete toto zariadenie ochrániť aj vyžadovaním hesla pred spustením. Na nespustenom zariadení nie je možné prijímať hovory, správy či upozornenia ani používať budíky.\n\nUmožňuje to ochrániť údaje v stratených alebo ukradnutých zariadeniach."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Vyžadovať kód PIN na spustenie zariadenia"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Vyžadovať vzor na spustenie zariadenia"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Vyžadovať heslo na spustenie zariadenia"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nie, vďaka"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nie, vďaka"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nie, vďaka"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním kódu PIN pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať kód PIN na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním vzoru pred spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať vzor na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Ďalšiu ochranu tohto zariadenia zabezpečíte požadovaním hesla pred jeho spustením. Toto zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí. \n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Okrem odomknutia pomocou odtlačku prsta môžete toto zariadenie ochrániť aj vyžadovaním kódu PIN pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať kód PIN na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním bezpečnostného vzoru pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať vzor na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Okrem odomknutia pomocou odtlačku prsta môžete svoje zariadenie ochrániť aj vyžadovaním hesla pred spustením. Zariadenie nemôže prijímať hovory, správy ani upozornenia (vrátane budíkov), dokým sa nespustí.\n\nPomáha to chrániť dáta v stratených alebo ukradnutých zariadeniach. Vyžadovať heslo na spustenie zariadenia?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Áno"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nie"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Vyžadovať kód PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Vyžadovať vzor?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Vyžadovať heslo?"</string>
@@ -3056,7 +3053,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Informácie súvisiace s kódom IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Slot <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Nastavenie predvoleného otvárania"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Odkazy na otvorenie"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Otváranie odkazov"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Otvoriť podporované odkazy"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Otvárať bez opýtania"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Podporované odkazy"</string>
@@ -3118,10 +3115,10 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Aplikácie používajúce <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Zobudiť klepnutím"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Zariadenie prebudíte dvojitým klepnutím na ľubovoľné miesto na obrazovke."</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Odkazy na otvorenie"</string>
-    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Neotvára podporované odkazy"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Otváranie odkazov"</string>
+    <string name="domain_urls_summary_none" msgid="2639588015479657864">"Neotvárať podporované odkazy"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Otvárať <xliff:g id="DOMAIN">%s</xliff:g>"</string>
-    <string name="domain_urls_summary_some" msgid="3950089361819428455">"Otvorené: doména <xliff:g id="DOMAIN">%s</xliff:g> a ďalšie webové adresy"</string>
+    <string name="domain_urls_summary_some" msgid="3950089361819428455">"Otvárať <xliff:g id="DOMAIN">%s</xliff:g> a ďalšie webové adresy"</string>
     <string name="domain_urls_apps_summary_off" msgid="1833056772600031220">"Podporované odkazy neotvára žiadna aplikácia"</string>
     <plurals name="domain_urls_apps_summary_on" formatted="false" msgid="240214361240709399">
       <item quantity="few">Podporované odkazy otvárajú <xliff:g id="COUNT">%d</xliff:g> aplikácie</item>
@@ -3149,7 +3146,7 @@
     <string name="system_app" msgid="9068313769550747372">"(Systémová)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Predvolená systémová)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Úložisko aplikácií"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Prístup k využitiu"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Prístup k dátam o využití"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Povoliť prístup k využitiu"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Predvoľby využitia aplikáciami"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Prístup k využitiu umožňuje aplikácii sledovať, aké ďalšie aplikácie používate, ako často ich používate, a taktiež nastavenia jazyka, operátora a ďalšie podrobnosti."</string>
@@ -3165,7 +3162,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"Optimalizácia batérie"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Upozornenia na spotrebu"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Upozornenia o spotrebe"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Zobraziť všetky aplikácie"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Skryť ďalšie aplikácie"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Neoptimalizované"</string>
@@ -3208,12 +3205,12 @@
     <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>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"Povoľte pomocnej aplikácii prístup k obsahu obrazovky ako k textu"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"Povoliť asistenčnej aplikácii prístup k obsahu obrazovky ako k textu"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Použiť snímku obrazovky"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Povoľte pomocnej aplikácii prístup k snímke obrazovky"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Povoliť asistenčnej aplikácii prístup k snímke obrazovky"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Blikanie obrazovky"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Blikanie okrajov obrazovky, keď pomocná aplikácia pristupuje k textu z obrazovky alebo snímky obrazovky"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"Pomocné aplikácie vám pomáhajú na základe informácií zo zobrazenej obrazovky. Niektoré aplikácie podporujú spúšťač aj služby hlasového výstupu, aby vám poskytli integrovanú pomoc."</string>
+    <string name="assist_footer" msgid="1982791172085896864">"Asistenčné aplikácie vám pomáhajú na základe informácií zo zobrazenej obrazovky. Niektoré aplikácie podporujú spúšťač aj služby hlasového výstupu, aby vám poskytli integrovanú pomoc."</string>
     <string name="average_memory_use" msgid="829566450150198512">"Priemerné využitie pamäte"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"Maximálne využitie pamäte"</string>
     <string name="memory_usage" msgid="1781358557214390033">"Využitie pamäte"</string>
@@ -3278,9 +3275,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Toto povolenie umožňuje aplikácii upravovať nastavenia systému."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Áno"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nie"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Áno"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nie"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Povoliť inštalácie aplikácií"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Povolené"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nie je povolené"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Povoliť z tohto zdroja"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Fotoaparát – dvakrát pokrúťte zápästím"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Otvorte aplikáciu fotoaparátu tak, že dvakrát pokrútite zápästím"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Fotoaparát dvojitým stlačením vypínača"</string>
@@ -3295,15 +3292,15 @@
     <string name="screen_zoom_conversation_icon_alex" msgid="8443032489384985820">"A"</string>
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"P"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Servus, Peter!"</string>
-    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Chcel by si dnes ísť na kávu a porozprávať sa?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"To znie skvele. Poznám výborné miesto v okolí."</string>
+    <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Nezájdeme dnes na kávu?"</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Dobre, poznám tu jedno skvelé miesto."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Výborne!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Ut 18:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Ut 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Ut 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Ut 18:03"</string>
     <string name="disconnected" msgid="4836600637485526329">"Nepripojené"</string>
-    <string name="data_usage_summary_format" msgid="7507047900192160585">"Objem využitých dát: <xliff:g id="AMOUNT">%1$s</xliff:g>"</string>
+    <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> využitých dát"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="few">Vypnuté pre <xliff:g id="COUNT">%d</xliff:g> aplikácie</item>
       <item quantity="many">Vypnuté pre <xliff:g id="COUNT">%d</xliff:g> aplikácie</item>
@@ -3320,10 +3317,10 @@
     <string name="display_summary_example" msgid="9102633726811090523">"Režim spánku sa spustí po 10 minútach nečinnosti"</string>
     <string name="memory_summary" msgid="8080825904671961872">"Využíva sa v priemere <xliff:g id="USED_MEMORY">%1$s</xliff:g> z celkovej pamäte <xliff:g id="TOTAL_MEMORY">%2$s</xliff:g>"</string>
     <string name="users_and_accounts_summary" msgid="245282689646897882">"Aktuálny používateľ: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
-    <string name="users_summary" msgid="1674864467098487328">"Prihlásený/-á ako <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+    <string name="users_summary" msgid="1674864467098487328">"Prihlásený používateľ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="payment_summary" msgid="3472482669588561110">"<xliff:g id="APP_NAME">%1$s</xliff:g> je predvolená aplikácia"</string>
-    <string name="location_on_summary" msgid="5127631544018313587">"ZAP. / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
-    <string name="location_off_summary" msgid="6474350053215707957">"VYP."</string>
+    <string name="location_on_summary" msgid="5127631544018313587">"ZAPNUTÉ / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
+    <string name="location_off_summary" msgid="6474350053215707957">"VYPNUTÉ"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Zálohovanie je zakázané"</string>
     <string name="about_summary" msgid="924181828102801010">"Aktualizované na Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Akcia nie je povolená"</string>
@@ -3364,20 +3361,20 @@
     <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="ota_disable_automatic_update" msgid="2319639631655915050">"Automatické aktualizácie systému"</string>
-    <string name="usage" msgid="2977875522080448986">"Využitie"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Využitie mobilných dát"</string>
+    <string name="usage" msgid="2977875522080448986">"Spotreba"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Spotreba mobilných dát"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Spotreba dát cez Wi-Fi"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Spotreba dát prostredníctvom ethernetu"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
     <string name="ethernet" msgid="6600095783781389720">"Ethernet"</string>
-    <string name="cell_data_template" msgid="405684854174361041">"Mobilné dáta: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
+    <string name="cell_data_template" msgid="405684854174361041">"<xliff:g id="AMOUNT">^1</xliff:g> mobilných dát"</string>
     <string name="wifi_data_template" msgid="6265570748799357386">"Dáta Wi-Fi: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
     <string name="ethernet_data_template" msgid="5782476509881033590">"Ethernetové dáta: <xliff:g id="AMOUNT">^1</xliff:g>"</string>
-    <string name="cell_warning_only" msgid="763147658209027140">"Upozornenie na dáta: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="cell_warning_and_limit" msgid="2273413629267437470">"Upozornenie na dáta: <xliff:g id="ID_1">%1$s</xliff:g> / limit dát: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+    <string name="cell_warning_only" msgid="763147658209027140">"Dátové upozornenie <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="cell_warning_and_limit" msgid="2273413629267437470">"Dátové upozornenie <xliff:g id="ID_1">%1$s</xliff:g> / dátový limit <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Fakturačný cyklus"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mesačný cyklus začína <xliff:g id="ID_1">%1$s</xliff:g> deň každý mesiac"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mesačne od <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"Cyklus sa začína každý mesiac <xliff:g id="ID_1">%1$s</xliff:g>."</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mesačne od <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Obmedzenia siete"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> obmedzenia</item>
@@ -3386,19 +3383,19 @@
       <item quantity="one">1 obmedzenie</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Účtovanie dát operátorom sa môže líšiť od účtovania na zariadení"</string>
-    <string name="data_used_template" msgid="3245919669966296505">"Použité: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Nastaviť upozornenie na dáta"</string>
-    <string name="data_warning" msgid="209133958008062117">"Upozornenie na dáta"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"Využité <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Nastaviť dátové upozornenie"</string>
+    <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">"V období <xliff:g id="ID_2">%2$s</xliff:g> ste využili <xliff:g id="ID_1">%1$s</xliff:g> dát"</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="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">
-      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie majú povolené používať neobmedzené dáta, keď je zapnutý Šetrič dát</item>
-      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie má povolené používať neobmedzené dáta, keď je zapnutý Šetrič dáta</item>
-      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikácií má povolené používať neobmedzené dáta, keď je zapnutý Šetrič dát</item>
-      <item quantity="one">1 aplikácia má povolené používať neobmedzené dáta, keď je zapnutý Šetrič dát</item>
+      <item quantity="few"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie majú povolené používať neobmedzené dáta, keď je zapnutý šetrič dát</item>
+      <item quantity="many"><xliff:g id="COUNT">%1$d</xliff:g> aplikácie má povolené používať neobmedzené dáta, keď je zapnutý šetrič dáta</item>
+      <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> aplikácií má povolené používať neobmedzené dáta, keď je zapnutý šetrič dát</item>
+      <item quantity="one">1 aplikácia má povolené používať neobmedzené dáta, keď je zapnutý šetrič dát</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Šetrič dát"</string>
     <string name="unrestricted_data_saver" msgid="7019858887510062789">"Neobmedzený prístup k dátam"</string>
@@ -3406,8 +3403,8 @@
     <string name="data_saver_on" msgid="6774217590237934709">"Zapnutý"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Vypnutý"</string>
     <string name="unrestricted_app_title" msgid="4465437191723332066">"Neobmedzené využitie dát"</string>
-    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Povoliť neobmedzený prístup k dátam, keď je zapnutý Šetrič dát"</string>
-    <string name="home_app" msgid="4066188520886810030">"Domovská aplikácia"</string>
+    <string name="unrestricted_app_summary" msgid="6458008993501723912">"Povoliť neobmedzený prístup k dátam, keď je zapnutý šetrič dát"</string>
+    <string name="home_app" msgid="4066188520886810030">"Vstupná aplikácia"</string>
     <string name="no_default_home" msgid="7184117487704520238">"Žiadna predvolená domovská aplikácia"</string>
     <string name="lockpattern_settings_require_cred_before_startup" msgid="3832020101401318248">"Bezpečné spustenie"</string>
     <string name="lockpattern_settings_require_pattern_before_startup_summary" msgid="7873036097628404476">"Na spustenie zariadenia sa bude vyžadovať bezpečnostný vzor. Keď je zariadenie vypnuté, nemôže prijímať hovory, správy, upozornenia ani používať budíky"</string>
@@ -3474,7 +3471,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Pripojené k"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Dlaždice rýchleho nastavenia pre vývojárov"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Radi vám pomôžeme"</string>
@@ -3542,21 +3540,21 @@
     <string name="gesture_preference_summary" product="default" msgid="8627850388011956901">"Rýchle gestá na ovládanie telefónu"</string>
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Rýchle gestá na ovládanie tabletu"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Rýchle gestá na ovládanie zariadenia"</string>
-    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Prechod na Fotoaparát"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Fotoaparát rýchlo otvoríte dvojitým stlačením vypínača (funguje to na ľubovoľnej obrazovke)."</string>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Prepnutie fotoaparátov"</string>
+    <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Spustiť fotoaparát"</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Fotoaparát rýchlo otvoríte dvojitým stlačením vypínača. Funguje to na každej obrazovke."</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Prepnúť fotoaparáty"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefón skontrolujete dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tablet skontrolujete dvojitým klepnutím"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Zariadenie skontrolujete dvojitým klepnutím"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Ak chcete rýchlo skontrolovať upozornenia, dvakrát klepnite na obrazovku."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Telefón skontrolujete tak, že ho zodvihnete"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Kontrola telefónu zdvihnutím"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Tablet skontrolujete tak, že ho zodvihnete"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Zariadenie skontrolujete tak, že ho zodvihnete"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Ak chcete rýchlo skontrolovať upozornenia, zodvihnite telefón."</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Ak chcete rýchlo skontrolovať upozornenia, zodvihnite tablet."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Ak chcete rýchlo skontrolovať upozornenia, zodvihnite zariadenie."</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Zobrazenie upozornení prejdením odtlačkom prsta"</string>
+    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Upozornenia odtlačkom prsta"</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane telefónu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane tabletu."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Upozornenia zobrazíte prejdením prstom nadol po senzore odtlačkov prstov na zadnej strane zariadenia."</string>
@@ -3683,7 +3681,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(vypnuté pre používateľa <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Služba automatického dopĺňania"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"automatické, dopĺňanie, automatické dopĺňanie"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Chcete nastaviť <xliff:g id="APP_NAME_0">%1$s</xliff:g> ako aplikáciu na automatické dopĺňanie? Aplikácia <xliff:g id="APP_NAME_1">%1$s</xliff:g> bude môcť čítať obsah vašej obrazovky a dopĺňať údaje do polí v ďalších aplikáciách."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Skontrolujte, či ide o dôveryhodnú aplikáciu&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Automatické dopĺňanie Google&gt;%1$s&lt;/xliff:g&gt; určuje na základe obsahu obrazovky, čo je možné automaticky vyplniť."</string>
     <string name="device_theme" msgid="4571803018917608588">"Motív zariadenia"</string>
     <string name="default_theme" msgid="7085644992078579076">"Predvolený"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Správca úložiska: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index d20e875..a07385c 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Brez"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Brez"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 9ca16bd..7f1431e 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -333,20 +333,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Računi"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Varnost in lokacija"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Šifriranje in poverilnice"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon je šifriran"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon je šifriran"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Nastavitve zaklenjenega zaslona"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Zasebnost"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Onemogočil skrbnik"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Stanje varnosti"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Zaklepanje zaslona, prstni odtis"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Zaklepanje zaslona"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Prstni odtis"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Upravlj. prst. odtisov"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Upor. prst. odtisa za"</string>
@@ -447,7 +446,7 @@
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Zaščitite napravo"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Uporaba prstnega odtisa"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"Odklepanje s prstnim odtisom"</string>
-    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zaklep zaslona"</string>
+    <string name="lock_settings_picker_title" msgid="1095755849152582712">"Izberite zaklepanje zaslona"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"Izbira zakl. del. p."</string>
     <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>
@@ -714,6 +713,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Obvesti me, ko je na voljo zanesljivo javno omrežje"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Samodejno vklopi Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi se bo samodejno znova vklopil v bližini zanesljivih shranjenih omrežij, na primer vašega domačega omrežja"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Ni na voljo, ker je iskanje omrežij Wi‑Fi izklopljeno"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Izogni se slabim povezavam"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Omrežje Wi-Fi uporabi samo, če je na voljo dobra internetna povezava"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Uporaba samo omrežij z dobro internetno povezavo"</string>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguriranje povezave 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska podomrežja"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Naslovi IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Shranjena omrežja"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Nastavitve nasl. IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Dodatne nastavitve za Wi-Fi temu uporabniku niso na voljo"</string>
@@ -977,7 +975,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="display_settings" msgid="7965901687241669598">"Prikaz"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Zaslon"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Samodejno zasukaj zaslon"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
@@ -1041,13 +1039,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Izklopljeno"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Če želite nadzirati, kaj se dogaja, ko je telefon na nosilcu in/ali v stanju pripravljenosti, vklopite ohranjevalnik zaslona."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kdaj zagnati"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Trenutni ohranjevalnik zaslona"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Začnite zdaj"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Nastavitve"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Preklop iz stanja pripravlj. z dviganjem"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Zaslon z dohodnimi obvestili"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Prikaz na podlagi okolja"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Preklop zaslona iz stanja pripravljenosti, ko prejmete obvestila"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Pomanjšava ali povečava besedila"</string>
@@ -1645,6 +1642,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Trgovina"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Podrobnosti o aplikaciji"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacija nameščena iz trgovine <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Več informacij v trgovini <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Delovanje aplikacij"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Se izvaja"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nikoli uporabljeno)"</string>
@@ -1721,7 +1719,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Pomočnik za bližnjične tipke"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Prikaz razpoložljivih bližnjic"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Privzeto"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Miška/sledilna ploščica"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Hitrost kazalca"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Krmilnik za igre"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Uporaba vibriranja"</string>
@@ -1793,7 +1790,7 @@
     <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="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">"Prikaz"</string>
+    <string name="display_category_title" msgid="685461049938269166">"Zaslon"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"Kontrolniki za interakcije"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"Prenesene storitve"</string>
     <string name="experimental_category_title" msgid="5272318666666893547">"Poskusno"</string>
@@ -1802,14 +1799,14 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Če želite slišati vsebino elementov na zaslonu, se jih dotaknite"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Napisi"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Povečava"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Povečava s trikratnim dotikom"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Povečevanje s trikratnim dotikom"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Povečevanje z gumbom"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Povečevanje z gumbom in s trikratnim dotikom"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Povečava zaslona"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"Če želite povečati, se trikrat dotaknite"</string>
     <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"Če želite povečati, se dotaknite gumba"</string>
     <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_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_shortcut_service_title" msgid="4779360749706905640">"Storitev z bližnjico"</string>
@@ -1957,8 +1954,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Poraba zaslona od polne napolnjenosti"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Poraba zaslona"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pregledovanje mobilnih omrežij"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Poraba aplikacij od polne napolnjenosti akumulatorja (pred <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"pred <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Poraba aplik. od napol. akumul. (pred <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Trajanje vklopljenosti zaslona od polne napolnjenosti akumulatorja"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Poraba naprave od polne napolnjenosti akumulatorja"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uporaba akumulatorja po odklopu"</string>
@@ -1989,7 +1986,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Fotoaparat"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Stanje pripravljenosti"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobilno omrežje v stanju pripravljenosti"</string>
     <string name="power_phone" msgid="5392641106474567277">"Glasovni klici"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablični računalnik nedejaven"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon je nedejaven"</string>
@@ -2049,10 +2046,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Poraba akumulatorja je približek porabe energije in ne vključuje vseh virov porabe akumulatorja. »Drugi viri« so razlika med izračunano približno porabo energije in dejansko porabo, zaznano pri akumulatorju."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Preveč šteta uporaba energije"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Trajanje uporabe: %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Trajanje uporabe: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> uporablja <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> celotne napolnjenosti akumulatorja"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razčlenjen prikaz od zadnje polne napolnjenosti akumulatorja"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Razčlenitev od zadnje napol. akumulatorja"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Zadnja polna napolnjenost akumulatorja"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Preostali čas delovanja akumulatorja je približen, ker je odvisen od uporabe in se lahko spremeni."</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Med aktivno uporabo"</string>
@@ -2121,7 +2118,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Nastavitve glasovnega vnosa in izhoda"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Glasovno iskanje"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tipkovnica Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Govor"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Nastavitve glasovnega vnosa"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Glasovni vnos"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Storitve glasovnega vnosa"</string>
@@ -2180,7 +2176,7 @@
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"Vnesite geslo za shrambo poverilnic."</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"Trenutno geslo:"</string>
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Želite odstraniti vso vsebino?"</string>
-    <string name="credentials_password_too_short" msgid="7502749986405522663">"Geslo mora imeti vsaj 8 znakov"</string>
+    <string name="credentials_password_too_short" msgid="7502749986405522663">"Geslo mora imeti vsaj 8 znakov."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Napačno geslo."</string>
     <string name="credentials_reset_warning" msgid="5320653011511797600">"Napačno geslo. Poskusite lahko še enkrat, preden se shramba poverilnic izbriše."</string>
     <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Napačno geslo. Poskusite lahko še <xliff:g id="NUMBER">%1$d</xliff:g>-krat, preden se shramba poverilnic izbriše."</string>
@@ -2783,6 +2779,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Glasnost obvestila"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Privzeti zvok obvestila"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Zvok iz aplikacije"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Privzeti zvok obvestila"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Privzeti zvok alarma"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibriranje tudi za klice"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvoki"</string>
@@ -2846,6 +2844,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kako naj se obvestila o profilu prikazujejo, ko je naprava zaklenjena?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Obvestila o profilu"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Obvestila"</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_blocked" msgid="7938180808339386300">"Nikoli ne pokaži obvestil"</string>
@@ -2853,10 +2852,10 @@
     <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_min_summary" msgid="8233873580287975662">"Nizka: brez zvočne ali vizualne prekinitve"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Srednja: brez zvoka"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Visoka: predvajaj zvok"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Nujna: predvajaj zvok in 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Pomočnik za obvestila"</string>
@@ -2892,6 +2891,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Prikazovanje obvestil te aplikacije je izklopljeno v tej napravi Android."</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Prikazovanje obvestil te kategorije je izklopljeno v tej napravi Android."</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorije"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Drugo"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ta aplikacija ni objavila nobenih obvestil"</string>
@@ -3033,18 +3034,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Ohrani trenutno postavitev"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Varni zagon"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Naprej"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Napravo lahko še dodatno zaščitite, tako da je treba pred zagonom naprave vnesti kodo PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo pomaga pri zaščiti podatkov, če naprave izgubite ali jih ukradejo."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Napravo lahko še dodatno zaščitite, tako da je treba pred zagonom naprave vnesti vzorec. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo pomaga pri zaščiti podatkov, če naprave izgubite ali jih ukradejo."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Napravo lahko še dodatno zaščitite, tako da je treba pred zagonom naprave vnesti geslo. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo pomaga pri zaščiti podatkov, če naprave izgubite ali jih ukradejo."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vašo kodo PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vaš vzorec. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vaše geslo. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi.\n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Zahtevaj kodo PIN za zagon naprave"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Zahtevaj vzorec za zagon naprave"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Zahtevaj geslo za zagon naprave"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ne, hvala"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ne, hvala"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Napravo lahko dodatno zaščitite tako, da ob zagonu zahteva vašo kodo PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za kodo PIN za zagon naprave?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Napravo lahko dodatno zaščitite tako, da ob zagonu zahteva vaš vzorec. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za vzorec za zagon naprave?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Napravo lahko dodatno zaščitite tako, da ob zagonu zahteva vaše geslo. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za geslo za zagon naprave?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vašo kodo PIN. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za kodo PIN za zagon naprave?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vaš vzorec. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za vzorec za zagon naprave?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Poleg tega, da napravo odklepate s prstnim odtisom, jo lahko dodatno zaščitite tako, da ob zagonu zahteva vaše geslo. Dokler se naprava ne zažene, ne more prejemati klicev, sporočil ali obvestil, vključno z alarmi. \n\nTo je v pomoč pri zaščiti podatkov v izgubljenih ali ukradenih napravah. Ali želite nastaviti zahtevo za geslo za zagon naprave?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Da"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ne"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Zahtevanje kode PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Zahtevanje vzorca?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Zahtevanje gesla?"</string>
@@ -3208,9 +3205,9 @@
     <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>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"Aplikaciji za pomoč dovoli dostop do vsebine na zaslonu kot besedilo"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"Aplikaciji za pomoč dovoli dostop do vsebine na zaslonu v obliki besedila"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"Uporaba posnetka zaslona"</string>
-    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Aplikaciji dovoli dostop do posnetka zaslona"</string>
+    <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"Aplikaciji za pomoč dovoli dostop do posnetka zaslona"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"Utripanje zaslona"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"Utripanje robov zaslona, ko aplikacija za pomoč dostopa do besedila z zaslona ali posnetka zaslona"</string>
     <string name="assist_footer" msgid="1982791172085896864">"Aplikacije za pomoč vam pomagajo na podlagi podatkov na zaslonu, ki si ga ogledujete. Nekatere aplikacije podpirajo storitve zaganjalnika in glasovnega vnosa pri zagotavljanju integrirane pomoči."</string>
@@ -3278,9 +3275,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"To dovoljenje aplikaciji dovoljuje spreminjanje sistemskih nastavitev."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Da"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Ne"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Da"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ne"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Dovoli namestitev aplikacij"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Dovoljene"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nedovoljene"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Dovoli aplikacije iz tega vira"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dvakratno sukanje za fotoaparat"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Odprite aplikacijo za fotografiranje, tako da dvakrat zasukate zapestje"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Dva dotika gumba za vklop za fotoaparat"</string>
@@ -3364,8 +3361,8 @@
     <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="ota_disable_automatic_update" msgid="2319639631655915050">"Samodejne sistemske posodobitve"</string>
-    <string name="usage" msgid="2977875522080448986">"Uporaba"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Količina podatkov, prenesenih v mobilnem omrežju"</string>
+    <string name="usage" msgid="2977875522080448986">"Poraba"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Poraba mobilnih podatkov"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Preneseni podatki (Wi-Fi)"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Preneseni podatki (ethernet)"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3376,8 +3373,8 @@
     <string name="cell_warning_only" msgid="763147658209027140">"Opozorilo za prenos podatkov: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Opozorilo za prenos podatkov: <xliff:g id="ID_1">%1$s</xliff:g>/omejitev prenosa podatkov: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Obračunsko obdobje"</string>
-    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mesečno obdobje se začne <xliff:g id="ID_1">%1$s</xliff:g> vsakega meseca"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mesečno obdobje se začne <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_summary" msgid="9009106526129293752">"Mesečno obdobje se začne vsakega <xliff:g id="ID_1">%1$s</xliff:g>. v mesecu"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Mesečno obdobje se začne <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Omejitve omrežja"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="one"><xliff:g id="COUNT">%1$d</xliff:g> omejitev</item>
@@ -3386,12 +3383,12 @@
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> omejitev</item>
     </plurals>
     <string name="operator_warning" msgid="1862988028996859195">"Operaterjeve meritve prenosa podatkov so morda drugačne kot v napravi"</string>
-    <string name="data_used_template" msgid="3245919669966296505">"Uporabljeno: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="set_data_warning" msgid="6115364758236594593">"Nastavi opozorilo o uporabi podatkov"</string>
+    <string name="data_used_template" msgid="3245919669966296505">"Porabljeno: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="set_data_warning" msgid="6115364758236594593">"Nastavi opozorilo za prenos podatkov"</string>
     <string name="data_warning" msgid="209133958008062117">"Opozorilo za prenos podatkov"</string>
     <string name="set_data_limit" msgid="2901526323210516923">"Nastavitev omej. prenosa pod."</string>
     <string name="data_limit" msgid="1885406964934590552">"Omejitev prenosa podatkov"</string>
-    <string name="data_usage_template" msgid="392191945602400904">"Uporabljeno: <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="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="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">
@@ -3440,7 +3437,7 @@
     <string name="notification_log_details_delete_intent" msgid="905118520685297007">"izbris namena"</string>
     <string name="notification_log_details_full_screen_intent" msgid="7118560817013522978">"namen za celozaslonski način"</string>
     <string name="notification_log_details_actions" msgid="242523930165118066">"dejanja"</string>
-    <string name="notification_log_details_title" msgid="7177091647508863295">"naslov"</string>
+    <string name="notification_log_details_title" msgid="7177091647508863295">"naziv"</string>
     <string name="notification_log_details_remoteinput" msgid="8328591329858827409">"oddaljeni vhodi"</string>
     <string name="notification_log_details_content_view" msgid="6638731378278561786">"pogled po meri"</string>
     <string name="notification_log_details_extras" msgid="4188418723779942047">"dodatki"</string>
@@ -3474,7 +3471,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Vzpostavljena povezava z napravo"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ploščice razvijalcev za hitre nastavitve"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Tu smo, da vam pomagamo"</string>
@@ -3683,7 +3681,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(onemogočeno za uporabnika <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Storitev samodejnega izpolnjevanja"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"samodejno, izpolnjevanje, samoizpolnjevanje"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Ali želite, da <xliff:g id="APP_NAME_0">%1$s</xliff:g> postane aplikacija s samodejnim izpolnjevanjem? Aplikacija <xliff:g id="APP_NAME_1">%1$s</xliff:g> bo lahko prebrala vsebino zaslona in izpolnila polja v drugih aplikacijah."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Prepričajte se, ali zaupate tej aplikaciji&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Samodejno izpolnjevanje&gt;%1$s&lt;/xliff:g&gt; iz elementov na zaslonu ugotovi, kaj je mogoče samodejno izpolniti."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema naprave"</string>
     <string name="default_theme" msgid="7085644992078579076">"Privzeto"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Upravitelj shrambe: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index 8aa1327..2340b34 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Asnjë"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Asnjë"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -281,7 +283,7 @@
     <item msgid="2603878814882344450">"kontrollo volumin"</item>
     <item msgid="7136963238377062018">"volumi i zërit"</item>
     <item msgid="4270236897655923007">"volumi i ziles"</item>
-    <item msgid="6325739889222559394">"volumi i klipit \"media\""</item>
+    <item msgid="6325739889222559394">"volumi i medias"</item>
     <item msgid="5762123934816216821">"volumi i alarmit"</item>
     <item msgid="785049718065337473">"volumi i njoftimit"</item>
     <item msgid="6700305533746877052">"Volumi i \"Bluetooth-it\""</item>
@@ -348,7 +350,7 @@
     <item msgid="2098976479485046797">"Kontrollo volumin"</item>
     <item msgid="5660213838861789350">"Volumi i zërit"</item>
     <item msgid="7983336752371254444">"Volumi i ziles"</item>
-    <item msgid="7878027809189330917">"volumi i klipit \"media\""</item>
+    <item msgid="7878027809189330917">"Volumi i medias"</item>
     <item msgid="7260546305036218513">"Volumi i alarmit"</item>
     <item msgid="9103719301075748925">"Volumi i njoftimit"</item>
     <item msgid="7025966722295861512">"Volumi i \"Bluetooth-it\""</item>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 3cdc997..f4d1000 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Llogaritë"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vendndodhja"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Llogaritë"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Siguria dhe vendndodhja"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Enkriptimi dhe kredencialet"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefoni është i enkriptuar"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefoni është i enkriptuar"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Preferencat e ekranit të kyçjes"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Cakto \"Vendndodhjen time\", shkyçjen e ekranit, kyçjen e kartës SIM, kyçjen e hapësirës për ruajtjen e kredencialeve"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Cakto \"Vendndodhja ime\", shkyçjen e ekranit, kyçjen e hapësirës ruajtëse të kredencialeve"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privatësia"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Çaktivizuar nga administratori"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Statusi i sigurisë"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Kyçja e ekranit, gjurma e gishtit"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Kyçja e ekranit"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Gjurma e gishtit"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Menaxho gjurm. gishtit"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Përdor gjurmën për"</string>
@@ -570,7 +569,7 @@
     <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>
-    <string name="manage_device_admin" msgid="537804979483211453">"Aplikacionet e administratorit të pajisjes"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Apl. e admin. të pajisjes"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Asnjë aplikacion aktiv"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> aplikacione aktive</item>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Njofto kur ofrohet një rrjet publik me cilësi të lartë"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktivizo automatikisht Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi do të aktivizohet përsëri në afërsi të rrjeteve të ruajtura me cilësi të lartë, si p.sh. në rrjetin e shtëpisë"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Nuk ofrohet sepse skanimi i Wi-Fi është çaktivizuar"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Shmang lidhjet e dobëta"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Mos e përdor një rrjet Wi‑Fi nëse nuk ka lidhje të mirë interneti"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Përdor vetëm rrjete që kanë lidhje të mirë interneti"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfiguro 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Maska e nënrrjetit"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Adresat IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Rrjetet e ruajtura"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Cilësimet e IP-së"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Cilësimet e Wi-Fi nuk disponohen për këtë përdorues"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Çaktivizuar"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Për të kontrolluar se çfarë ndodh kur telefonin e vendos te stacioni dhe/ose në gjumë, aktivizo mbrojtësin e ekranit."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kur të fillojë"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Mbrojtësi aktual i ekranit"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Fillo tani"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Cilësimet"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ndriçimi automatik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ngrije për ta zgjuar"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Ekrani i njoftimeve hyrëse"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Shfaqja e ambientit"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Zgjoje ekranin kur të merren njoftime"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Madhësa e shkrimit"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Bëje tekstin më të madh ose më të vogël"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Sistemi"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Eksploro <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Përfshin po ashtu skedarët e ndarë që janë ruajtur nga aplikacionet, skedarët e shkarkuar nga interneti ose me Bluetooth, skedarët e Android e të tjera. \n\nPër të parë të gjitha përmbajtjet e dukshme në këtë <xliff:g id="NAME">^1</xliff:g>, trokit tek \"Eksploro\"."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistemi përfshin skedarët e përdorur për ekzekutimin e versionit të Android <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Sistemi përfshin skedarët e përdorur për ekzekutimin e versionit <xliff:g id="VERSION">%s</xliff:g> të Android"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> mund të ketë ruajtur fotografi, muzikë, aplikacione ose të dhëna të tjera, duke përdorur <xliff:g id="SIZE">^2</xliff:g> nga hapësira ruajtëse. \n\nPër të parë detajet, kalo te <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"Konfiguro <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Përdore si hapësirë portative ruajtjeje"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Dyqani"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Detajet e aplikacioneve"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Aplikacioni i instaluar nga <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Më shumë informacion rreth <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Operacionet e aplikacionit"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Në funksionim"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Nuk përdoret asnjëherë)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Ndihmësi i shkurtoreve të tastierës"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Shfaq shkurtoret e disponueshme"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"E parazgjedhur"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Miu/blloku i prekjes"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Shpejtësia e treguesit"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kontrolluesi i lojës"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Përdor dridhësin"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Përdorimi i ekranit që nga ngarkimi i plotë"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Konsumi i ekranit"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Skanimi i rrjetit celular"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> më parë"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Përdorimi i aplikacioneve që nga ngarkimi i plotë (<xliff:g id="TIME">%1$s</xliff:g> më parë)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> më parë"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Përdorimi i apl. që nga ngarkimi i plotë (<xliff:g id="TIME">^1</xliff:g> më parë)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Sasia e kohës për të cilën ekrani ka qenë aktiv që nga ngarkimi i plotë"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Përdorimi i pajisjes që nga ngarkimi i plotë"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Përdorimi i baterisë që nga heqja nga ngarkimi"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth-i"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Rrjeti celular në gatishmëri"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Rrjeti celular në gatishmëri"</string>
     <string name="power_phone" msgid="5392641106474567277">"Telefonatat zanore"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tableti në gjendje joaktive"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefoni në gjendje joaktive"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Përdorimi i baterisë është një llogaritje e përafërt e përdorimit të energjisë dhe nuk përfshin çdo burim të shkarkimit të baterisë. \"Të ndryshme\" nënkupton ndryshimin midis përdorimit të llogaritur në mënyrë të përafërt të energjisë dhe shkarkimit aktual të vërejtur në bateri."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Përdorimi i energjisë i numëruar më shumë sa duhet"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Përdorur për %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Përdorur për <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> përdorur nga <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> nga e gjithë bateria"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Analiza që nga ngarkimi i fundit i plotë"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Cilësimet e hyrjes dhe daljes së zërit"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Kërkimi me zë"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Tastierë për \"Android\""</string>
-    <string name="voice_category" msgid="1430370497125803904">"Ligjërimi"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Cilësimet e hyrjes zanore"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Të dhënat zanore"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Shërbime të hyrjes zanore"</string>
@@ -2169,7 +2165,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Çaktivizo këtë aplikacion të administratorit të pajisjes"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Çinstalo aplikacionin"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Çaktivizo dhe çinstalo"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Aplikacionet e administratorit të pajisjes"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Apl. e admin. të pajisjes"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Nuk ka asnjë aplikacion të administratorit të pajisjes në dispozicion"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Personal"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Punë"</string>
@@ -2725,12 +2721,14 @@
     <string name="sound_settings_summary_vibrate" msgid="1869282574422220096">"Zilja u caktua me dridhje"</string>
     <string name="sound_settings_summary_silent" msgid="5074529767435584948">"Zilja u vendos në heshtje"</string>
     <string name="sound_settings_example_summary" msgid="2404914514266523165">"Volumi i ziles në 80%"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"volumi i klipit \"media\""</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volumi i medias"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumi i alarmit"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Volumi i ziles"</string>
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumi i njoftimit"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Zilja e telefonit"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Zëri i parazgjedhur i njoftimit"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Tingulli i dhënë nga aplikacioni"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Tingulli i parazgjedhur i njoftimit"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Tingulli i parazgjedhur i alarmit"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Edhe dridhje për telefonatat"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Tinguj të tjerë"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kur pajisja jote të jetë e kyçur, si dëshiron të shfaqen njoftimet e profilit?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Njoftimet e profilit"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Njoftimet"</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_blocked" msgid="7938180808339386300">"Mos i shfaq asnjëherë njoftimet"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"E ulët: Asnjë tingull apo ndërprerje vizuale"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Mesatare: Nuk ka tingull"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"E lartë: Lësho një tingull"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Urgjente: Lësho një tingull dhe 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Asistenti i njoftimeve"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android po bllokon shfaqjen e njoftimeve të këtij aplikacioni në këtë pajisje"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android po bllokon shfaqjen e kësaj kategorie njoftimesh në këtë pajisje"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategoritë"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Të tjera"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ky aplikacion nuk ka postuar asnjë njoftim"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Qëndro në orientimin aktual"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Nisje e sigurt"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Vazhdo"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar kodin PIN para se të nisë. Deri sa pajisja të nisë, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarme.\n\nKjo ndihmon në mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar motivin para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet. \n\nKjo ndihmon në mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar fjalëkalimin para se të niset. Derisa pajisja të niset, nuk mund të pranojë telefonata, mesazhe apo njoftime, përfshirë alarmet. \n\nKjo ndihmon në mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar PIN para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon në mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar motivin para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon në mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar fjalëkalimin para se të niset. Derisa pajisja të niset, nuk mund të pranojë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon në mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Kërko kodin PIN për të nisur pajisjen"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Kërko motivin për të nisur pajisjen"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Kërko fjalëkalimin për të nisur pajisjen"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Jo, faleminderit"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Jo, faleminderit"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Jo, faleminderit"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar kodin PIN para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarme. \n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet kodi PIN për të nisur pajisjen tënde?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar motivin tënd para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet. \n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet motivi për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar fjalëkalimin para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet. \n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet një fjalëkalim për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar kodin PIN para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet kodi PIN për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më shumë këtë pajisje duke kërkuar motivin para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, duke përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Të kërkohet motivi për të nisur pajisjen?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Përveç përdorimit të shenjave të gishtave për të shkyçur pajisjen tënde, mund ta mbrosh edhe më tepër këtë pajisje duke kërkuar fjalëkalimin para se të niset. Deri sa pajisja të niset, ajo nuk mund të marrë telefonata, mesazhe apo njoftime, përfshirë alarmet.\n\nKjo ndihmon për mbrojtjen e të dhënave në pajisjet e humbura ose të vjedhura. Kërko një fjalëkalim për të nisur pajisjen&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Po"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Jo"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Të kërkohet kodi PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Të kërkohet motivi?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Të kërkohet fjalëkalim?"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Kjo leje e lejon një aplikacion të modifikojë cilësimet e sistemit."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Po"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Jo"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Po"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Jo"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Lejo që aplikacionet të instalohen"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Lejohet"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Nuk lejohet"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Lejo nga ky burim"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Rrotullo dy herë për kamerën"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Hap aplikacionin e kamerës duke rrotulluar kyçin e dorës dy herë"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Shtyp butonin e energjisë dy herë për kamerën"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Lidhur me"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Pllakëzat e zhvilluesit të cilësimeve të shpejta"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Ne jemi këtu për të ndihmuar"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(çaktivizuar për përdoruesin <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Shërbimi i plotësimit automatik"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"plotësim, automatik, plotësim automatik"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Dëshiron ta bësh <xliff:g id="APP_NAME_0">%1$s</xliff:g> aplikacionin tënd të plotësimit automatik? <xliff:g id="APP_NAME_1">%1$s</xliff:g> do të jetë në gjendje të lexojë ekranin tënd dhe të plotësojë fushat në aplikacione të tjera."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Sigurohu që ke besim te ky aplikacion&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=\"Plotësimi automatik i Google&gt;%1$s&lt;/xliff:g&gt; përdor atë që ndodhet në ekranin tënd për të përcaktuar se çfarë mund të plotësohet automatikisht."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema e pajisjes"</string>
     <string name="default_theme" msgid="7085644992078579076">"I parazgjedhur"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Menaxheri i hapësirës ruajtëse: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 1b73a1a..6212910 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -171,16 +171,18 @@
     <item msgid="2318274046749286642">"PWD"</item>
   </string-array>
   <string-array name="wifi_peap_phase2_entries">
-    <item msgid="2577747762745812488">"Ниједно"</item>
+    <item msgid="2577747762745812488">"Ништа"</item>
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ништа"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"АКА"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Ништа"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 48504cd..19c6dfb 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -322,7 +322,7 @@
     <string name="owner_info_settings_title" msgid="5530285568897386122">"Порука на закључаном екрану"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Омогући виџете"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Администратор је онемогућио"</string>
-    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Ниједно"</string>
+    <string name="owner_info_settings_summary" msgid="7472393443779227052">"Ништа"</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">"Нпр. Јоцин Android."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Подаци о кориснику"</string>
@@ -331,20 +331,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Налози"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Налози"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Безбедност и локација"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифровање и акредитиви"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Телефон је шифрован"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон је шифрован"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Подешавања закључаног екрана"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Приватност"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Администратор је онемогућио"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Безбедносни статус"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Управљај отис. прстију"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Користи отис. прста за"</string>
@@ -579,7 +578,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Откажи"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Следеће"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Подешавање је довршено."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Апликације за администраторе уређаја"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Апл. за администратора уређаја"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Нема активних апликација"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> активна апликација</item>
@@ -703,6 +702,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недоступно је јер је искључено Wi‑Fi скенирање"</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>
@@ -825,11 +825,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Конфигуришите 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска подмреже"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 адресе"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Сачуване мреже"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP подешавања"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Напредна подешавања Wi‑Fi мреже нису доступна за овог корисника"</string>
@@ -1029,17 +1027,16 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Искључено"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Да бисте контролисали шта се дешава када је телефон на базној станици и/или у стању спавања, укључите чувар екрана."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Када почети"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Тренутни чувар екрана"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Започни одмах"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Подешавања"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Подигни за активацију"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Екран долазног обавештења"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Амбијентални екран"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Пробудите екран када примите обавештења"</string>
     <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>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Закључавање SIM картице"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Закључавање SIM картице"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Искључено"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Закључано"</string>
@@ -1217,7 +1214,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Систем"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Истражи уређај <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Остало обухвата дељене датотеке које су сачувале апликације, датотеке преузете са Интернета или Bluetooth-а, 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_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_wizard_init_title" msgid="5085400514028585772">"Подесите уређај <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Користи као преносиву меморију"</string>
@@ -1290,7 +1287,7 @@
     <string name="error_mcc_not3" msgid="4560171714156251661">"Поље MЦК мора да садржи 3 цифре."</string>
     <string name="error_mnc_not23" msgid="8418177072458379439">"MNC поље мора да садржи 2 или 3 цифре."</string>
     <string name="restore_default_apn" msgid="8178010218751639581">"Враћање подразумеваних подешавања назива приступне тачке."</string>
-    <string name="menu_restore" msgid="8260067415075573273">"Поново постави подразумевано"</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>
@@ -1630,6 +1627,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Никада није коришћено)"</string>
@@ -1706,7 +1704,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Помоћ за тастерске пречице"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Приказ доступних пречица"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Подразумевано"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Миш/додирна табла"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Брзина показивача"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Контролер за игре"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Користи вибрацију"</string>
@@ -1793,7 +1790,7 @@
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Увећајте приказ на екрану"</string>
     <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_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>
@@ -1809,7 +1806,7 @@
     <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Комбинујте канале када пуштате аудио садржај"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Одлагање додира и задржавањa"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Инверзија боја"</string>
-    <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Може да утиче на учинак"</string>
+    <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>
@@ -1876,14 +1873,14 @@
     <string name="color_yellow" msgid="9112680561610873529">"Жута"</string>
     <string name="color_magenta" msgid="5059212823607815549">"Магента"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"Желите ли да користите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба да:"</string>
+    <string name="capabilities_list_title" msgid="86713361724771971">"<xliff:g id="SERVICE">%1$s</xliff:g> треба:"</string>
     <string name="touch_filtered_warning" msgid="8644034725268915030">"Пошто апликација скрива захтев за дозволу, Подешавања не могу да верификују одговор."</string>
     <string name="enable_service_encryption_warning" msgid="3064686622453974606">"Ако укључите <xliff:g id="SERVICE">%1$s</xliff:g>, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
     <string name="secure_lock_encryption_warning" msgid="460911459695077779">"Пошто сте укључили услугу приступачности, уређај неће користити закључавање екрана да би побољшао шифровање података."</string>
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите шаблон."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите PIN."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Пошто укључивање услуге <xliff:g id="SERVICE">%1$s</xliff:g> утиче на шифровање података, треба да потврдите лозинку."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Прати ваше радње"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"да прати ваше радње"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Добија обавештења када остварујете интеракцију са апликацијом."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Желите ли да зауставите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Ако додирнете Потврди, зауставићете <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
@@ -1936,8 +1933,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Коришћење екрана од потпуног пуњења"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Потрошња за екран"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Скенирање мобилних мрежа"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"пре <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Коришћење апликације од потпуног пуњења (пре <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"пре <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Коришћење апликације од потпуног пуњења (пре <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Количина времена током којег је екран био укључен од потпуног пуњења"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Коришћење уређаја од потпуног пуњења"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Коришћење батерије након искључивања"</string>
@@ -1968,7 +1965,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Стање приправности телефона"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Стање приправности мобилне мреже"</string>
     <string name="power_phone" msgid="5392641106474567277">"Гласовни позиви"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Таблет је у стању мировања"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Телефон у мировању"</string>
@@ -2028,14 +2025,14 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Потрошња батерије је приближна вредност потрошње енергије и не обухвата сваки извор пражњења батерије. Разноврсна потрошња представља разлику између израчунате приближне потрошње батерије и стварне потрошње забележене за батерију."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Прекомерно израчуната потрошња енергије"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Користи се %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Користи се <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_detail_foreground" msgid="3350401514602032183">"Док се активно користи"</string>
-    <string name="battery_detail_background" msgid="1929644393553768999">"Док је у позадини"</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>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"<xliff:g id="PERCENT">%1$s</xliff:g> укупне потрошње апликација (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
     <string name="battery_detail_info_title" msgid="8227822131405620369">"Од потпуног пуњења"</string>
@@ -2100,7 +2097,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Подешавања гласовног уноса и излаза"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Гласовна претрага"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android тастатура"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Говор"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Подешавања гласовног уноса"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Гласовни унос"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Услуге гласовног уноса"</string>
@@ -2190,7 +2186,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"Деактивирај ову апликацију за администратора уређаја"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"Деинсталирај апликацију"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"Деактивирај и деинсталирај"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"Апликације за администраторе уређаја"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"Апликације за администратора"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"Нема доступних апликација за администратора уређаја"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"Лични"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"Посао"</string>
@@ -2275,7 +2271,7 @@
     <string name="preference_change_password_title" msgid="8955581790270130056">"Промени лозинку"</string>
     <string name="header_account_settings" msgid="5382475087121880626">"Подешавања налога"</string>
     <string name="remove_account_label" msgid="5921986026504804119">"Уклони налог"</string>
-    <string name="header_add_an_account" msgid="756108499532023798">"Додавање налога"</string>
+    <string name="header_add_an_account" msgid="756108499532023798">"Додајте налог"</string>
     <string name="finish_button_label" msgid="481587707657751116">"Заврши"</string>
     <string name="really_remove_account_title" msgid="8800653398717172460">"Желите ли да уклоните налог?"</string>
     <string name="really_remove_account_message" product="tablet" msgid="1936147502815641161">"Уклањањем овог налога избрисаћете све поруке, контакте и друге податке са таблета!"</string>
@@ -2359,16 +2355,16 @@
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"Укључити аутом. синх. података?"</string>
     <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"Све промене које унесете у налоге на вебу ће аутоматски бити копиране на таблет.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на таблету. Тако функционише Google налог."</string>
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Све промене које унесете у налоге на вебу ће аутоматски бити копиране на телефон.\n\nНеки налози могу и аутоматски да копирају на веб све промене које унесете на телефону. Тако функционише Google налог."</string>
-    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Искључити аутом. синх. података?"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"На овај начин ће се смањити потрошња података и батерије, али биће потребно да ручно синхронизујете сваки налог да бисте прикупили недавне информације. Нећете примати ни обавештења када дође до ажурирања."</string>
+    <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Искључујете ауто-синх. података?"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"То ће се смањити потрошњу података и батерије, али биће потребно да ручно синхронизујете сваки налог да бисте прикупили недавне информације. Нећете примати ни обавештења када дође до ажурирања."</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Датум враћања циклуса потрошње на почетне вредности"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Датум сваког месеца:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Подеси"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Подешавање упозорења о коришћењу података"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Подешавање ограничења за коришћење података"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ограничавање потрошње података"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Таблет ће искључити мобилне податке чим достигне ограничење које сте подесили.\n\nПошто потрошњу података мери таблет, а мобилни оператер може другачије да рачуна потрошњу, размислите о томе да подесите неко уобичајено ограничење."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Телефон ће искључити мобилне податке чим достигне ограничење које сте подесили.\n\nПошто потрошњу података мери телефон, а мобилни оператер може другачије да рачуна потрошњу, размислите о томе да подесите неко уобичајено ограничење."</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>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi-јем."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ако ограничите мобилне позадинске податке, неке апликације и услуге неће функционисати ако нисте повезани са Wi-Fi-јем.\n\nОво подешавање утиче на све кориснике на овом таблету."</string>
@@ -2473,7 +2469,7 @@
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Провера правописа"</string>
     <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Овде унесите тренутну лозинку за прављење резервне копије читавог система"</string>
     <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Овде унесите нову лозинку за прављење резервних копија читавог система"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Унесите нову лозинку за резервну копију читавог система"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Унесите поново нову лозинку за резервну копију читавог система"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Постави лозинку резервне копије"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Откажи"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Додатна ажурирања система"</string>
@@ -2562,7 +2558,7 @@
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"Историја позива ће бити дељена са овим корисником."</string>
     <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"Укључити телефонске позиве и SMS?"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"Историја позива и SMS-ова ће се делити са овим корисником."</string>
-    <string name="emergency_info_title" msgid="208607506217060337">"Информације о хитном случају"</string>
+    <string name="emergency_info_title" msgid="208607506217060337">"Информације за хитни случај"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"Информације и контакти за <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="application_restrictions" msgid="8207332020898004394">"Дозволе за апликације и садржај"</string>
     <string name="apps_with_restrictions_header" msgid="3660449891478534440">"Апликације са ограничењима"</string>
@@ -2596,9 +2592,9 @@
     <string name="user_account_title" msgid="1127193807312271167">"Налог за садржај"</string>
     <string name="user_picture_title" msgid="7297782792000291692">"ИД слике"</string>
     <string name="extreme_threats_title" msgid="6549541803542968699">"Екстремне опасности"</string>
-    <string name="extreme_threats_summary" msgid="8777860706500920667">"Пријем обавештења о екстремној опасности по живот и својину"</string>
+    <string name="extreme_threats_summary" msgid="8777860706500920667">"Пријем обавештења о екстремној опасности по живот и имовину"</string>
     <string name="severe_threats_title" msgid="8362676353803170963">"Озбиљне опасности"</string>
-    <string name="severe_threats_summary" msgid="8848126509420177320">"Пријем обавештења о озбиљној опасности по живот и својину"</string>
+    <string name="severe_threats_summary" msgid="8848126509420177320">"Пријем обавештења о озбиљној опасности по живот и имовину"</string>
     <string name="amber_alerts_title" msgid="2772220337031146529">"AMBER обавештења"</string>
     <string name="amber_alerts_summary" msgid="4312984614037904489">"Пријем објава о киднаповању деце"</string>
     <string name="repeat_title" msgid="6473587828597786996">"Понављање"</string>
@@ -2757,6 +2753,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Јачина звука за обавештења"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Подразумевани звук обавештења"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Звук апликације"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Подразумевани звук обавештења"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Подразумевани звук аларма"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вибрација и за позиве"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Други звукови"</string>
@@ -2819,6 +2817,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Никада не приказуј обавештења"</string>
@@ -2826,10 +2825,10 @@
     <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_min_summary" msgid="8233873580287975662">"Низак приоритет: без звука или визуелног обавештења"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Средњи приоритет: без звука"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Висок приоритет: емитује се звучни сигнал"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Хитно: емитује се звучни сигнал и приказује се на екрану"</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="6585849855452076626">"Дозволи звук"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Нема никаквог звука ни вибрације нити се ова обавештења накратко приказују на актуелном екрану."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Помоћник за обавештења"</string>
@@ -2864,6 +2863,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Приступ опцији Не узнемиравај"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"Ниједна инсталирана апликација није захтевала приступ опцији Не узнемиравај"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавају се апликације..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android блокира приказивање обавештења ове апликације на овом уређају"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android блокира приказивање ове категорије обавештења на овом уређају"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Категорије"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Другo"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ова апликација није поставила ниједно обавештење"</string>
@@ -3001,18 +3002,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Задржи актуелни положај"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Безбедно покретање"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Настави"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nНа тај начин штитите податке на изгубљеним или украденим уређајима."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nНа тај начин штитите податке на изгубљеним или украденим уређајима."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nНа тај начин штитите податке на изгубљеним или украденим уређајима."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите ако га подесите тако да тражи PIN пре покретања. Док се уређај не покрене, он не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nТо помаже у заштити података на изгубљеним или украденим уређајима."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите ако га подесите тако да тражи шаблон пре покретања. Док се уређај не покрене, он не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nТо помаже у заштити података на изгубљеним или украденим уређајима."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите ако га подесите тако да тражи лозинку пре покретања. Док се уређај не покрене, он не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nТо помаже у заштити података на изгубљеним или украденим уређајима."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Захтевај PIN за покретање уређаја"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Захтевај шаблон за покретање уређаја"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Захтевај лозинку за покретање уређаја"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Не, хвала"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Не, хвала"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Не, хвала"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nТо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати PIN при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Можете додатно да заштитите овај уређај тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме. \n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати шаблон при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Можете додатно да заштитите уређај тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке или обавештења, укључујући аларме. \n\nТо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи PIN пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати PIN при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи шаблон пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати шаблон при покретању уређаја?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Поред тога што можете да откључавате уређај отиском прста, можете додатно да га заштитите тако што ћете га подесити да тражи лозинку пре покретања. Док се уређај не покрене, не може да прима позиве, поруке нити обавештења, укључујући аларме.\n\nTо омогућава заштиту података на изгубљеним или украденим уређајима. Захтевати лозинку при покретању уређаја?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Да"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Не"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Тражити PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Тражити шаблон?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Тражити лозинку?"</string>
@@ -3227,7 +3224,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Апликације са дозволом"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Да"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Не"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Инсталирајте непознате апликације"</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>
@@ -3241,9 +3238,9 @@
     <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_trusted" msgid="6857780460845250885">"Да"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Не"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Дозволи инсталирање апликација"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Дозвољено"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Није дозвољено"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Притисните дугме за напајање двапут за камеру"</string>
@@ -3259,7 +3256,7 @@
     <string name="screen_zoom_conversation_icon_pete" msgid="998709701837681129">"П"</string>
     <string name="screen_zoom_conversation_message_1" msgid="6546951024984852686">"Здраво, Петре!"</string>
     <string name="screen_zoom_conversation_message_2" msgid="6935424214137738647">"Хоћеш ли да се испричамо уз кафу данас?"</string>
-    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Звучи одлично. Знам добро место у близини."</string>
+    <string name="screen_zoom_conversation_message_3" msgid="5218221201861387402">"Важи. Знам добро место у близини."</string>
     <string name="screen_zoom_conversation_message_4" msgid="5564676794767555447">"Савршено!"</string>
     <string name="screen_zoom_conversation_timestamp_1" msgid="7453710416319650556">"Уто 18:00"</string>
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Уто 18:01"</string>
@@ -3327,7 +3324,7 @@
     <string name="telephony_monitor_toast" msgid="7003764250271195384">"Рестартујте уређај да бисте применили промену TelephonyMonitor-а"</string>
     <string name="ota_disable_automatic_update" msgid="2319639631655915050">"Аутоматска ажурирања система"</string>
     <string name="usage" msgid="2977875522080448986">"Потрошња"</string>
-    <string name="cellular_data_usage" msgid="2155683719898158203">"Потрошња мобилних података"</string>
+    <string name="cellular_data_usage" msgid="2155683719898158203">"Потрошња мобил. података"</string>
     <string name="wifi_data_usage" msgid="686754111095324306">"Потрошња Wi-Fi података"</string>
     <string name="ethernet_data_usage" msgid="5108764537574354616">"Потрошња података на етернету"</string>
     <string name="wifi" msgid="1081550856200013637">"Wi-Fi"</string>
@@ -3433,7 +3430,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Повезано са"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Плочице програмера за брза подешавања"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Ту смо да помогнемо"</string>
@@ -3506,7 +3504,7 @@
     <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="2521630136233865893">"Двапут додирните екран да бисте брзо прегледали обавештења."</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="8696432220086951466">"Узмите телефон да бисте брзо прегледали обавештења."</string>
@@ -3632,7 +3630,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(онемогућено за корисника <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Услуга аутоматског попуњавања"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"аутоматски, попуњавање, аутоматско попуњавање"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Желите ли да <xliff:g id="APP_NAME_0">%1$s</xliff:g> буде апликација за аутоматско попуњавање? <xliff:g id="APP_NAME_1">%1$s</xliff:g> ће моћи да чита садржај екрана и да попуњава поља у другим апликацијама."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Уверите се да је ова апликација поуздана&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google аутоматско попуњавање&gt;%1$s&lt;/xliff:g&gt; користи садржај екрана за утврђивање података који могу аутоматски да се попуне."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема уређаја"</string>
     <string name="default_theme" msgid="7085644992078579076">"Подразумевана"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Менаџер меморијског простора: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index ea6ecd8..26e17f8 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Ingen"</item>
+    <item msgid="7480272092408291086">"MSCHAPv2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Inga"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index f86f642..7e91475 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Konton"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Plats"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Konton"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Säkerhet och plats"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Kryptering och användaruppgifter"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Mobilen är krypterad"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Mobilen är krypterad"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Inställningar för låsskärm"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Sekretess"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Inaktiverad av administratören"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Säkerhetsstatus"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Skärmlås, fingeravtryck"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Skärmlås"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingeravtryck"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Hantera fingeravtryck"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Använd avtryck för"</string>
@@ -458,7 +457,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Byt skärmlås"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Ändra eller inaktivera grafiskt lösenord, PIN eller lösenord"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Välj en metod för att låsa skärmen"</string>
-    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ingen"</string>
+    <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Inget"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"Dra"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Ingen säkerhet"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Meddela om tillgängliga offentliga nätverk av hög kvalitet"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Aktivera Wi‑Fi automatiskt"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi‑Fi aktiveras i närheten av sparade nätverk av hög kvalitet, till exempel ditt hemnätverk"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Detta är inte tillgängligt eftersom Wi‑Fi-sökning har inaktiverats"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Undvik dåliga anslutningar"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Använd inte Wi-Fi-nätverk som inte har en bra internetanslutning"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Använd endast nätverk som har en bra internetanslutning"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Konfigurera 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Nätmask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6-adresser"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Sparade nätverk"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP-inställningar"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Den här användaren har inte tillgång till avancerade Wi‑Fi-inställningar"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Av"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Om du vill styra vad som händer när mobilen är dockad eller i viloläge aktiverar du skärmsläckaren."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Vid start"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Aktuell skärmsläckare"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Starta nu"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Inställningar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Gå ur viloläget vid lyft"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Skärmen Inkommande aviseringar"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Aktiv låsskärm"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Aktivera skärmen när du får aviseringar"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Gör texten större eller mindre."</string>
@@ -1280,7 +1277,7 @@
     <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">"Nätverksinställningarna har återställts"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Nätverksinställningarna återställda"</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>
@@ -1355,7 +1352,7 @@
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vill du använda <xliff:g id="NEW_APP">%1$s</xliff:g> som sms-app i stället för <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vill du använda <xliff:g id="NEW_APP">%s</xliff:g> som sms-app?"</string>
     <string name="network_scorer_picker_title" msgid="6383879578279046456">"Leverantör av nätverksbetyg"</string>
-    <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Ingen"</string>
+    <string name="network_scorer_picker_none_preference" msgid="9028375117241790936">"Inget"</string>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"Vill du byta Wi-Fi-assistentapp?"</string>
     <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"Vill du hantera nätverksanslutningarna med <xliff:g id="NEW_APP">%1$s</xliff:g> i stället för med <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Vill du hantera nätverksanslutningarna med <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
@@ -1400,7 +1397,7 @@
     <string name="location_access_summary" msgid="69031404093194341">"Ge appar som har bett om tillstånd möjlighet att använda din platsinformation"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"Platskällor"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"Om surfplattan"</string>
-    <string name="about_settings" product="default" msgid="1743378368185371685">"Om telefonen"</string>
+    <string name="about_settings" product="default" msgid="1743378368185371685">"Om mobilen"</string>
     <string name="about_settings" product="emulator" msgid="221313099578564438">"Om emulerad enhet"</string>
     <string name="about_settings_summary" msgid="3371517697156165959">"Visa juridisk information, status, programversion"</string>
     <string name="legal_information" msgid="5769301644270604095">"Juridisk information"</string>
@@ -1553,7 +1550,7 @@
     <string name="filter_apps_running" msgid="7767071454371350486">"Kör"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB-lagring"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"På SD-kort"</string>
-    <string name="disabled" msgid="9206776641295849915">"Inaktiverat"</string>
+    <string name="disabled" msgid="9206776641295849915">"Inaktiverad"</string>
     <string name="not_installed" msgid="2797554494953450291">"Ej installerad för användaren"</string>
     <string name="installed" msgid="3070865169422600098">"Installerad"</string>
     <string name="no_applications" msgid="7336588977497084921">"Inga appar."</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Butik"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Uppgifter om appen"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Appen har installerats från <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Läs mer på <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Appåtgärder"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Kör"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Har aldrig använts)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Hjälp med kortkommandon"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Visa tillgängliga genvägar"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Standard"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mus/styrplatta"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Markörens hastighet"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Spelkontroller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Använda vibration"</string>
@@ -1795,7 +1792,7 @@
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Fördröjning för tryck och håll ned"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Inverterade färger"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Kan påverka prestandan"</string>
-    <string name="accessibility_autoclick_preference_title" msgid="7014499339068449623">"Klicka efter att muspekaren har slutat röra sig"</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>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Skärmanvändning sedan fulladdning"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Skärmens förbrukning"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Genomsökning av mobilnätverk"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> sedan"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appanvändning sedan fulladdning (<xliff:g id="TIME">%1$s</xliff:g> sedan)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> sedan"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Appanvändning sedan fulladdning (<xliff:g id="TIME">^1</xliff:g> sedan)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Den totala tidsperiod skärmen har varit på sedan den senaste fulladdningen"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Enhetsanvändning sedan batteriet var fulladdat"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Batteriförbrukning sedan bortkoppling"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Mobilens viloläge"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Strömsparläge för mobilnätverk"</string>
     <string name="power_phone" msgid="5392641106474567277">"Röstsamtal"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Surfplattan är inaktiv"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefonen är inaktiv"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Batteriförbrukningen är beräkning av den totala strömförbrukningen och innehåller inte alla förbrukningskällor. Under Diverse anges skillnaden mellan den beräknade strömförbrukningen och den faktiska förbrukningen som anges för batteriet."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"För högt räknad strömförbrukning"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Använd i %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Har använts i <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> har använts av <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> av den totala batterianvändningen"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Fördelning sedan senaste fulladdningen"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Inställningar för röstindata och -utdata"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Röstsökning"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android-tangentbordet"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Tal"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Inställningar för röstinmatning"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Röstinmatning"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Röstinmatningstjänster"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Uppgiftslagringen kunde inte raderas."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Uppgiftslagring är aktiverat."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Du måste ange en PIN-kod eller ett lösenord för skärmlåset för att kunna använda uppgiftslagring."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Appar med användningsåtkomst"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Appar med åtkomst"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Nödsignal"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Ange beteende vid nödsamtal"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Säkerhetskopiering"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Aviseringsvolym"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Standardljud för aviseringar"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Ljud från appen"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Standardljud för aviseringar"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standardljud för alarm"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Vibrera också vid samtal"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Andra ljud"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Hur vill du att profilaviseringar visas när enheten är låst?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profilaviseringar"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Aviseringar"</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_blocked" msgid="7938180808339386300">"Visa aldrig aviseringar"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Låg: Spela inte upp ljud och visa inte"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Medium: inget ljus"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Hög: spela upp ljud"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Brådskande: spela upp ljud och 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Aviseringsassistent"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Appens aviseringar blockeras av Android och visas inte på enheten"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Denna aviseringskategori blockeras av Android och visas inte på enheten"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategorier"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Övrigt"</string>
     <string name="no_channels" msgid="3077375508177744586">"Den här appen har inte skickat några aviseringar"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Fortsätt använda aktuell riktning"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Säker start"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Fortsätt"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Du kan skydda enheten ytterligare genom att kräva att pinkoden ska anges innan den startar. Det går inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm, innan enheten har startats. \n\nDetta skyddar data i enheter som har kommit bort eller stulits."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Du kan skydda enheten ytterligare genom att kräva att det grafiska lösenordet ska anges innan den startar. Det går inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm, innan enheten har startats. \n\nDetta skyddar data i enheter som har kommit bort eller stulits."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Du kan skydda enheten ytterligare genom att kräva att lösenordet ska anges innan den startar. Det går inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm, innan enheten har startats. \n\nDetta skyddar data i enheter som har kommit bort eller stulits."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Förutom att låsa upp enheten med fingeravtryck kan du skydda den med en pinkod som måste anges vid start. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startat.\n\nDetta innebär ett extra skydd för data på en borttappad eller stulen enhet."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Förutom att låsa upp enheten med fingeravtryck kan du skydda den med ett grafiskt lösenord som måste anges vid start. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startat.\n\nDetta innebär ett extra skydd för data på en borttappad eller stulen enhet."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Förutom att låsa upp enheten med fingeravtryck kan du skydda den med ett lösenord som måste anges vid start. Enheten kan inte ta emot samtal, meddelanden eller aviseringar (inklusive alarm) innan den har startat.\n\nDetta innebär ett extra skydd för data på en borttappad eller stulen enhet."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Kräv pinkod för att starta enheten"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Kräv grafiskt lösenord för att starta enheten"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Kräv lösenord för att starta enheten"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Nej tack"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Nej tack"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Nej tack"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Du kan skydda enheten ytterligare genom att kräva att pinkoden måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Du kan skydda enheten ytterligare genom att kräva att det grafiska lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Du kan skydda enheten ytterligare genom att kräva att lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm. \n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att pinkoden måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att pinkoden ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att det grafiska lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Vill du att det grafiska lösenordet ska krävas när enheten startar?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Förutom att använda fingeravtryck kan du skydda enheten ytterligare genom att kräva att lösenordet måste anges när den startas. Innan enheten startar går det inte att ta emot samtal, meddelanden eller aviseringar, inklusive alarm.\n\nDetta gör det lättare att skydda data på borttappade eller stulna enheter. Kräv att lösenord anges när enheten startar&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ja"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Nej"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Ska pinkod krävas?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Kräv grafiskt lösenord?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Ska lösenord krävas?"</string>
@@ -3103,7 +3100,7 @@
     <string name="high_power_desc" msgid="6283926163708585760">"Använd inte batterioptimering. Med detta alternativ kan batteriet kan ta slut fortare."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Vill du tillåta att appen alltid körs i bakgrunden?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Om du tillåter att <xliff:g id="APP_NAME">%1$s</xliff:g> alltid körs i bakgrunden kan batteritiden minska. \n\nDu kan ändra detta senare under Inställningar &gt; Appar och aviseringar."</string>
-    <string name="battery_summary" msgid="8044042095190688654">"Står för <xliff:g id="PERCENTAGE">%1$s</xliff:g> %% av batteriförbrukningen sedan batteriet senast var fulladdat"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"Står för <xliff:g id="PERCENTAGE">%1$s</xliff:g> av batteriförbrukningen sedan batteriet senast var fulladdat"</string>
     <string name="battery_power_management" msgid="5571519699679107523">"Energialternativ"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Har inte förbrukat något batteri sedan batteriet senast var fulladdat"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Appinställningar"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Med den här behörigheten kan appen ändra systeminställningarna."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ja"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Nej"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ja"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Nej"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Tillåt installationer av appar"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Tillåts"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Tillåts inte"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Tillåt från den här källan"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Två handledsvridningar öppnar kameran"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Öppna kameran med två handledsvridningar"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Öppna kameran med två tryck på strömbr."</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Ansluten till"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Utvecklarrutor för snabbinställningar"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Vi hjälper dig gärna"</string>
@@ -3462,7 +3460,7 @@
     <string name="ambient_display_title" product="tablet" msgid="8688795028609563837">"Tryck snabbt två gånger för att kolla surfplattan"</string>
     <string name="ambient_display_title" product="device" msgid="3423781975742145894">"Tryck snabbt två gånger för att kolla enheten"</string>
     <string name="ambient_display_summary" msgid="2521630136233865893">"Tryck snabbt två gånger på skärmen för att snabbt visa aviseringar."</string>
-    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Plocka upp för att kolla mobilen"</string>
+    <string name="ambient_display_pickup_title" product="default" msgid="818688002837687268">"Lyft för att kolla mobilen"</string>
     <string name="ambient_display_pickup_title" product="tablet" msgid="4455864282995698097">"Plocka upp för att kolla surfplattan"</string>
     <string name="ambient_display_pickup_title" product="device" msgid="5380534405773531175">"Plocka upp för att kolla enheten"</string>
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"Plocka upp mobilen för att snabbt visa aviseringar."</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(har inaktiverats för <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Tjänsten Autofyll"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"auto, fyll, autofyll"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Vill du använda <xliff:g id="APP_NAME_0">%1$s</xliff:g> som app för autofyll? <xliff:g id="APP_NAME_1">%1$s</xliff:g> kan läsa din skärm och fylla i fält i andra appar."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Kontrollera att du litar på den här appen&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofyll&gt;%1$s&lt;/xliff:g&gt; identifierar vad som kan fyllas i automatiskt utifrån vad som visas på skärmen."</string>
     <string name="device_theme" msgid="4571803018917608588">"Enhetstema"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standard"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Lagringshanteraren: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 634f5bf..7d6eba4 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Hamna"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Hamna"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 25d9df1..000d71f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -43,7 +43,7 @@
     <string name="wfc_provisioned_switch_string" msgid="3985406545172898078">"Inaruhusu Kupiga Simu kupitia Wi-Fi"</string>
     <string name="radio_info_radio_power" msgid="7187666084867419643">"Nishati ya Redio ya Simu"</string>
     <string name="radioInfo_menu_viewADN" msgid="7069468158519465139">"Angalia Kitabu cha Anwani katika SIM"</string>
-    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ona nambari zilizopangwa za kupiga"</string>
+    <string name="radioInfo_menu_viewFDN" msgid="7934301566925610318">"Ona nambari za simu zilizobainishwa"</string>
     <string name="radioInfo_menu_viewSDN" msgid="7130280686244955669">"Angalia number za huduma za kubonyeza"</string>
     <string name="radioInfo_menu_getIMS" msgid="185171476413967831">"Hali ya Huduma ya IMS"</string>
     <string name="radio_info_ims_reg_status_title" msgid="16971785902696970">"Hali ya IMS"</string>
@@ -109,7 +109,7 @@
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Tenganisha?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Hii ikakata muunganisho wako na:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"Huna ruhusa ya kubadilisha mipangilio ya Bluetooth."</string>
-    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> inaonekana kwenye vifaa vya karibu mipangilio ya Bluetooth ikiwa imefunguliwa."</string>
+    <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> inaonekana kwenye vifaa vya karibu wakati mipangilio ya Bluetooth imewashwa."</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"Ungependa kuondoa <xliff:g id="DEVICE_NAME">%1$s</xliff:g>?"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"Inasambaza"</string>
     <string name="bluetooth_disable_profile_title" msgid="5916643979709342557">"Wasifu ulemazwe?"</string>
@@ -151,8 +151,8 @@
     <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>
-    <string name="bluetooth_remember_choice" msgid="6919682671787049800">"Usiniulize tena"</string>
-    <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Usiniulize tena"</string>
+    <string name="bluetooth_remember_choice" msgid="6919682671787049800">"Usiulize tena"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"Usiulize tena"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"Ombi la kufikia ujumbe"</string>
     <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>
@@ -271,10 +271,10 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Mipangilio"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Mipangilio ya njia ya mkato"</string>
     <string name="activity_list_empty" msgid="6428823323471264836">"Hakuna shughuli zinazolingana zilizopatikana."</string>
-    <string name="airplane_mode" msgid="8837269988154128601">"Hali ya ndege"</string>
+    <string name="airplane_mode" msgid="8837269988154128601">"Hali ya ndegeni"</string>
     <string name="radio_controls_title" msgid="3447085191369779032">"Mengineyo"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Mitandao isiyotumia waya"</string>
-    <string name="radio_controls_summary" msgid="1838624369870907268">"Dhibiti Wi-Fi, Bluetooth, hali ya ndege, mitandao ya simu za mkononi na VPN"</string>
+    <string name="radio_controls_summary" msgid="1838624369870907268">"Dhibiti Wi-Fi, Bluetooth, hali ya ndegeni, mitandao ya simu za mkononi na VPN"</string>
     <string name="cellular_data_title" msgid="6835451574385496662">"Data ya mtandao wa simu"</string>
     <string name="calls_title" msgid="3544471959217176768">"Simu zilizopigwa"</string>
     <string name="sms_messages_title" msgid="1778636286080572535">"Ujumbe wa SMS"</string>
@@ -295,11 +295,11 @@
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"Weka tarehe na saa"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"Weka tarehe, saa, saa za eneo na fomati"</string>
     <string name="date_time_auto" msgid="7076906458515908345">"Tarehe na saa za kiotomatiki"</string>
-    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Tumia muda uliopeanwa wa mtandao"</string>
+    <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"Tumia saa kutoka kwa mtandao"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"Tumia saa zilizotolewa na mtandao"</string>
     <string name="zone_auto" msgid="334783869352026648">"Saa za eneo, kiotomatiki"</string>
-    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Tumia saa za eneo zilizotolewa na mtandao"</string>
-    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Tumia saa za eneo zilizotolewa na mtandao"</string>
+    <string name="zone_auto_summaryOn" msgid="6142830927278458314">"Tumia saa za eneo kutoka kwa mtandao"</string>
+    <string name="zone_auto_summaryOff" msgid="2597745783162041390">"Tumia saa za eneo kutoka kwa mtandao"</string>
     <string name="date_time_24hour_title" msgid="3203537578602803850">"Mfumo wa saa 24"</string>
     <string name="date_time_24hour" msgid="1193032284921000063">"Tumia mpangilio wa saa 24"</string>
     <string name="date_time_set_time_title" msgid="6296795651349047016">"Muda"</string>
@@ -317,7 +317,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"Pindi kinapoingia katika hali tuli, isipokuwa kinapowekwa bila kufungwa na <xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g>"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g> baada ya hali tuli, isipokuwa kinapowekwa bila kufungwa na <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Onyesha maelezo ya mmiliki skrini inapofunga"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Ujumbe wa kufunga skrini"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Ujumbe kwenye skrini wakati imefungwa"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Washa wijeti"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Imezimwa na msimamizi"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Hamna"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Akaunti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Kutambua Eneo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Akaunti"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Mahali na Usalama"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Vitambulisho na usimbaji fiche"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Simu imesimbwa kwa njia fiche"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Simu imesimbwa kwa njia fiche"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Mapendeleo ya kufunga skrini"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Faragha"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Imezimwa na msimamizi"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Hali ya usalama"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Kufunga skrini, alama ya kidole"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Kufunga skrini"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Kitambulisho"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Dhibiti vitambulisho"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Tumia kitambulisho kwa"</string>
@@ -363,41 +362,41 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Ruka"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Ongeza alama ya kidole"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine kutumia kompyuta kibao hii iwapo itapotea, kuibwa au data iliyomo kufutwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine wasitumie kifaa hiki iwapo kitapotea, kikiibwa au data iliyomo kwenye kifaa ikifutwa."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine wasitumie simu hii iwapo itapotea, kuibwa au data iliyomo kufutwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine kutumia kifaa hiki iwapo kitapotea, kuibwa au data iliyomo kufutwa."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Vipengele vya ulinzi wa kifaa havitaanza kutumiwa. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea, kuibwa au data iliyomo kufutwa."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia kompyuta hii kibao iwapo itapotea au kuibwa."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia kifaa hiki iwapo kitapotea au kuibwa."</string>
     <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Vipengele vya ulinzi wa kifaa havitaanza kutumika. Hutaweza kuzuia watu wengine kutumia simu hii iwapo itapotea au kuibwa."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Ruka"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Rudi nyuma"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tafuta kihisi"</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tafuta kihisi cha kitambulisho upande wa nyuma wa simu yako."</string>
-    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Mchoro unaooyesha mahali kihisi cha kitambulisho kilipo kwenye kifaa"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Tafuta kitambuzi"</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_message" msgid="1959655161889313661">"Tafuta kitambuzi cha kitambulisho upande wa nyuma wa simu yako."</string>
+    <string name="security_settings_fingerprint_enroll_find_sensor_content_description" msgid="2058830032070449160">"Mchoro unaooyesha mahali kitambuzi cha kitambulisho kilipo kwenye kifaa"</string>
     <string name="security_settings_fingerprint_enroll_dialog_name_label" msgid="7086763077909041106">"Jina"</string>
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"SAWA"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"Futa"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"Tuanze"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Weka kidole chako juu ya kihisi kisha ukiinue baada ya kuhisi mtetemo"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"Weka kidole chako juu ya kitambuzi kisha ukiinue baada ya kuhisi mtetemo"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"Endelea"</string>
     <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"Sogeza kidole chako taratibu ili uongeze sehemu zote za alama za kidole chako"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"Kitambulisho kimeongezwa!"</string>
     <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"Kila unapoona aikoni hii, unaweza kutumia kitambulisho chako kujitambulisha au kuidhinisha ununuzi."</string>
-    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Gusa tu kihisi cha alama za vidole ili uanzishe na kufungua kifaa chako."</string>
+    <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"Gusa tu kitambuzi cha alama za vidole ili uanzishe na kufungua kifaa chako."</string>
     <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"Unapoona aikoni hii, unaweza pia kuidhinisha ununuzi au kuingia katika akaunti za programu."</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"Ungependa kuruka kusanidi kitambulisho?"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"Umechagua kutumia kitambulisho kama njia ya kufungua simu yako. Ukiruka sasa, utahitajika kusanidi hii baadaye. Usanidi huchukua takriban dakika moja."</string>
     <string name="security_settings_fingerprint_enroll_setup_screen_lock" msgid="1195743489835505376">"Weka mbinu ya kufunga skrini"</string>
     <string name="security_settings_fingerprint_enroll_done" msgid="4014607378328187567">"Nimemaliza"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Lo, hicho si kihisi"</string>
-    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Tumia kihisi cha kitambulisho kwenye kifaa chako."</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_title" msgid="1863561601428695160">"Lo, hicho si kitambuzi"</string>
+    <string name="security_settings_fingerprint_enroll_touch_dialog_message" msgid="5053971232594165142">"Tumia kitambuzi cha kitambulisho kwenye kifaa chako."</string>
     <string name="security_settings_fingerprint_enroll_error_dialog_title" msgid="3618021988442639280">"Hukukamilisha kujiandikishaji"</string>
     <string name="security_settings_fingerprint_enroll_error_timeout_dialog_message" msgid="2942551158278899627">"Muda wa uandikishaji wa kitambulisho umefikia kikomo. Jaribu tena."</string>
     <string name="security_settings_fingerprint_enroll_error_generic_dialog_message" msgid="3624760637222239293">"Uandikishaji wa kitambulisho haukufanya kazi. Jaribu tena au utumie kitambulisho tofauti."</string>
     <string name="fingerprint_enroll_button_add" msgid="6317978977419045463">"Ongeza kingine"</string>
-    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Inayofuata"</string>
+    <string name="fingerprint_enroll_button_next" msgid="6247009337616342759">"Endelea"</string>
     <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"Mbali na kufungua simu yako, unaweza pia kutumia kitambulisho chako kuidhinisha ununuzi na ufikiaji programu. "<annotation id="url">"Pata maelezo zaidi"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" Chaguo la kufunga skrini limezimwa. Wasiliana na msimamizi wa shirika lako ili upate maelezo zaidi "<annotation id="admin_details">"Pata maelezo zaidi"</annotation>\n\n"Bado unaweza kutumia alama yako ya kidole ili kuidhinisha ununuzi na kufikia programu. "<annotation id="url">"Pata maelezo zaidi"</annotation></string>
-    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Inua kidole, kisha gusa kihisi tena"</string>
+    <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"Inua kidole, kisha gusa kitambuzi tena"</string>
     <string name="fingerprint_add_max" msgid="1020927549936895822">"Unaweza kuongeza hadi vitambulisho <xliff:g id="COUNT">%d</xliff:g>"</string>
     <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>
@@ -436,7 +435,7 @@
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"Msimbo wa njia fiche haukuondolewa"</string>
     <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"Nenosiri uliloandika ni sahihi, lakini kwa bahati mbaya data yako ina hitilafu. \n\nIli uendelee kutumia kompyuta yako kibao, unahitaji kuirejesha katika hali iliyotoka nayo kiwandani. Unaposanidi kompyuta kibao yako baada ya kuirejesha katika hali iliyotoka nayo kiwandani, utakuwa na nafasi ya kurejesha data yoyote ambayo ilihifadhiwa nakala katika Akaunti yako ya Google."</string>
     <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"Nenosiri uliloandika ni sahihi, lakini kwa bahati mbaya data yako ina hitilafu. \n\nIli uendelee kutumia simu yako, unahitaji kuirejesha katika hali iliyotoka nayo kiwandani. Unaposanidi simu yako baada ya kuirejesha katika hali iliyotoka nayo kiwandani, utakuwa na nafasi ya kurejesha data yoyote ambayo ilihifadhiwa nakala katika Akaunti yako ya Google."</string>
-    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Badili mbinu ya ingizo"</string>
+    <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"Kubadili mbinu ya kuingiza data"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"Weka mbinu ya kufunga skrini"</string>
     <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"Linda kifaa chako"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"Tumia alama ya kidole"</string>
@@ -469,7 +468,7 @@
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"Nenosiri"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"Usalama wa juu"</string>
     <string name="unlock_set_do_later_title" msgid="4894767558414979243">"Siyo sasa"</string>
-    <string name="current_screen_lock" msgid="4104091715420072219">"Mbinu ya kufunga skrini kwa sasa"</string>
+    <string name="current_screen_lock" msgid="4104091715420072219">"Mbinu inayotumika kufunga skrini"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"Alama ya kidole + Mchoro"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"Alama ya kidole + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"Alama ya kidole + Nenosiri"</string>
@@ -671,11 +670,11 @@
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"Washa NFC"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC hubadilisha data kati ya kifaa hiki na malengo au vifaa vingine vya karibu nawe, kama vile vituo vya malipo, visomaji vya data ya kadi na lebo au matangazo yanayoshirikisha mtumiaji."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Programu iko tayari kusambaza maudhui ya programu kupitia NFC"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"Programu iko tayari kusambaza maudhui kupitia NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Imezimwa"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Hazipatikani 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 kuelekeza maudhui ya programu kwenye kifaa kingine kinachoweza kutumia NFC kwa kuweka vifaa pamoja. Kwa mfano, unaweza kuelekeza kurasa za wavuti, video za YouTube, anwani na zaidi.\n\nWeka tu vifaa pamoja (kwa kuvigusisha sehemu za nyuma) na ugonge skrini yako. Programu itabaini ni nini kitaelekezwa."</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 ni nini 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>
@@ -687,11 +686,12 @@
     <string name="wifi_stopping" msgid="8952524572499500804">"Inazima Wi-Fi..."</string>
     <string name="wifi_error" msgid="3207971103917128179">"Hitilafu"</string>
     <string name="wifi_sap_no_channel_error" msgid="3108445199311817111">"Mitabendi ya GHz 5 haipatikani katika nchi hii"</string>
-    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Hali ya ndege imewashwa"</string>
+    <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Hali ya ndegeni imewashwa"</string>
     <string name="wifi_notify_open_networks" msgid="76298880708051981">"Fungua arifa za mtandao"</string>
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Tuma arifa wakati mtandao wenye ubora wa juu unapatikana"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Washa Wi‑Fi kiotomatiki"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi itaanza kutumika tena mitandao iliyohifadhiwa ya ubora wa juu itakapopatikana, kama vile mtandao wa nyumbani"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Hakipatikani kwa sababu utafutaji wa mitandao ya Wi-Fi umezimwa"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Epuka miunganisho mibovu"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Usitumie mtandao wa Wi-Fi ambao hauna muunganisho mzuri wa Intaneti"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Tumia mitandao yenye muunganisho bora wa Intaneti pekee"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Weka mipangilio ya Wi-Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mfano wa kijimtandao"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Anwani za IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Mitandao iliyohifadhiwa"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Mipangilio ya IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Mtumiaji huyu haruhusiwi kubadilisha mipangilio ya kina ya Wi-Fi"</string>
@@ -850,8 +848,8 @@
     <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_checkbox_text_summary" msgid="5347703013899354452">"Tumia data ya simu kutoa mtandao wa Wi-Fi"</string>
-    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Haishiriki muunganisho wa Intaneti wa kompyuta kibao hii kupitia mtandao-hewa"</string>
-    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Haishiriki muunganisho wa Intaneti wa simu hii kupitia mtandao-hewa"</string>
+    <string name="wifi_hotspot_off_subtext" product="tablet" msgid="2745508221200463254">"Intaneti ya kompyuta kibao hii haishirikiwi kupitia mtandao-hewa"</string>
+    <string name="wifi_hotspot_off_subtext" product="default" msgid="7746761268472599794">"Intaneti ya simu hii haishirikiwi kupitia mtandao-hewa"</string>
     <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
     <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inazima intaneti..."</string>
     <string name="wifi_tether_enabled_subtext" msgid="7842111748046063857">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> inatumika"</string>
@@ -919,7 +917,7 @@
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Toa sauti vitufe vya kupiga vinapoguswa"</string>
     <string name="sound_effects_enable_title" msgid="4429690369187229592">"Sauti za kugonga"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Itoe sauti skrini inapofungwa"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Gonga ili itoe mtetemo"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Iteteme inapoguswa"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Ughairi wa kelele"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Muziki, video, michezo na media zingine"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Mlio wa simu na taarifa"</string>
@@ -1017,15 +1015,14 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Imezimwa"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Ili udhibiti kinachotendeka wakati simu imeambatishwa na/au iko katika hali tuli, washa taswira ya skrini."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Wakati wa kuanza"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Taswira ya skrini ya sasa"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Anza sasa"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Mipangilio"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Inua ili uondoe kifaa katika hali tuli"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Skrini ya kupokea arifa"</string>
-    <string name="doze_summary" msgid="3846219936142814032">"Washa skrini unapopokea arifa"</string>
-    <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Onyesho la vipengele vyote"</string>
+    <string name="doze_summary" msgid="3846219936142814032">"Washa skrini arifa zinapoingia"</string>
+    <string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa fonti"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Kuongeza au kupunguza ukubwa wa maandishi"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Mipangilio ya kuzima SIM"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Kufunga SIM kadi"</string>
@@ -1036,7 +1033,7 @@
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Inahitaji PIN ili kutumia kompyuta kibao"</string>
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Unahitaji PIN ili utumie simu"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Itisha PIN ili kutumia kompyuta kibao"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Itisha PIN kabla uruhusu simu kutumiwa"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Itisha PIN kabla kuruhusu simu itumike"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Badilisha PIN ya SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN ya SIM"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"Funga SIM kadi"</string>
@@ -1163,7 +1160,7 @@
     <string name="storage_menu_forget" msgid="6305824238997983426">"Sahau"</string>
     <string name="storage_menu_set_up" msgid="4263294929451685366">"Weka mipangilio"</string>
     <string name="storage_menu_explore" msgid="4637496051816521560">"Gundua"</string>
-    <string name="storage_menu_free" msgid="6386070442027135427">"Ongeza nafasi"</string>
+    <string name="storage_menu_free" msgid="6386070442027135427">"Futa baadhi ya yaliyomo"</string>
     <string name="storage_menu_manage" msgid="5914482953856430780">"Dhibiti hifadhi"</string>
     <string name="storage_title_usb" msgid="679612779321689418">"Kuunganishwa kwenye kompyuta kwa USB"</string>
     <string name="usb_connection_category" msgid="7805945595165422882">"Unganisha kama"</string>
@@ -1280,7 +1277,7 @@
     <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">"Mipangilio ya mtandao imewekwa upya"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"Weka upya mipangilio ya mtandao"</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">"Weka upya mipangilio"</string>
     <string name="reset_network_final_desc" msgid="6388371121099245116">"Ungependa kuweka upya mipangilio yote ya mtandao? Huwezi kutendua kitendo hiki."</string>
@@ -1327,7 +1324,7 @@
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"Haiwezi kusambaza mtandao au kutumia mitandao hewa wakati umewasha Kiokoa Data"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
     <string name="usb_tethering_button_text" msgid="585829947108007917">"Shiriki intaneti kwa USB"</string>
-    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB imeunganishwa, angalia herufi"</string>
+    <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB imeunganishwa, washa ili ushiriki"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Imezuia"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"Haiwezi kuzuia wakati uhifadhi wa USB inatumika"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB haijaunganishwa"</string>
@@ -1341,8 +1338,8 @@
     <string name="bluetooth_tethering_devices_connected_subtext" product="tablet" msgid="3253150865825199632">"Inashiriki muunganisho wa Intaneti wa kompyuta kibao hii kwenye vifaa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> kupitia Bluetooth"</string>
     <string name="bluetooth_tethering_devices_connected_subtext" product="default" msgid="8268867745495039177">"Inashiriki muunganisho wa Intaneti wa simu hii kwenye vifaa <xliff:g id="CONNECTEDDEVICECOUNT">%1$d</xliff:g> kupitia Bluetooth"</string>
     <string name="bluetooth_tethering_off_subtext_config" msgid="6326877798974938021">"Inashiriki muunganisho wa Intaneti wa <xliff:g id="DEVICE_NAME">%1$d</xliff:g> hii kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Haishiriki muunganisho wa Intaneti wa kompyuta kibao hii kupitia Bluetooth"</string>
-    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Haishiriki muunganisho wa Intaneti wa simu hii kupitia Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext" product="tablet" msgid="1889565070769307732">"Intaneti ya kompyuta kibao hii haishirikiwi kupitia Bluetooth"</string>
+    <string name="bluetooth_tethering_off_subtext" product="default" msgid="1838503633450298902">"Intaneti ya simu hii haishirikiwi kupitia Bluetooth"</string>
     <string name="bluetooth_tethering_errored_subtext" msgid="4926566308991142264">"Haijafungwa"</string>
     <string name="bluetooth_tethering_overflow_error" msgid="2135590598511178690">"Haiwezi kuzuia kwa zaidi kuliko vifaa <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>itazuiwa"</string>
@@ -1367,7 +1364,7 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Eneo la wasifu wa kazini"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Hali"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Usahihi wa hali ya juu"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Inayookoa betri"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Hali inayookoa betri"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Kifaa tu"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Kitambua eneo kimezimwa"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Ruhusa za kiwango cha programu"</string>
@@ -1381,9 +1378,9 @@
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Tumia Wi-Fi, Bluetooth au mitandao ya simu ili kutambua mahali"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Tumia GPS kutambua eneo"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"Kuchanganua"</string>
-    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi inachanganua"</string>
+    <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Kuchanganua Wi-Fi"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Boresha utambuzi wa mahali kwa kuruhusu programu na huduma za mifumo zitambue mitandao ya Wi-Fi wakati wowote."</string>
-    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth inachanganua"</string>
+    <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Kuchanganua Bluetooth"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"Boresha utambuzi wa mahali kwa kuruhusu programu na huduma za mifumo zitambue vifaa vya Bluetooth wakati wowote."</string>
     <string name="location_network_based" msgid="9134175479520582215">"Eneo la mtandao wa Wi-Fi na wa simu"</string>
     <string name="location_neighborhood_level" msgid="5141318121229984788">"Ruhusu programu zitumie huduma ya Google ya kutambua eneo ili kukadiria mahali ulipo kwa haraka. Data ya mahali isiyokutambulisha itakusanywa na kutumwa kwa Google."</string>
@@ -1431,7 +1428,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Thibitisha PIN yako"</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">"Fungua uchaguzi"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Chaguo zilizomo"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Nenosiri limewekwa"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN imewekwa"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Mchoro umewekwa"</string>
@@ -1556,7 +1553,7 @@
     <string name="disabled" msgid="9206776641295849915">"Imezimwa"</string>
     <string name="not_installed" msgid="2797554494953450291">"Haijasanidiwa kwa mtumiaji huyu"</string>
     <string name="installed" msgid="3070865169422600098">"Imesakinishwa"</string>
-    <string name="no_applications" msgid="7336588977497084921">"Hakuna programu."</string>
+    <string name="no_applications" msgid="7336588977497084921">"Hakuna programu yoyote."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Hifadhi ya ndani"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"hifadhi ya mfumo"</string>
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Hifadhi ya USB"</string>
@@ -1599,8 +1596,8 @@
     <string name="invalid_location" msgid="4354595459063675191">"Eneo la kusakinisha si halali."</string>
     <string name="system_package" msgid="1352722848400644991">"Sasisho za mfumo haziwezi kusakinisha kwa media ya nje."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Huwezi kusakinisha programu ya msimamizi wa kifaa kwenye kifaa cha nje"</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"Lazimisha kusitisha?"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Ukilazimisha kusitisha programu, inaweza kutofanya vizuri."</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"Ungependa kuilazimisha ikome?"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Ukiilazimisha programu ikome, huenda ikakosa kufanya kazi vizuri."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Haikuweza kuhamisha programu. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Eneo sakinishwa pendekezwa"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Duka"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Maelezo ya programu"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Programu imesakinishwa kutoka <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Maelezo zaidi kwenye <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Oparesheni ya programu"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Inatumika"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Haijawahi kutumiwa)"</string>
@@ -1687,11 +1685,10 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"Usaidizi wa kibodi"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"Kibodi halisi"</string>
     <string name="show_ime" msgid="2658582193437188227">"Onyesha kibodi pepe"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"Ionyeshe kwenye skrini wakati kibodi inapotumika"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"Ionyeshe kwenye skrini wakati kibodi halisi inatumika"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Kisaidizi cha njia za mkato"</string>
-    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Onyesha njia za mkato zilizopo"</string>
+    <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Onyesha njia za mkato zilizoko"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Chaguo-msingi"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Panya/padi"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kasi ya pointa"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Kidhibiti cha Mchezo"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Tumia kitetemeshaji"</string>
@@ -1749,7 +1746,7 @@
     <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="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>
@@ -1759,7 +1756,7 @@
     <string name="accessibility_settings" msgid="3975902491934816215">"Ufikiaji"</string>
     <string name="accessibility_settings_title" msgid="2130492524656204459">"Mipangilio ya ufikiaji"</string>
     <string name="accessibility_settings_summary" msgid="981260486011624939">"Vidhibiti vya mawasiliano, maonyesho na visoma skrini"</string>
-    <string name="vision_settings_title" msgid="4204111425716868288">"Mipangilio ya Mwonekano"</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="screen_reader_category_title" msgid="7739154903913400641">"Visoma skrini"</string>
     <string name="audio_and_captions_category_title" msgid="3420727114421447524">"Maandishi kwenye skrini na sauti"</string>
@@ -1778,11 +1775,11 @@
     <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 ushikilie ukigonga mara ya 3.\n"<ul><li>"Buruta ili usogeze kwenye skrini"</li>\n<li>"Inua kidole ili uvute mbali"</li></ul>\n\n"Huwezi kuvuta karibu kwenye 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>", gonga 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>", gonga 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_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>", gonga 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>", gonga 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_shortcut_service_title" msgid="4779360749706905640">"Huduma ya njia za mkato"</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_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"Maandishi yenye utofautishaji bora"</string>
@@ -1791,7 +1788,7 @@
     <string name="accessibility_power_button_ends_call_prerefence_title" msgid="6673851944175874235">"Kata simu kwa kitufe cha kuwasha/kuzima"</string>
     <string name="accessibility_toggle_large_pointer_icon_title" msgid="535173100516295580">"Kielekezi kikubwa cha kipanya"</string>
     <string name="accessibility_toggle_master_mono_title" msgid="4363806997971905302">"Sauti ya mono"</string>
-    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Changanya vituo inapocheza sauti"</string>
+    <string name="accessibility_toggle_master_mono_summary" msgid="5634277025251530927">"Changanya vituo wakati wa kucheza sauti"</string>
     <string name="accessibility_long_press_timeout_preference_title" msgid="6708467774619266508">"Muda wa kugusa na kushikilia"</string>
     <string name="accessibility_display_inversion_preference_title" msgid="2119647786141420802">"Ugeuzaji rangi"</string>
     <string name="accessibility_display_inversion_preference_subtitle" msgid="7052959202195368109">"Huenda ikaathiri utendaji"</string>
@@ -1863,8 +1860,8 @@
     <string name="enable_service_pattern_reason" msgid="777577618063306751">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha mchoro wako."</string>
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha PIN yako."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"Kwa sababu kuwasha <xliff:g id="SERVICE">%1$s</xliff:g> huathiri usimbaji wa data kwa njia fiche, unahitaji kuthibitisha nenosiri lako."</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Chunguza vitendo vyako"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Pokea arifa unapoingiliana na programu."</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"Kuchunguza vitendo vyako"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Kupokea arifa unapotumia programu."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"Ungependa kuzima <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"Kugonga Sawa kutakomesha <xliff:g id="SERVICE">%1$s</xliff:g>."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hakuna huduma zilizosanidiwa"</string>
@@ -1912,11 +1909,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Programu inaweza kutumika chini chini wakati huitumii"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Shughuli za programu kutumika chini chini ni chache wakati huitumii"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Programu hairuhusiwi kutumika chini chini"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Matumizi ya skrini tangu ilipojaa chaji"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Matumizi ya skrini tangu mwisho ilipokuwa imejaa chaji"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Kutumia skrini"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Kutafuta mitandao ya simu"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> zilizopita"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Matumizi ya programu tangu ilipojaa chaji (<xliff:g id="TIME">%1$s</xliff:g> zilizopita)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> zilizopita"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Matumizi ya programu tangu ilipojaa chaji (<xliff:g id="TIME">^1</xliff:g> zilizopita)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Muda ambao skrini imekuwa ikiwaka tangu chaji ilipojaa"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Matumizi ya kifaa tangu ilipojaa chaji"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Utumizi wa betri tangu kuchopolewa"</string>
@@ -1936,7 +1933,7 @@
     <string name="awake" msgid="387122265874485088">"Muda wa kuamka kwa kifaa"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fia kwa wakati unaofaa"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi wakati unaofaa"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Maelezo ya kina ya matumizi ya betri"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Matumizi ya betri - kwa kina"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Maelezo ya historia"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Matumizi ya betri"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Tumia maelezo"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Wakati seli haitumiki"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mtandao wa simu ambao hautumiki kwa sasa"</string>
     <string name="power_phone" msgid="5392641106474567277">"Simu za sauti"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Kompyuta kibao haitumiki"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Wakati simu haitumiki"</string>
@@ -1988,7 +1985,7 @@
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Betri inayotumiwa wakati kompyuta kibao haitumiki"</string>
     <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Betri imetumiwa wakati simu haitumiki"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Betri inayotumiwa na redio ya seli"</string>
-    <string name="battery_sugg_radio" msgid="8211336978326295047">"Ingia katika hali ya ndege na uokoe nishati katika maeneo ambamo hakuna mtandao wa simu ya mkononi"</string>
+    <string name="battery_sugg_radio" msgid="8211336978326295047">"Ingia katika hali ya ndegeni na uokoe nishati katika maeneo ambamo hakuna mtandao wa simu ya mkononi"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Betri iliyotumiwa na kurunzi"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"Betri inayotumiwa na kamera"</string>
     <string name="battery_desc_display" msgid="5432795282958076557">"Betri uliyotumiwa na kizinza na taa ya nyuma"</string>
@@ -2007,11 +2004,11 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Matumizi ya betri ni makadirio ya matumizi ya nishati na hayajumuishi kila chanzo kinachotumia betri. Matumizi ya ziada ya nishati ni tofauti kati ya makadirio ya matumizi ya nishati yaliyokokotolewa na matumizi halisi yaliyoonekana kwenye betri."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Hesabu ya matumizi ya nishati iliyopitiliza"</string>
     <string name="mah" msgid="95245196971239711">"mAh <xliff:g id="NUMBER">%d</xliff:g>"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Hutumika kwa %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Inatumika kwa <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> imetumiwa na <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Imetumia <xliff:g id="PERCENT">%1$s</xliff:g> ya chaji ya betri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Uchanganuzi tangu mara ya mwisho ilipojaa chaji"</string>
-    <string name="battery_last_full_charge" msgid="7151251641099019361">"Tangu ilipojaa chaji mara ya mwisho"</string>
+    <string name="battery_last_full_charge" msgid="7151251641099019361">"Mwisho ilipokuwa imejaa chaji"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Muda wa matumizi ya betri uliosalia umekadiriwa tu na unaweza kubadilika kulingana na matumizi"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Inapotumika"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Ikitumika chini chini"</string>
@@ -2031,7 +2028,7 @@
     <string name="process_dex2oat_label" msgid="2592408651060518226">"Uboreshaji wa programu"</string>
     <string name="battery_saver" msgid="1426682272004907982">"Kiokoa betri"</string>
     <string name="battery_saver_turn_on_automatically_title" msgid="9023847300114669426">"Kijiwashe kiotomatiki"</string>
-    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Isiwahi kuwashwa"</string>
+    <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Kisiwahi kujiwasha"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"chaji ya betri ikiwa <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Asilimia ya chaji ya betri"</string>
     <string name="battery_percentage_description" msgid="8511658577507384014">"Onyesha asilimia ya chaji ya betri kwenye sehemu ya arifa"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Mipangilio kuweka na kupokea data kwa kutamka"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tafuta kwa kutamka"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Baobonye la Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Usemi"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Mipangilio ya kuweka data kwa kutamka"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Kuweka data kwa kutamka"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Huduma za kuweka data kwa kutamka"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Hifadhi ya stakabadhi haikuweza kufutwa."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hifadhi ya hati-tambulishi imewezeshwa."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Unahitaji kuweka PIN au nenosiri la kufunga skrini kabla ya kutumia hifadhi ya hati za uthibitisho."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Programu zinazoweza kufikia maelezo"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Zenye idhini ya kufikia maelezo"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Mlio wa dharura"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Weka tabia wakati simu ya dharura imepigwa"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Hifadhi nakala"</string>
@@ -2340,14 +2336,14 @@
     <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"Mabadiliko yoyote utakayofanya katika akaunti zako kwenye wavuti yatanakiliwa kiotomatiki kwenye simu yako.\n\nBaadhi ya akaunti pia zinaweza kunakili kiotomatiki kwenye wavuti mabadiliko yoyote utakayofanya kwenye simu. Akaunti ya Google hufanyakazi kwa namna hii."</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"Je, data isisawazishwe kiotomatiki?"</string>
     <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"Kuzima kipengele hiki kutaokoa data na matumizi ya betri, lakini utahitajika kusawazisha kila akaunti wewe mwenyewe ili kukusanya taarifa ya hivi karibuni. Na hutapokea arifa masasisho yatakapotokea."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Tarehe iliyowekwa upya ya msururu wa matumizi"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Badilisha tarehe ya kipindi cha kutumia data"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Tarehe ya kila mwezi:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Weka"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Weka onyo kwa matumizi ya data"</string>
     <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Weka kikomo cha matumizi ya data"</string>
-    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"inapunguza matumizi ya data"</string>
-    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Kompyuta kibao yako itazima data ya mtandao wa simu pindi itakapofikia kikomo cha matumizi ulichoweka.\n\nKwa sababu matumizi ya data hupimwa na kompyuta yako kibao na kampuni inayokupa huduma za mtandao huenda ikahesabu matumizi kwa njia tofauti, unashauriwa kuweka kikomo kisicho kamili sana."</string>
-    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Simu yako itazima data ya mtandao wa simu pindi itakapofikia kikomo cha matumizi ya data ulichoweka. \n\nKwa sababu matumizi ya data hupimwa na simu yako na kampuni inayokupa huduma za mtandao huenda ikahesabu matumizi kwa njia tofauti, unashauriwa kuweka kikomo kisicho kamili sana."</string>
+    <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Kupunguza matumizi ya data"</string>
+    <string name="data_usage_limit_dialog_mobile" product="tablet" msgid="4983487893343645667">"Kompyuta kibao yako itazima data ya mtandao wa simu pindi itakapofikia kikomo cha matumizi ulichoweka.\n\nKwa kuwa kompyuta kibao yako ndiyo huwa inapima matumizi ya data, na kampuni inayokupa huduma za mtandao huenda ikahesabu matumizi kwa njia tofauti, unashauriwa kuweka kikomo kisicho kamili sana."</string>
+    <string name="data_usage_limit_dialog_mobile" product="default" msgid="3926320594049434225">"Simu yako itazima data ya mtandao wa simu pindi itakapofikia kikomo cha matumizi ya data ulichoweka. \n\nKwa kuwa simu yako ndiyo huwa inapima matumizi ya data, na kampuni inayokupa huduma za mtandao huenda ikahesabu matumizi kwa njia tofauti, unashauriwa kuweka kikomo kisicho kamili sana."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Zuia data ya mandhari nyuma?"</string>
     <string name="data_usage_restrict_background" msgid="434093644726734586">"Ukidhibiti matumizi ya chini chini ya data ya mitandao ya simu, baadhi ya programu na huduma hazitafanya kazi mpaka uunganishe kwenye Wi-Fi tena."</string>
     <string name="data_usage_restrict_background_multiuser" product="tablet" msgid="7096707497743363380">"Ukidhibiti matumizi ya chini chini ya data ya mtandao wa simu, baadhi ya programu na huduma hazitafanya kazi mpaka uunganishe kwenye Wi-Fi.\n\nMipangilio hii itaathiri watumiaji wote wa kompyuta kibao hii."</string>
@@ -2425,7 +2421,7 @@
     <string name="vpn_always_on_summary_active" msgid="8800736191241875669">"Imewasha kipengee cha Iwe Imewashwa"</string>
     <string name="vpn_require_connection" msgid="8388183166574269666">"Zuia miunganisho isiyotumia VPN"</string>
     <string name="vpn_require_connection_title" msgid="159053539340576331">"Je, unahitaji muunganisho wa VPN?"</string>
-    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Chagua wasifu wa VPN ambapo utakuwa umeunganishwa kila mara. Trafiki ya mtandao itaruhusiwa tu unapounganishwa kwenye VPN."</string>
+    <string name="vpn_lockdown_summary" msgid="2200032066376720339">"Chagua wasifu wa VPN ambapo utakuwa umeunganishwa kila mara. Shughuli kwenye mtandao zitaruhusiwa tu wakati umeunganishwa kwenye VPN."</string>
     <string name="vpn_lockdown_none" msgid="9214462857336483711">"Hamna"</string>
     <string name="vpn_lockdown_config_error" msgid="3898576754914217248">"Kila mara VPN iliyowashwa inahitaji anwani ya Itifaki Wavuti za seva na DNS."</string>
     <string name="vpn_no_network" msgid="3050233675132726155">"Hakuna muunganisho wa mtandao. Tafadhali jaribu tena baadaye."</string>
@@ -2449,10 +2445,10 @@
     <string name="user_credential_title" msgid="1954061209643070652">"Maelezo ya kitambulisho"</string>
     <string name="user_credential_removed" msgid="6514189495799401838">"Imeondoa kitambulisho: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Hakuna kitambulisho cha mtumiaji kilichounganishwa"</string>
-    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Kikagua tahajia"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Andika nenosiri lako la sasa la hifadhi rudufu kamili hapa"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Andika nenosiri jipya la hifadhi rudufu kamili hapa"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Andika upya nenosiri yako kamili ya kuhifadhi hapa"</string>
+    <string name="spellcheckers_settings_title" msgid="399981228588011501">"Kikagua maendelezo"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Andika nenosiri unalotumia kuhifadhi nakala kamili"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Andika nenosiri jipya la kuhifadhi nakala kamili"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Andika tena nenosiri lako la kuhifadhi nakala kamili"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Weka nenosiri mbadala"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Ghairi"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"sasisho za ziada za mfumo"</string>
@@ -2499,7 +2495,7 @@
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"Wasifu uliozuiwa"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"Ungependa kuongeza mtumiaji?"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"Unaweza kutumia kifaa hiki pamoja na watu wengine kwa kuongeza watumiaji wa ziada. Kila mtumiaji ana nafasi yake mwenyewe, ambayo anaweza kuweka programu anazopenda, mandhari na kadhalika. Watumiaji pia wanaweza kurekebisha mipangilio ya kifaa inayoathiri kila mtu kama Wi-Fi.\n\nUnapomwongeza mtumiaji mpya, mtu huyo anahitaji kujitayarishia nafasi yake.\n\nMtumiaji yeyote anaweza kuwasasishia watumiaji wengine wote programu."</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">"Mtumiaji mpya unayemwongeza anahitaji kuongeza akaunti yake.\n\nMtumiaji yoyote anaweza kusasisha programu kwa niaba ya watumiaji wengine wote."</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"Mtumiaji mpya utakayemwongeza atahitaji kuongeza akaunti yake.\n\nMtumiaji yoyote anaweza kusasisha programu kwa niaba ya wengine wote."</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"Mtumiaji aongezwe sasa?"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"Hakikisha kuwa mtu huyu anaweza kuchukua kifaa na kuweka mapendeleo yake"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ungependa kuweka wasifu sasa?"</string>
@@ -2548,13 +2544,13 @@
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Gusisha ili ulipe"</string>
     <string name="nfc_payment_how_it_works" msgid="3028822263837896720">"Jinsi inavyofanya kazi"</string>
     <string name="nfc_payment_no_apps" msgid="5477904979148086424">"Lipa kwa kutumia simu yako katika maduka"</string>
-    <string name="nfc_payment_default" msgid="8648420259219150395">"Chaguo-msingi ya malipo"</string>
+    <string name="nfc_payment_default" msgid="8648420259219150395">"Chaguo-msingi la malipo"</string>
     <string name="nfc_payment_default_not_set" msgid="7485060884228447765">"Haijawekwa"</string>
     <string name="nfc_payment_app_and_desc" msgid="7942415346564794258">"<xliff:g id="APP">%1$s</xliff:g> - <xliff:g id="DESCRIPTION">%2$s</xliff:g>"</string>
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"Tumia chaguo-msingi"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"Kila wakati"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"Isipokuwa wakati programu nyingine ya malipo imefunguliwa"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Katika kituo cha kulipa cha Gonga na ulipe, lipa ukitumia:"</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"Unapolipa ukitumia chaguo la Gonga na ulipe, tumia:"</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"Kulipa katika kituo"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"Sanidi programu ya malipo. Shikilia tu upande wa nyuma wa simu yako kwenye kituo chochote cha malipo chenye alama ya kulipa bila kugusa."</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"Nimeelewa"</string>
@@ -2607,7 +2603,7 @@
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Eneo"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Ruhusu programu zitumie maelezo yako ya eneo"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Nyuma"</string>
-    <string name="wizard_next" msgid="3606212602795100640">"Inayofuata"</string>
+    <string name="wizard_next" msgid="3606212602795100640">"Endelea"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"Kamilisha"</string>
     <string name="user_image_take_photo" msgid="1280274310152803669">"Piga picha"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Chagua picha kutoka Matunzio"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Sauti ya arifa"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Sauti chaguo-msingi ya arifa"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Sauti iliyotolewa na programu"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Sauti chaguo-msingi ya arifa"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Sauti chaguo-msingi ya kengele"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Pia tetema simu zinapoingia"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Sauti nyingine"</string>
@@ -2739,7 +2737,7 @@
     <string name="charging_sounds_title" msgid="1132272552057504251">"Sauti za kuchaji"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Kuambatisha sauti"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Sauti inapoguswa"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Gonga ili itoe mtetemo"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Iteteme inapoguswa"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Cheza kutumia spika ya kituo"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Sauti zote"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Sauti za maudhui pekee"</string>
@@ -2753,8 +2751,8 @@
       <item quantity="one">Imewasha sheria 1 ya kiotomatiki</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Mapendeleo ya hali ya Usinisumbue"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Ruhusu kipaumbele pekee"</string>
-    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sheria za otomatiki"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yanayopewa kipaumbele ni"</string>
+    <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Sheria otomatiki"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Weka sheria za Usinisumbue"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Dhibiti sauti na mitetemo wakati fulani"</string>
     <string name="zen_mode_option_important_interruptions" msgid="3903928008177972500">"Kipaumbele tu"</string>
@@ -2779,7 +2777,7 @@
     <string name="configure_notification_settings" msgid="7616737397127242615">"Arifa"</string>
     <string name="advanced_section_header" msgid="8833934850242546903">"Mipangilio ya kina"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Arifa za kazini"</string>
-    <string name="notification_pulse_title" msgid="1905382958860387030">"Pepesa mwangaza"</string>
+    <string name="notification_pulse_title" msgid="1905382958860387030">"Mwangaza umemeteke"</string>
     <string name="lock_screen_notifications_title" msgid="6173076173408887213">"Skrini inapofungwa"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Onyesha arifa za maudhui yote"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ficha arifa za maudhui nyeti"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Ungependa arifa za wasifu wako zionekane aje wakati kifaa chako kimefungwa?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Arifa za wasifu"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Arifa"</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_blocked" msgid="7938180808339386300">"Usawahi kuonyesha arifa"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Chini: Hakuna sauti wala madoido"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Wastani: Hakuna sauti"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Juu: Toa sauti"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Dharura: Toa sauti na ibukizi 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="6585849855452076626">"Ruhusu Sauti"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Usiruhusu sauti, mtetemo au onyesho la kuchungulia kwenye skrini ya sasa."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Mratibu wa arifa"</string>
@@ -2812,7 +2811,7 @@
       <item quantity="other">Programu %d zinaweza kusoma arifa</item>
       <item quantity="one">Programu %d inaweza kusoma arifa</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"Hakuna programu zilizosakinishwa ambazo zimeomba ufikiaji wa arifa."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia arifa."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Je, ungependa kuruhusu ufikiaji wa arifa za <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>itaweza kusoma arifa zote ikiwa ni pamoja na maelezo ya binafsi kama vile majina ya anwani na SMS ambazo unapokea. Itaweza pia kuondoa arifa au kusababisha shughuli za vitufe vya vitendo vilivyomo.\n\n Hii pia itaipa programu uwezo wa kuwasha au kuzima kipengele cha Usinisumbue na kubadilisha mipangilio inayohusiana nacho."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Ukizima ufikiaji wa arifa katika <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>, huenda hali hii pia ikazima ufikiaji wa kipengee cha Usinisumbue."</string>
@@ -2833,9 +2832,11 @@
     <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_on" msgid="6103704909710176555">"Ndiyo"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Hapana"</string>
-    <string name="manage_zen_access_title" msgid="2611116122628520522">"Ufikiaji wa Usinisumbue"</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"Hakuna programu zilizosakinishwa ambazo zimeomba ufikiaji wa Usinisumbue"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android inazuia arifa za programu hii ili zisionekane kwenye kifaa hiki"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android inazuia aina hizi za arifa ili zisionekane kwenye kifaa hiki"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Aina"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Nyingine"</string>
     <string name="no_channels" msgid="3077375508177744586">"Programu hii haijachapisha arifa zozote"</string>
@@ -2866,7 +2867,7 @@
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nyeti"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Nimemaliza"</string>
     <string name="app_notification_importance_title" msgid="8002263131149345584">"Umuhimu"</string>
-    <string name="notification_show_lights_title" msgid="7671781299688190532">"Pepesa mwangaza"</string>
+    <string name="notification_show_lights_title" msgid="7671781299688190532">"Mwangaza umemeteke"</string>
     <string name="notification_vibrate_title" msgid="1646667807969755957">"Mtetemo"</string>
     <string name="notification_channel_sound_title" msgid="3899212238513507941">"Mlio"</string>
     <string name="zen_mode_rule_delete_button" msgid="903658142711011617">"Futa"</string>
@@ -2911,14 +2912,14 @@
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Ujumbe wote"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Ujumbe uliochaguliwa"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Kutoka kwa mtu yeyote"</string>
-    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kutoka kwa anwani pekee"</string>
+    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"Kutoka kwa anwani zilizobainishwa pekee"</string>
     <string name="zen_mode_from_starred" msgid="2678345811950997027">"Kutoka kwa anwani zenye nyota pekee"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"Hamna"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"Kengele"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"Vikumbusho"</string>
     <string name="zen_mode_events" msgid="7914446030988618264">"Matukio"</string>
     <string name="zen_mode_all_callers" msgid="584186167367236922">"Wapiga simu wote"</string>
-    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wanaopiga simu uliowachagua"</string>
+    <string name="zen_mode_selected_callers" msgid="3127598874060615742">"Wale uliowachagua"</string>
     <string name="zen_mode_repeat_callers" msgid="5019521886428322131">"Wanaorudia kupiga simu"</string>
     <string name="zen_mode_repeat_callers_summary" msgid="7192713032364140137">"Mtu yule yule akipiga simu mara ya pili ndani ya kipindi cha dakika <xliff:g id="MINUTES">%d</xliff:g>, mruhusu"</string>
     <string name="zen_mode_when" msgid="2767193283311106373">"Washa kiotomatiki"</string>
@@ -2940,10 +2941,10 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"Badilisha utumie kengele pekee hadi <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"Badilisha utumie hali ya katiza wakati wote"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"Zuia wakati skrini imewashwa"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Zuia arifa zilizozimwa sauti kwa kutumia kipengee cha Usinisumbue zisichungulie wala kuibuka kwenye skrini"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"Zuia arifa zilizozuiwa na kipengele cha Usinisumbue zisijitokeze kwa vyovyote vile kwenye skrini"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"Zuia wakati skrini imezimwa"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Zuia arifa zilizozimwa sauti kwa kutumia kipengele cha Usinisumbue zisiwashe skrini wala mwangaza wa arifa"</string>
-    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Usiruhusu skrini iwashwe na arifa zilizozimwa sauti kwa kutumia kipengele cha Usinisumbue"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"Zuia arifa zilizozuiwa na kipengele cha Usinisumbue zisiwashe skrini wala mwangaza wa arifa"</string>
+    <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"Zuia arifa zilizozuiwa na kipengele cha Usinisumbue zisiwashe skrini"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"Imezimwa"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"Wakati skrini imewashwa"</string>
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"Wakati skrini imezimwa"</string>
@@ -2953,7 +2954,7 @@
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"Weka PIN ya msimamizi"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"Imewashwa"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Imezimwa"</string>
-    <string name="screen_pinning_title" msgid="2292573232264116542">"Ubandikaji wa skrini"</string>
+    <string name="screen_pinning_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_unlock_pattern" msgid="8282268570060313339">"Omba mchoro wa kufungua kabla hujabandua"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Itisha PIN kabla hujabandua"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Baki katika mkao wa sasa"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Uanzishaji salama"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Endelea"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Unaweza kulinda kifaa hiki zaidi kwa kuweka PIN yako kabla hujakiwasha. Kabla kifaa kiwake, hakiwezi kupokea simu, SMS au arifa, ikiwa ni pamoja na kengele. \n\nHii husaidia kulinda data kwenye vifaa vinavyopotea au kuibwa."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mchoro wako kabla hujakiwasha. Kabla kifaa kiwake, hakiwezi kupokea simu, SMS au arifa, ikiwa ni pamoja na kengele. \n\nHii husaidia kulinda data kwenye vifaa vinavyopotea au kuibwa."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Unaweza kulinda kifaa hiki zaidi kwa kuweka nenosiri lako kabla hujakiwasha. Kabla kifaa kiwake, hakiwezi kupokea simu, SMS au arifa, ikiwa ni pamoja na kengele. \n\nHii husaidia kulinda data kwenye vifaa vinavyopotea au kuibwa."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Pamoja na kutumia kitambulisho chako kufungua kifaa chako, unaweza kukilinda kifaa hiki zaidi kwa kuweka mipangilio ili kiitishe PIN kabla kianze kutumika. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi kianze kutumika.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au kuibwa."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Pamoja na kutumia kitambulisho chako kufungua kifaa chako, unaweza kukilinda kifaa hiki zaidi kwa kuweka mipangilio ili kiitishe mchoro kabla kianze kutumika. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi kianze kutumika.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au kuibwa."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Pamoja na kutumia kitambulisho chako kufungua kifaa chako, unaweza kukilinda kifaa hiki zaidi kwa kuweka mipangilio ili kiitishe nenosiri kabla kianze kutumika. Kifaa hakiwezi kupokea simu, ujumbe au arifa, ikiwa ni pamoja na kengele, hadi kianze kutumika.\n\nHii husaidia kulinda data kwenye vifaa vilivyopotea au kuibwa."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Itisha PIN kabla kifaa kiwashwe"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Itisha mchoro kabla kifaa kiwashwe"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Itisha nenosiri kabla kifaa kiwashwe"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Hapana, asante"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Hapana, asante"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Hapana, asante"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba PIN yako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe PIN kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba mchoro wako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe mchoro kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Unaweza kulinda kifaa hiki zaidi kwa kuweka mipangilio ya kuomba nenosiri lako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe nenosiri kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Mbali na kutumia alama yako ya kidole, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba PIN yako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe PIN kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Mbali na kutumia alama yako ya kidole kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba mchoro wako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe mchoro kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Mbali na kutumia alama ya kidole ili kufungua kifaa chako, unaweza kukilinda zaidi kwa kuweka mipangilio ya kuomba nenosiri lako kabla ya kukiwasha. Kifaa hakitaweza kupokea simu, ujumbe au arifa, zikiwemo kengele, hadi utakapokiwasha. \n\nHali hii itasaidia kulinda data yako ikiwa kifaa kitapotea au kuibwa. Ungependa kifaa kiombe nenosiri kabla ya kufunguka?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ndiyo"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Hapana"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Je, inahitaji PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Je, inahitaji mchoro?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Je, inahitaji nenosiri?"</string>
@@ -3036,7 +3033,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"Binafsi"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"Kazini"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"Programu: Zote"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Programu: Zimezimwa"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"Programu zilizozimwa"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"Aina: Umuhimu wa dharura"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"Aina: Umuhimu wa chini"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"Aina: Zimezimwa"</string>
@@ -3063,8 +3060,8 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"Haitambuliwi"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"Chaguo-msingi"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Chaguo-msingi ya kazini"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Maagizo ya sauti na kuweka data kwa kutamka"</string>
-    <string name="default_assist_title" msgid="8868488975409247921">"Programu ya maagizo ya sauti"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"Maagizo na usaidizi kwa kutamka"</string>
+    <string name="default_assist_title" msgid="8868488975409247921">"Programu ya usaidizi"</string>
     <string name="assistant_security_warning_title" msgid="8673079231955467177">"Ungetaka kuweka <xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g> kuwa mratibu wako?"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"Mratibu itaweza kusoma maelezo kuhusu programu unazotumia katika mfumo wako, ikiwa ni pamoja na maelezo yanayoonekana kwenye skrini yako au yanayoweza kufikiwa kutoka ndani ya programu."</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"Kubali"</string>
@@ -3077,7 +3074,7 @@
     <string name="system_app" msgid="9068313769550747372">"(Mfumo)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(Programu chaguo-msingi ya mfumo)"</string>
     <string name="apps_storage" msgid="4353308027210435513">"Hifadhi ya programu"</string>
-    <string name="usage_access" msgid="5479504953931038165">"Ufikiaji wa matumizi"</string>
+    <string name="usage_access" msgid="5479504953931038165">"Kufikia matumizi"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"Idhinisha ufikiaji wa matumizi"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"Mapendeleo ya matumizi ya programu"</string>
     <string name="usage_access_description" msgid="1352111094596416795">"Ufikiaji wa matumizi huruhusu programu kufuatilia programu zingine unazotumia na mara ngapi unazitumia, pamoja na mtoa huduma, mipangilio ya lugha, na maelezo yako mengine."</string>
@@ -3092,15 +3089,15 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"Hifadhi ya wastani <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"Uboreshaji wa betri"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"Kuboresha matumizi ya betri"</string>
     <string name="additional_battery_info" msgid="4754099329165411970">"Arifa za matumizi"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Onyesha programu zote"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Ficha programu za ziada"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"Haijaboreshwa"</string>
     <string name="high_power_on" msgid="6216293998227583810">"Haijaboreshwa"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Kuboresha matumizi ya betri"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"Uboreshaji wa betri haupatikani"</string>
-    <string name="high_power_desc" msgid="6283926163708585760">"Usitumie kipengele cha uboreshaji wa betri. Kinaweza kumaliza chaji ya betri yako haraka zaidi."</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Chaguo la kuboresha matumizi ya betri halipatikani"</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"Usitumie kipengele cha kuboresha matumizi ya betri. Kinaweza kumaliza chaji ya betri yako haraka zaidi."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Ungependa kuruhusu programu itumike chini chini kila wakati?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Ukiruhusu <xliff:g id="APP_NAME">%1$s</xliff:g> kutumika chini chini, unaweza kupunguza muda wa matumizi ya betri. \n\nUnaweza kubadilisha hali hii baadaye katika Mipangilio &gt; Programu na arifa."</string>
     <string name="battery_summary" msgid="8044042095190688654">"Imetumia <xliff:g id="PERCENTAGE">%1$s</xliff:g> tangu ilipojazwa chaji mara ya mwisho"</string>
@@ -3166,7 +3163,7 @@
     <string name="zen_access_warning_dialog_title" msgid="1198189958031157142">"Je, ungependa kuruhusu ufikiaji kwa Usinisumbue kwenye <xliff:g id="APP">%1$s</xliff:g>?"</string>
     <string name="zen_access_warning_dialog_summary" msgid="4015885767653010873">"Programu itaweza kuzima na kuwasha kipengee cha Usinisumbue na kufanya mabadiliko katika mipangilio inayohusiana."</string>
     <string name="zen_access_disabled_package_warning" msgid="302820100078584431">"Lazima kiwe kimewashwa kwa sababu kipengele cha ufikiaji wa arifa kimewashwa"</string>
-    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Ungependa kubatilisha ufikiaji wa Usinisumbue wa <xliff:g id="APP">%1$s</xliff:g>?"</string>
+    <string name="zen_access_revoke_warning_dialog_title" msgid="558779234015793950">"Ungependa kubatilisha idhini ya <xliff:g id="APP">%1$s</xliff:g> ya kufikia kipengele cha Usinisumbue?"</string>
     <string name="zen_access_revoke_warning_dialog_summary" msgid="5518216907304930148">"Itaondoa sheria zote za Usinisumbue ambazo zimetengenezwa na programu hii."</string>
     <string name="ignore_optimizations_on" msgid="6915689518016285116">"Usiboreshe"</string>
     <string name="ignore_optimizations_off" msgid="6153196256410296835">"Boresha"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Idhini hii huruhusu programu kubadilisha mipangilio ya mfumo"</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ndiyo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hapana"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ndiyo"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Hapana"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Ruhusu usakinishaji wa programu"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Imeruhusiwa"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Hairuhusiwi"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Ruhusu kutoka chanzo hiki"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kunja mkon mara mbili ili ufungue kamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Fungua programu ya kamera kwa kukunja kifundo cha mkono wako mara mbili"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Bonyeza kitufe cha kuwasha/kuzima mara mbili ili utumie kamera"</string>
@@ -3231,8 +3228,8 @@
     <string name="disconnected" msgid="4836600637485526329">"Haijaunganishwa"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> ya data imetumika"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
-      <item quantity="other">Izime katika programu <xliff:g id="COUNT">%d</xliff:g></item>
-      <item quantity="one">Izime katika programu 1</item>
+      <item quantity="other">Zimezimwa katika programu <xliff:g id="COUNT">%d</xliff:g></item>
+      <item quantity="one">Zimezimwa katika programu 1</item>
     </plurals>
     <string name="notification_summary_none" msgid="4586376436702610">"Iwashwe katika programu zote"</string>
     <string name="apps_summary" msgid="193158055537070092">"Programu <xliff:g id="COUNT">%1$d</xliff:g> zimesakinishwa"</string>
@@ -3249,7 +3246,7 @@
     <string name="location_on_summary" msgid="5127631544018313587">"WASHA / <xliff:g id="LOCATION_MODE">%1$s</xliff:g>"</string>
     <string name="location_off_summary" msgid="6474350053215707957">"IMEZIMWA"</string>
     <string name="backup_disabled" msgid="485189128759595412">"Kipengee cha kuhifadhi nakala kimezimwa"</string>
-    <string name="about_summary" msgid="924181828102801010">"Imesasishwa kuwa Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
+    <string name="about_summary" msgid="924181828102801010">"Imesasishwa na sasa inatumia Android <xliff:g id="VERSION">%1$s</xliff:g>"</string>
     <string name="disabled_by_policy_title" msgid="627023216027648534">"Kitendo hakiruhusiwi"</string>
     <string name="disabled_by_policy_title_adjust_volume" msgid="7399450998356045023">"Haiwezi kubadilisha sauti"</string>
     <string name="disabled_by_policy_title_outgoing_calls" msgid="7919816644946067058">"Huruhusiwi kupiga simu"</string>
@@ -3301,7 +3298,7 @@
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"Onyo kuhusu data ya <xliff:g id="ID_1">%1$s</xliff:g> / Kikomo cha data cha <xliff:g id="ID_2">%2$s</xliff:g>"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Kipindi cha kutuma bili"</string>
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Kipindi cha kila mwezi huanza tarehe <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hutozwa kila mwezi kuanzia  <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hutozwa kila mwezi kuanzia tarehe <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Vizuizi vya mtandao"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other">Vizuizi <xliff:g id="COUNT">%1$d</xliff:g></item>
@@ -3317,8 +3314,8 @@
     <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">
-      <item quantity="other">Programu <xliff:g id="COUNT">%1$d</xliff:g> zimeruhusiwa kutumia data ambayo haijadhibitiwa wakati Kiokoa Data kimewashwa</item>
-      <item quantity="one">Programu 1 imeruhusiwa kutumia data ambayo haijadhibitiwa wakati Kiokoa Data kimewashwa</item>
+      <item quantity="other">Programu <xliff:g id="COUNT">%1$d</xliff:g> zimeruhusiwa kutumia data bila kudhibitiwa wakati Kiokoa Data kimewashwa</item>
+      <item quantity="one">Programu 1 imeruhusiwa kutumia data bila kudhibitiwa wakati Kiokoa Data kimewashwa</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Kiokoa data"</string>
     <string name="unrestricted_data_saver" msgid="7019858887510062789">"Kufikia data bila vikwazo"</string>
@@ -3336,10 +3333,10 @@
     <string name="suggestion_additional_fingerprints" msgid="2214281455363797037">"Ongeza alama nyingine ya kidole"</string>
     <string name="suggestion_additional_fingerprints_summary" msgid="5471253233176471245">"Fungua kwa kidole tofauti"</string>
     <string name="battery_saver_on_summary" msgid="9072203872401530722">"Imewashwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Imezimwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
-    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Usiwahi kuwasha kiotomatiki"</string>
+    <string name="battery_saver_off_summary" msgid="8309471955051162327">"Kimezimwa / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Kisiwahi kuwashwa kiotomatiki"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Washa kiotomatiki wakati chaji ya betri imefika %1$s"</string>
-    <string name="not_battery_optimizing" msgid="5362861851864837617">"Haitumii uboreshaji wa betri"</string>
+    <string name="not_battery_optimizing" msgid="5362861851864837617">"Haitumii kipengele cha kuboresha matumizi ya betri"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Ikiwa kifaa kimefungwa, usiruhusu uchapaji wa majibu au maandishi mengine kwenye arifa"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Kikagua maendelezo chaguo-msingi"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Chagua kikagua maendelezo"</string>
@@ -3375,8 +3372,8 @@
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Kipengele cha kuorodhesha hakina ufunguo huu."</string>
     <string name="special_access" msgid="3458780842491881155">"Idhini maalum ya kufikia programu"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
-      <item quantity="other">Programu <xliff:g id="COUNT">%d</xliff:g> zinaweza kutumia data ambayo haijadhibitiwa</item>
-      <item quantity="one">Programu 1 inaweza kutumia data ambayo haijadhibitiwa</item>
+      <item quantity="other">Programu <xliff:g id="COUNT">%d</xliff:g> zinaweza kutumia data bila kudhibitiwa</item>
+      <item quantity="one">Programu 1 inaweza kutumia data bila kudhibitiwa</item>
     </plurals>
     <string name="confirm_convert_to_fbe_warning" msgid="1487005506049137659">"Una uhakika kuwa unataka futa data ya mtumiaji na kugeuza kuwa usimbaji fiche wa faili?"</string>
     <string name="button_confirm_convert_fbe" msgid="7101855374850373091">"Futa na ugeuze"</string>
@@ -3390,10 +3387,11 @@
     <string name="developer_smallest_width" msgid="7516950434587313360">"Upana mdogo zaidi"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"Hakuna programu zilizosakinishwa ambazo zimeomba kufikia huduma ya SMS zinazolipiwa"</string>
     <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">"Ufikiaji wa huduma ya SMS zinazolipiwa"</string>
+    <string name="premium_sms_access" msgid="4660047004791638305">"Kufikia huduma ya SMS zinazolipiwa"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Haionekani kwa vifaa vingine"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Imeunganishwa kwenye"</string>
-    <string name="demo_mode" msgid="2798762752209330277">"Hali ya onyesho la UI ya mfumo"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Vigae vya msanidi programu vya mipangilio ya haraka"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Tuko hapa kukuhudumia"</string>
     <string name="support_escalation_24_7_title" msgid="8118369197749832074">"Tuko tayari kukuhudumia wakati wowote kila siku"</string>
@@ -3410,7 +3408,7 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"Huenda ukatozwa kwa kupiga simu nje ya nchi yako"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"Simu"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"Gumzo"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Gundua vidokezo na mbinu"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"Angalia vidokezo na mbinu"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"Tafuta usaidizi na utume maoni"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"Wasiliana na kituo cha usaidizi"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"Ingia katika akaunti"</string>
@@ -3469,8 +3467,8 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Ili uangalie arifa zako kwa haraka, chukua kompyuta yako kibao."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"ili uangalie arifa zako kwa haraka, chukua kifaa chako."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Telezesha kidole ili upate arifa"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole katika upande wa nyuma wa simu yako."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole katika upande wa nyuma wa kompyuta yako kibao."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa simu yako."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole kilicho upande wa nyuma wa kompyuta yako kibao."</string>
     <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Ili uangalie arifa zako, telezesha kidole kuelekea chini kwenye kitambua alama ya kidole nyuma ya kifaa chako."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Ishara ya usaidizi"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
@@ -3505,7 +3503,7 @@
     <string name="enterprise_privacy_enterprise_data" msgid="2773968662865848413">"Data inayohusiana na akaunti yako ya kazini, kama vile barua pepe na kalenda"</string>
     <string name="enterprise_privacy_installed_packages" msgid="2313698828178764590">"Orodha ya programu zilizo kwenye kifaa chako"</string>
     <string name="enterprise_privacy_usage_stats" msgid="4398411405572759370">"Muda na data iliyotumika katika kila programu"</string>
-    <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Kumbukumbu ya hivi majuzi zaidi ya trafiki ya mtandao"</string>
+    <string name="enterprise_privacy_network_logs" msgid="161722817268849590">"Kumbukumbu ya hivi majuzi zaidi ya shughuli kwenye mtandao"</string>
     <string name="enterprise_privacy_bug_reports" msgid="843225086779037863">"Ripoti ya hivi karibuni ya hitilafu"</string>
     <string name="enterprise_privacy_security_logs" msgid="5377362481617301074">"Kumbukumbu ya hivi majuzi ya usalama"</string>
     <string name="enterprise_privacy_none" msgid="7706621148858381189">"Hamna"</string>
@@ -3571,7 +3569,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"Hifadhi ya kompyuta kibao"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Hifadhi ya simu"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"Hifadhi iliyotumika kati ya <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"kati ya <xliff:g id="TOTAL">%1$s</xliff:g> zimetumika"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"imetumika"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Futa data kwenye programu"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Ungependa kuondoa programu hii inayofunguka papo hapo?"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(imezimwa kwa mtumiaji <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Huduma ya kujaza otomatiki"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"otomatiki, jaza, kujaza otomatiki"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Ungependa kufanya <xliff:g id="APP_NAME_0">%1$s</xliff:g> iwe programu yako ya kujaza otomatiki? <xliff:g id="APP_NAME_1">%1$s</xliff:g> itaweza kusoma skrini yako na kujaza sehemu katika programu zingine."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Hakikisha kuwa unaamini programu hii&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; hutumia kilicho kwenye skrini yako kubaini kinachoweza kujazwa kiotomatiki."</string>
     <string name="device_theme" msgid="4571803018917608588">"Mandhari ya kifaa"</string>
     <string name="default_theme" msgid="7085644992078579076">"Chaguo-msingi"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Kidhibiti Hifadhi: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index dcdf7fa..87a941d 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ஏதுமில்லை"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"சிம்"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ஏதுமில்லை"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 01bb91e..10e0ad6 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"கணக்குகள்"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"இருப்பிடம்"</string>
     <string name="account_settings_title" msgid="626177544686329806">"கணக்குகள்"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"பாதுகாப்பு &amp; இருப்பிடம்"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"என்கிரிப்ஷன் &amp; அனுமதிச் சான்றுகள்"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ஃபோன் என்கிரிப்ட் செய்யப்பட்டது"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ஃபோன் என்கிரிப்ட் செய்யப்பட்டது"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"பூட்டுத் திரை விருப்பத்தேர்வுகள்"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"எனது இருப்பிடம், திரை திற, சிம் கார்டு பூட்டு, நற்சான்று சேமிப்பிட பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"எனது இருப்பிடம், திரையைத் திற, நற்சான்று சேமிப்பிடப் பூட்டு ஆகியவற்றை அமைக்கவும்"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"தனியுரிமை"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"நிர்வாகி முடக்கியுள்ளார்"</string>
     <string name="security_status_title" msgid="5848766673665944640">"பாதுகாப்பு நிலை"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"கைரேகைகளை நிர்வகிக்கவும்"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"இதற்குப் பயன்படுத்து:"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"உயர்தரமான பொது நெட்வொர்க் கிடைக்கும் போது தெரிவி"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"தானாகவே வைஃபையை இயக்கு"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"உயர்தரம் எனச் சேமிக்கப்பட்ட நெட்வொர்க்குகளுக்கு (எடுத்துக்காட்டு: உங்கள் வீட்டு நெட்வொர்க்) அருகில் இருக்கும் போது, வைஃபை இயக்கப்படும்"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"வைஃபை ஸ்கேனிங் முடக்கப்பட்டுள்ளதால், கிடைக்கவில்லை"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"வேகம் குறைந்த இணைப்புகளைத் தவிர்"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"சிறப்பான இணைய இணைப்பைப் பெறும் வரை வைஃபை நெட்வொர்க்கைப் பயன்படுத்தாதே"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"நல்ல இணைய இணைப்பு கொண்ட நெட்வொர்க்குகளை மட்டும் பயன்படுத்து"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"வைஃபையை உள்ளமைத்தல்"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC முகவரி"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP முகவரி"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"சப்நெட் மாஸ்க்"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 முகவரிகள்"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"சேமித்த நெட்வொர்க்குகள்"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP அமைப்பு"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"இந்தப் பயனருக்கு வைஃபை மேம்பட்ட அமைப்புகள் இல்லை"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"முடக்கத்தில்"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"மொபைல் உறக்கநிலையில் அல்லது சார்ஜாகும்போது, நிகழ்வுகளைக் கட்டுப்படுத்த பகல்கனாவை இயக்கு."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"தொடங்க வேண்டிய நேரம்"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"தற்போதைய ஸ்கிரீன் சேவர்"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"இப்போது தொடங்கு"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"அமைப்பு"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"தானாக ஒளிர்வைச் சரிசெய்தல்"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"விரலை எடுக்கும் போது இயங்கு"</string>
-    <string name="doze_title" msgid="5389406335828323273">"உள்வரும் அறிவிப்புத் திரை"</string>
+    <string name="doze_title" msgid="2259176504273878294">"சூழல்சார் திரை"</string>
     <string name="doze_summary" msgid="3846219936142814032">"அறிவிப்புகளைப் பெறும் போது திரையை இயக்கு"</string>
     <string name="title_font_size" msgid="4405544325522105222">"எழுத்துரு அளவு"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"உரையைப் பெரிதாக்கும் அல்லது சிறிதாக்கும்"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ஒருபோதும் பயன்படுத்தவில்லை)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"விசைப்பலகை குறுக்குவழிகளுக்கான உதவி"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"கிடைக்கும் குறுக்குவழிகளைக் காட்டு"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"இயல்பு"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"மவுஸ்/டிராக்பேட்"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"குறிப்பான் வேகம்"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"கேம் கன்ட்ரோலர்"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"அதிர்வியைப் பயன்படுத்து"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"முழு சார்ஜ் ஆனதிலிருந்து திரை உபயோகம்"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"திரை நுகர்வு"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"மொபைல் நெட்வொர்க்கை ஸ்கேன் செய்தல்"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> முன்பு"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"முழு சார்ஜ் ஆனதிலிருந்து பயன்பாட்டின் உபயோகம் (<xliff:g id="TIME">%1$s</xliff:g> முன்பு)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> முன்பு"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"முழு சார்ஜ் ஆனதிலிருந்து பயன்பாட்டின் உபயோகம் (<xliff:g id="TIME">^1</xliff:g> முன்பு)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"முழு சார்ஜ் ஆனதிலிருந்து, திரை இயக்கத்தில் இருந்த நேரம்"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"முழு சார்ஜ் ஆனதிலிருந்து சாதன உபயோகம்"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"செருகல் நீக்கப்பட்டதிலிருந்து பேட்டரியின் பயன்பாடு"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"கேமரா"</string>
     <string name="power_wifi" msgid="1135085252964054957">"வைஃபை"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"புளூடூத்"</string>
-    <string name="power_cell" msgid="6596471490976003056">"கைபேசி காத்திருப்புநிலை"</string>
+    <string name="power_cell" msgid="3392999761958982492">"மொபைல் நெட்வொர்க் காத்திருப்பு நிலை"</string>
     <string name="power_phone" msgid="5392641106474567277">"குரல் அழைப்புகள்"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"டேப்லெட்டின் செயல்படாநிலை"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"மொபைலின் செயல்படாநிலை"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"பேட்டரி பயன்பாடு என்பது பயன்படுத்தப்படும் ஆற்றலின் தோராய மதிப்பாகும், இதில் அனைத்து பேட்டரி பயன்பாடும் அடங்காது. பலவகை என்பது கணக்கிட்ட தோராயமான ஆற்றல் பயன்பாட்டிற்கும் உண்மையான பேட்டரி பயன்பாட்டிற்கும் இடையே உள்ள வேறுபாடாகும்."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"ஆற்றல் பயன்பாடு அதிகமாகப் பயன்படுத்தப்பட்டது"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s பயன்படுத்தப்பட்டது"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g>க்குப் பயன்படுத்தியது"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> பயன்படுத்துவது: <xliff:g id="PERCENT">%1$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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"குரல் உள்ளீடு &amp; வெளியீட்டின் அமைப்பு"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"குரல் தேடல்"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android விசைப்பலகை"</string>
-    <string name="voice_category" msgid="1430370497125803904">"பேச்சு"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"குரல் உள்ளீட்டு அமைப்பு"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"குரல் உள்ளீடு"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"குரல் உள்ளீட்டுச் சேவைகள்"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"அறிவிப்பின் ஒலியளவு"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"மொபைலின் ரிங்டோன்"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"இயல்பு அறிவிப்பு ஒலி"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"பயன்பாடு வழங்கும் ஒலி"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"இயல்பு அறிவிப்பு ஒலி"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"இயல்பு அலார ஒலி"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"அழைப்பு வருகையில் அதிர்வுறு"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"பிற ஒலிகள்"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"அறிவிப்புகளை ஒருபோதும் காட்டாது"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"குறைவு: ஒலியெழுப்பாது அல்லது காட்சிக் குறுக்கீடு செய்யாது"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"நடுத்தரம்: ஒலியெழுப்பாது"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"அதிகம்: ஒலியெழுப்பும்"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"அவசரம்: ஒலி எழுப்பி, திரையில் பாப் அப் செய்யும்"</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="6585849855452076626">"ஒலியை அனுமதி"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"இந்த அறிவிப்புகளை நடப்புத் திரையில் காட்டும் போது ஒலி, அதிர்வை ஏற்படுத்தாது அல்லது திரையின் மேல் பகுதியில் காட்டாது."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"அறிவிப்பு உதவி"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகல்"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"தொந்தரவு செய்ய வேண்டாம் என்பதன் அணுகலை நிறுவப்பட்ட பயன்பாடுகள் எதுவும் கோரவில்லை"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"பயன்பாடுகளை ஏற்றுகிறது..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"இந்தச் சாதனத்தில் இந்தப் பயன்பாட்டின் அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"இந்தச் சாதனத்தில் இந்த வகையிலான அறிவிப்புகள் தோன்றுவதை Android தடுக்கிறது"</string>
     <string name="notification_channels" msgid="5346841743182627500">"வகைகள்"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"மற்றவை"</string>
     <string name="no_channels" msgid="3077375508177744586">"இந்தப் பயன்பாடு எந்த அறிவிப்புகளையும் இடுகையிடவில்லை"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"தற்போதைய திசையமைப்பில் வை"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"பாதுகாப்பான தொடக்கம்"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"தொடர்"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"இந்தச் சாதனத்தைத் துவக்க, பின் தேவைப்படுமாறு அமைத்து, இதை மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும்வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇவ்வாறு செய்வதால், காணாமல் போன அல்லது களவு போன சாதனங்களில் தரவைப் பாதுகாக்கலாம்."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"இந்தச் சாதனத்தைத் துவக்க, வடிவம் தேவைப்படுமாறு அமைத்து, இதை மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும்வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇவ்வாறு செய்வதால், காணாமல் போன அல்லது களவு போன சாதனங்களில் தரவைப் பாதுகாக்கலாம்."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"இந்தச் சாதனத்தைத் துவக்க, கடவுச்சொல் தேவைப்படுமாறு அமைத்து, இதை மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும்வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇவ்வாறு செய்வதால், காணாமல் போன அல்லது களவு போன சாதனங்களில் தரவைப் பாதுகாக்கலாம்."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்தும் போது, கூடவே சாதனம் தொடங்குவதற்கு முன், பின்னைக் கேட்குமாறு அமைக்கவும். இது உங்களுக்குக் கூடுதல் பாதுகாப்பை வழங்கிடும். சாதனம் தொடங்கும் வரை, அலாரங்கள் உட்பட அழைப்புகள், செய்திகள் அல்லது அறிவிப்புகளை இதில் பெற முடியாது.\n\nஇது தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் உள்ள தரவு பிறருக்குக் கிடைக்காதவாறு பாதுகாக்கும்."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்தும் போது, கூடவே சாதனம் தொடங்குவதற்கு முன், வடிவத்தைக் கேட்குமாறு அமைக்கவும். இது உங்களுக்குக் கூடுதல் பாதுகாப்பை வழங்கிடும். சாதனம் தொடங்கும் வரை, அலாரங்கள் உட்பட அழைப்புகள், செய்திகள் அல்லது அறிவிப்புகளை இதில் பெற முடியாது.\n\nஇது தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் உள்ள தரவு பிறருக்குக் கிடைக்காதவாறு பாதுகாக்கும்."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்தும் போது, கூடவே சாதனம் தொடங்குவதற்கு முன், கடவுச்சொல்லைக் கேட்குமாறு அமைக்கவும். இது உங்களுக்குக் கூடுதல் பாதுகாப்பை வழங்கிடும். சாதனம் தொடங்கும் வரை, அலாரங்கள் உட்பட அழைப்புகள், செய்திகள் அல்லது அறிவிப்புகளை இதில் பெற முடியாது.\n\nஇது தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் உள்ள தரவு பிறருக்குக் கிடைக்காதவாறு பாதுகாக்கும்."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"சாதனத்தைத் துவக்க பின் தேவை"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"சாதனத்தைத் துவக்க வடிவம் தேவை"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"சாதனத்தைத் துவக்க கடவுச்சொல் தேவை"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"வேண்டாம்"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"வேண்டாம்"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"வேண்டாம்"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"இந்தச் சாதனத்தைத் துவக்கும் முன், பின் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, பின்னைக் கேட்பதை அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"இந்தச் சாதனத்தைத் துவக்கும் முன், பேட்டர்ன் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, பேட்டர்னைக் கேட்பதை அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"இந்தச் சாதனத்தைத் துவக்கும் முன், கடவுச்சொல் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, கடவுச்சொல்லைக் கேட்பதை அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, இந்தச் சாதனத்தைத் துவக்கும் முன், பின் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, பின்னைக் கேட்பதை அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, இந்தச் சாதனத்தைத் துவக்கும் முன், பேட்டர்ன் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, பேட்டர்னைக் கேட்பதை அமைக்கவா?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"சாதனத்தைத் திறக்க உங்கள் கைரேகையைப் பயன்படுத்துவதுடன் சேர்த்து, இந்தச் சாதனத்தைத் துவக்கும் முன், கடவுச்சொல் தேவைப்படுமாறு அமைத்து, மேலும் பாதுகாக்கலாம். சாதனம் துவங்கும் வரை, அழைப்புகள், செய்திகள் அல்லது அலாரங்கள் உள்ளிட்ட அறிவிப்புகளை இதில் பெற முடியாது. \n\nஇந்த அம்சம், தொலைந்த அல்லது திருடப்பட்ட சாதனங்களில் தரவைப் பாதுகாக்க உதவும். சாதனத்தைத் தொடங்கும் போது, கடவுச்சொல்லைக் கேட்பதை அமைக்க&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ஆம்"</string>
+    <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>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"ஆம்"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"இல்லை"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"பயன்பாட்டு நிறுவல்களை அனுமதி"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"அனுமதிக்கப்பட்டது"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"அனுமதிக்கப்படவில்லை"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"கேமராவிற்கு பவர் பட்டனை இருமுறை அழுத்துக"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"இதனுடன் இணைக்கப்பட்டது:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"விரைவு அமைப்புகளின் டெவெலப்பர் கட்டங்கள்"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"உதவுவதற்காகக் காத்திருக்கிறோம்"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>க்கு முடக்கப்பட்டது)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"தன்னிரப்பிச் சேவை"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"தானாக, நிரப்பு, தானாக நிரப்பு, தன்னிரப்பி"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>ஐ உங்கள் தன்னிரப்பிப் பயன்பாடாக அமைக்கவா? <xliff:g id="APP_NAME_1">%1$s</xliff:g> உங்கள் திரையைப் படித்து, பிற பயன்பாடுகளில் உள்ள புலங்களை நிரப்பலாம்."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;இந்தப் பயன்பாட்டை நம்புகிறீர்கள் என்பதை உறுதிப்படுத்திக்கொள்ளவும்&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; உங்கள் திரையில் இருப்பதைப் பயன்படுத்தி, எவற்றையெல்லாம் தன்னிரப்ப முடியும் என்பதைத் தீர்மானிக்கும்."</string>
     <string name="device_theme" msgid="4571803018917608588">"சாதனத்தின் தீம்"</string>
     <string name="default_theme" msgid="7085644992078579076">"இயல்பு"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"சேமிப்பக நிர்வாகி: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index b05c0af..1dc9f03 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ఏమీ లేవు"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ఏదీ వద్దు"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 654a6bc..45483da 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"ఖాతాలు"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"స్థానం"</string>
     <string name="account_settings_title" msgid="626177544686329806">"ఖాతాలు"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"భద్రత &amp; స్థానం"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"గుప్తీకరణ &amp; ఆధారాలు"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"ఫోన్ గుప్తీకరించబడింది"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"ఫోన్ గుప్తీకరించబడింది"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"లాక్ స్క్రీన్ ప్రాధాన్యతలు"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, సిమ్ కార్డు లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయి"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"నా స్థానాన్ని, స్క్రీన్ అన్‌లాక్‌ను, ఆధారాల నిల్వ లాక్‌ను సెట్ చేయండి"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"గోప్యత"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"నిర్వాహకులు నిలిపివేసారు"</string>
     <string name="security_status_title" msgid="5848766673665944640">"భద్రత స్థితి"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"వేలిముద్రలు నిర్వహిం."</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"దీనికి వేలిముద్రను ఉప."</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi స్కానింగ్ ఆఫ్ చేయబడినందున అందుబాటులో లేదు"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"సబ్‌నెట్ మాస్క్"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 చిరునామాలు"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"సేవ్ చేసిన నెట్‌వర్క్‌లు"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP సెట్టింగ్‌లు"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"ఈ వినియోగదారుకి Wi‑Fi అధునాతన సెట్టింగ్‌లు అందుబాటులో లేవు"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ఆఫ్‌లో ఉంది"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"ఫోన్ డాక్ చేయబడినప్పుడు మరియు/లేదా నిద్రావస్థలో ఉన్నప్పుడు ఏమి జరగాలో నియంత్రించడానికి, స్క్రీన్ సేవర్‌ను ఆన్ చేయండి."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"ఎప్పుడు ప్రారంభించాలి"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"ప్రస్తుత స్క్రీన్ సేవర్"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ఇప్పుడే ప్రారంభించు"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"సెట్టింగ్‌లు"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"స్వయంచాలక ప్రకాశం"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"సక్రియం చేయడానికి వేళ్లను తీసివేయండి"</string>
-    <string name="doze_title" msgid="5389406335828323273">"ఇన్‌కమింగ్ నోటిఫికేషన్ స్క్రీన్"</string>
+    <string name="doze_title" msgid="2259176504273878294">"యాంబియెంట్ డిస్‌ప్లే"</string>
     <string name="doze_summary" msgid="3846219936142814032">"మీరు నోటిఫికేషన్‌లను స్వీకరించినప్పుడు స్క్రీన్‌ను సక్రియం చేస్తుంది"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ఫాంట్ పరిమాణం"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"వచనాన్ని పెద్దదిగా లేదా చిన్నదిగా చేస్తుంది"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"సిస్టమ్"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>ని అన్వేషించండి"</string>
     <string name="storage_detail_dialog_other" msgid="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_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_wizard_init_title" msgid="5085400514028585772">"మీ <xliff:g id="NAME">^1</xliff:g> సెటప్ చేయండి"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"పోర్టబుల్ నిల్వగా ఉపయోగించు"</string>
@@ -1379,7 +1376,7 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"స్థానం మోడ్"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"స్థానాన్ని కనుగొనడానికి GPS, Wi‑Fi, బ్లూటూత్ లేదా మొబైల్ నెట్‌వర్క్‌లను ఉపయోగిస్తుంది"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"స్థానాన్ని కనుగొనడానికి Wi‑Fi, బ్లూటూత్ లేదా మొబైల్ నెట్‌వర్క్‌లను ఉపయోగిస్తుంది"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగించండి"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"స్థానాన్ని గుర్తించడానికి GPSని ఉపయోగిస్తుంది"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"స్కానింగ్"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi‑Fi స్కానింగ్"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"ఏ సమయంలోనైనా Wi‑Fi నెట్‌వర్క్‌లను గుర్తించడానికి సిస్టమ్ అనువర్తనాలు మరియు సేవలను అనుమతించడం ద్వారా స్థానాన్ని మెరుగుపరుస్తుంది."</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ఎప్పటికీ ఉపయోగించబడనిది)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"కీబోర్డ్ సత్వరమార్గాల సహాయం"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"అందుబాటులో ఉన్న సత్వరమార్గాలను ప్రదర్శిస్తుంది"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"డిఫాల్ట్"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"మౌస్/ట్రాక్‌ప్యాడ్"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"పాయింటర్ వేగం"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"గేమ్ కంట్రోలర్"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"వైబ్రేటర్‌ను ఉపయోగించు"</string>
@@ -1775,7 +1772,7 @@
     <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"మూడుసార్లు నొక్కడంతో మాగ్నిఫై చేయండి"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"బటన్‌తో మాగ్నిఫై చేయండి"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"బటన్‌తో &amp; మూడుసార్లు నొక్కడం ద్వారా మాగ్నిఫై చేయండి"</string>
-    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"దగ్గరకు జూమ్ చేయి"</string>
+    <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"దగ్గరకు జూమ్ చేస్తుంది"</string>
     <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>
@@ -1864,7 +1861,7 @@
     <string name="enable_service_pin_reason" msgid="7882035264853248228">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ పిన్‌ను నిర్ధారించడం అవసరం."</string>
     <string name="enable_service_password_reason" msgid="1224075277603097951">"<xliff:g id="SERVICE">%1$s</xliff:g>ని ఆన్‌ చేయడం వలన డేటా గుప్తీకరణ ప్రభావితమవుతుంది, కనుక మీరు మీ పాస్‌వర్డ్‌ను నిర్ధారించడం అవసరం."</string>
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"మీ చర్యలను గమనిస్తుంది"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"మీరు అనువర్తనంతో పరస్పర చర్య చేస్తున్నప్పుడు నోటిఫికేషన్‌లను స్వీకరించండి."</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"మీరు అనువర్తనంతో పరస్పర చర్య చేస్తున్నప్పుడు నోటిఫికేషన్‌లను స్వీకరిస్తుంది."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g>ను ఆపివేయాలా?"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"సరే నొక్కడం వలన <xliff:g id="SERVICE">%1$s</xliff:g> ఆపివేయబడుతుంది."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"సేవలు ఇన్‌స్టాల్ చేయబడలేదు"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ వినియోగం"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"స్క్రీన్ ఉపయోగం"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"మొబైల్ నెట్‌వర్క్ స్కానింగ్"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> క్రితం"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"పూర్తిగా ఛార్జ్ చేసిన సమయం (<xliff:g id="TIME">%1$s</xliff:g> క్రితం) నుండి అనువర్తన వినియోగం"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> క్రితం"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"పూర్తిగా ఛార్జ్ చేసిన (<xliff:g id="TIME">^1</xliff:g> క్రితం) తర్వాత అనువర్తన వినియోగం"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి స్క్రీన్ ఆన్‌లో ఉన్న మొత్తం సమయం"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"పూర్తిగా ఛార్జ్ చేసినప్పటి నుండి పరికర వినియోగం"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"అన్‌ప్లగ్ చేసినప్పటి నుండి బ్యాటరీ వినియోగం"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"కెమెరా"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"బ్లూటూత్"</string>
-    <string name="power_cell" msgid="6596471490976003056">"సెల్ స్టాండ్‌బై"</string>
+    <string name="power_cell" msgid="3392999761958982492">"మొబైల్ నెట్‌వర్క్ స్టాండ్‌బై"</string>
     <string name="power_phone" msgid="5392641106474567277">"వాయిస్ కాల్‌లు"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"టాబ్లెట్ నిష్క్రియం"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ఫోన్ నిష్క్రియం"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"బ్యాటరీ వినియోగం అనేది వినియోగించిన శక్తి గురించి తెలియజేసే సుమారు గణన, ఈ గణనలో ఏయే సోర్స్ ఎంత బ్యాటరీ వినియోగించదనే దాని గురించి పూర్తి సమాచారం ఉండదు. గణించిన సుమారు శక్తి వినియోగం మరియు బ్యాటరీ నుండి సంగ్రహించిన వాస్తవ శక్తి వినియోగం మధ్య ఉండే వ్యత్యాసమే పలురకాల్లో వినియోగించబడిన శక్తి వినియోగ గణన."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"అధిక గణన విద్యుత్ శక్తి వినియోగం"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s పాటు ఉపయోగించబడింది"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> పాటు ఉపయోగించబడింది"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> <xliff:g id="PERCENT">%1$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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"వాయిస్ ఇన్‌పుట్ &amp; అవుట్‌పుట్ సెట్టింగ్‌లు"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"వాయిస్ శోధన"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android కీబోర్డ్"</string>
-    <string name="voice_category" msgid="1430370497125803904">"ప్రసంగం"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"వాయిస్ ఇన్‌పుట్ సెట్టింగ్‌లు"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"వాయిస్ ఇన్‌పుట్"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"వాయిస్ ఇన్‌పుట్ సేవలు"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"నోటిఫికేషన్ వాల్యూమ్"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"ఫోన్ రింగ్‌టోన్"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"అనువర్తనం అందించిన ధ్వని"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"డిఫాల్ట్ నోటిఫికేషన్ ధ్వని"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"డిఫాల్ట్ అలారం ధ్వని"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"కాల్‌ల కోసం వైబ్రేట్ కూడా చేయి"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"ఇతర ధ్వనులు"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"ఎన్నడూ నోటిఫికేషన్‌లను చూపవద్దు"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"తక్కువ: ధ్వని చేయదు లేదా దృశ్యమాన అంతరాయం కలిగించదు"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"మధ్యస్థం: ధ్వని చేయదు"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"ఎక్కువ: ధ్వని చేస్తుంది"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"అత్యవసరం: ధ్వని చేస్తుంది మరియు స్క్రీన్‌పై పాప్అప్ చూపుతుంది"</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="6585849855452076626">"ధ్వనిని అనుమతించండి"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"శబ్దం చేయదు, వైబ్రేట్ చేయదు లేదా ప్రస్తుత స్క్రీన్‌పై కనిపించేలా ఈ నోటిఫికేషన్‌లను శీఘ్రంగా చూపదు."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"నోటిఫికేషన్ సహాయకం"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"అంతరాయం కలిగించవద్దు ప్రాప్యత"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ఇన్‌స్టాల్ చేసిన అనువర్తనాలేవీ అంతరాయం కలిగించవద్దు ప్రాప్యత అభ్యర్థించలేదు"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"అనువర్తనాలను లోడ్ చేస్తోంది..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android ఈ పరికరంలో ఈ అనువర్తనం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android ఈ పరికరంలో ఈ వర్గం యొక్క నోటిఫికేషన్‌లను కనిపించకుండా బ్లాక్ చేస్తోంది"</string>
     <string name="notification_channels" msgid="5346841743182627500">"వర్గాలు"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"ఇతరం"</string>
     <string name="no_channels" msgid="3077375508177744586">"ఈ అనువర్తనం ఏ నోటిఫికేషన్‌లను పోస్ట్ చేయలేదు"</string>
@@ -2969,18 +2970,16 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ప్రస్తుత దృగ్విన్యాసంలో ఉంచు"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"సురక్షిత ప్రారంభం"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"కొనసాగించండి"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందు మీ పిన్ అవసరమయ్యే విధంగా చేయడం ద్వారా దీనికి మరింత రక్షణను అందించవచ్చు. పరికరం ప్రారంభించబడే వరకు, ఇది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించలేదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాల్లోని డేటాను సంరక్షించడంలో ఇది సహాయకరంగా ఉంటుంది."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందు మీ నమూనా అవసరమయ్యే విధంగా చేయడం ద్వారా దీనికి మరింత రక్షణను అందించవచ్చు. పరికరం ప్రారంభించబడే వరకు, ఇది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించలేదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాల్లోని డేటాను సంరక్షించడంలో ఇది సహాయకరంగా ఉంటుంది."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందు మీ పాస్‌వర్డ్ అవసరమయ్యే విధంగా చేయడం ద్వారా దీనికి మరింత రక్షణను అందించవచ్చు. పరికరం ప్రారంభించబడే వరకు, ఇది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించలేదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాల్లోని డేటాను సంరక్షించడంలో ఇది సహాయకరంగా ఉంటుంది."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"మీ పరికరాన్ని అన్‌లాక్ చేయడం కోసం మీ వేలిముద్రను ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందు మీ పిన్‌ను నమోదు చేసేలా ఏర్పాటు చేయడం ద్వారా దీనికి మరింత సంరక్షణను అందించవచ్చు. పరికరం ప్రారంభమయ్యే వరకు, అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లు ఏవీ స్వీకరించబడవు.\n\nపోగొట్టుకున్న లేదా దొంగిలించబడిన పరికరాల్లోని డేటాను సంరక్షించడంలో ఇది సహాయపడుతుంది."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"మీ పరికరాన్ని అన్‌లాక్ చేయడం కోసం మీ వేలిముద్రను ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందు మీ నమూనాను నమోదు చేసేలా ఏర్పాటు చేయడం ద్వారా దీనికి మరింత సంరక్షణను అందించవచ్చు. పరికరం ప్రారంభమయ్యే వరకు, అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లు ఏవీ స్వీకరించబడవు.\n\nపోగొట్టుకున్న లేదా దొంగిలించబడిన పరికరాల్లోని డేటాను సంరక్షించడంలో ఇది సహాయపడుతుంది."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"మీ పరికరాన్ని అన్‌లాక్ చేయడం కోసం మీ వేలిముద్రను ఉపయోగించడంతో పాటు, మీరు ఈ పరికరం ప్రారంభం కావడానికి ముందు మీ పాస్‌వర్డ్‌ను నమోదు చేసేలా ఏర్పాటు చేయడం ద్వారా దీనికి మరింత సంరక్షణను అందించవచ్చు. పరికరం ప్రారంభమయ్యే వరకు, అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లు ఏవీ స్వీకరించబడవు.\n\nపోగొట్టుకున్న లేదా దొంగిలించబడిన పరికరాల్లోని డేటాను సంరక్షించడంలో ఇది సహాయపడుతుంది."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"పరికరాన్ని ప్రారంభించడానికి పిన్‌ అవసరం"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"పరికరాన్ని ప్రారంభించడానికి నమూనా అవసరం"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"పరికరాన్ని ప్రారంభించడానికి పాస్‌వర్డ్ అవసరం"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"వద్దు, ధన్యవాదాలు"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"వద్దు, ధన్యవాదాలు"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"వద్దు, ధన్యవాదాలు"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"ఈ పరికరాన్ని ప్రారంభించిన వెంటనే మీ పిన్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పిన్‌ని అడగాలా?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"ఈ పరికరాన్ని ప్రారంభించిన వెంటనే మీ నమూనాని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం నమూనాని అడగాలా?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"ఈ పరికరాన్ని ప్రారంభించిన వెంటనే మీ పాస్‌వర్డ్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పాస్‌వర్డ్‌ని అడగాలా?"</string>
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పిన్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పిన్‌ని అడగాలా&amp;gt;"</string>
+    <!-- unknown quoting pattern: original -1, translation 1 -->
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ నమూనాని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం నమూనాని అడగాలా&amp;gt;"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"మీ పరికరాన్ని అన్‌లాక్ చేయడానికి మీ వేలిముద్రను ఉపయోగించడంతో పాటు, దీనిని ప్రారంభించిన వెంటనే మీ పాస్‌వర్డ్‌ని అడిగే విధంగా సెట్ చేయడం ద్వారా మీరు దీనికి అదనపు రక్షణను అందించవచ్చు. పరికరాన్ని ప్రారంభించే వరకు, అది అలారాలతో సహా కాల్‌లు, సందేశాలు లేదా నోటిఫికేషన్‌లను స్వీకరించదు. \n\nకోల్పోయిన లేదా దొంగిలించబడిన పరికరాలలో ఉన్న డేటాని రక్షించడంలో ఇది సహాయపడుతుంది. మీ పరికరాన్ని ప్రారంభించడం కోసం పాస్‌వర్డ్‌ని అడగాలా&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"అవును"</string>
+    <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>
@@ -3204,9 +3203,9 @@
     <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_trusted" msgid="6857780460845250885">"అవును"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"వద్దు"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"అనువర్తన ఇన్‌స్టాలేషన్‌లను అనుమతించు"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"అనుమతించినవి"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"అనుమతించబడలేదు"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"కెమెరాకై పవర్ బటన్ రెండుసార్లు నొక్కండి"</string>
@@ -3392,7 +3391,8 @@
     <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_connected_summary" msgid="8733997010923307915">"దీనికి కనెక్ట్ చేయబడింది"</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>
@@ -3410,7 +3410,7 @@
     <string name="support_international_phone_summary" msgid="208231793637026927">"అంతర్జాతీయ ఛార్జీలు వర్తించవచ్చు"</string>
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"ఫోన్"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"చాట్"</string>
-    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"చిట్కాలు &amp; ఉపాయాలను కనుగొనండి"</string>
+    <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"చిట్కాలు &amp; ఉపాయాలను చూడండి"</string>
     <string name="support_help_feedback_title" msgid="693440287222186718">"సహాయాన్ని శోధించండి &amp; అభిప్రాయాన్ని పంపండి"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"మద్దతు విభాగాన్ని సంప్రదించండి"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"సైన్ ఇన్ చేయి"</string>
@@ -3454,7 +3454,7 @@
     <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_title" msgid="64716226816032800">"తక్షణమే కెమెరా మోడ్‌కు వెళ్లండి"</string>
     <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"కెమెరాను త్వరగా తెరవడానికి, పవర్ బటన్‌ను రెండుసార్లు నొక్కండి. ఏ స్క్రీన్‌పైన అయినా పని చేస్తుంది."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"కెమెరాను ముందు/వెనుకకు మార్చడం"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
@@ -3581,7 +3581,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g>కు నిలిపివేయబడింది)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"స్వీయ పూరింపు సేవ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"స్వయంచాలకం, పూరించు, స్వీయ పూరింపు"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>ని మీ స్వీయ పూరింపు అనువర్తనం వలె మార్చాలా? <xliff:g id="APP_NAME_1">%1$s</xliff:g> మీ స్క్రీన్‌ని చదవగలదు మరియు ఇతర అనువర్తనాలలో ఉన్న ఫీల్డ్‌లను పూరించగలదు."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ఈ అనువర్తనాన్ని మీరు విశ్వసిస్తున్నట్లు నిర్ధారించండి&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; మీ స్క్రీన్‌పై ఉన్నవాటిని పరిగణనలోకి తీసుకొని వేటివేటిని స్వయంచాలకంగా పూరించాలో నిశ్చయిస్తుంది."</string>
     <string name="device_theme" msgid="4571803018917608588">"పరికర థీమ్"</string>
     <string name="default_theme" msgid="7085644992078579076">"డిఫాల్ట్"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"నిల్వ నిర్వాహికి: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index e35304b..3794809 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"ไม่มี"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"ไม่มี"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 216789a..2fdca40 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"บัญชี"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"ตำแหน่ง"</string>
     <string name="account_settings_title" msgid="626177544686329806">"บัญชี"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"ความปลอดภัยและตำแหน่ง"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"การเข้ารหัสลับและข้อมูลรับรอง"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"โทรศัพท์ที่เข้ารหัส"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"โทรศัพท์ที่เข้ารหัส"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"ค่ากำหนดหน้าจอล็อก"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"ความเป็นส่วนตัว"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"ปิดใช้โดยผู้ดูแลระบบ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"สถานะความปลอดภัย"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"จัดการลายนิ้วมือ"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"ใช้ลายนิ้วมือเพื่อ"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"ไม่พร้อมใช้งานเพราะการสแกนหา Wi‑Fi ปิดอยู่"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"หลีกเลี่ยงการเชื่อมต่อที่สัญญาณไม่แรงพอ"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"อย่าใช้เครือข่าย WiFi หากไม่มีการเชื่อมต่ออินเทอร์เน็ตที่ดีเพียงพอ"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"ใช้เครือข่ายที่มีการเชื่อมต่ออินเทอร์เน็ตสัญญาณแรงเท่านั้น"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"กำหนดค่า 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"ซับเน็ตมาสก์"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"ที่อยู่ IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"เครือข่ายที่บันทึก"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"การตั้งค่า IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"การตั้งค่า Wi‑Fi ขั้นสูงไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"ปิด"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"หากต้องการควบคุมสิ่งที่เกิดขึ้นขณะที่โทรศัพท์อยู่บนแท่นชาร์จและ/หรืออยู่ในโหมดสลีป ให้เปิดโปรแกรมรักษาหน้าจอ"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"เริ่มเมื่อใด"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"โปรแกรมรักษาหน้าจอในปัจจุบัน"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"เริ่มเลย"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"การตั้งค่า"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"ยกขึ้นเพื่อเวก"</string>
-    <string name="doze_title" msgid="5389406335828323273">"หน้าจอการแจ้งเตือนเข้ามาใหม่"</string>
+    <string name="doze_title" msgid="2259176504273878294">"หน้าจอแบบแอมเบียนท์"</string>
     <string name="doze_summary" msgid="3846219936142814032">"เปิดหน้าจอเมื่อได้รับการแจ้งเตือน"</string>
     <string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"ทำให้ข้อความมีขนาดใหญ่ขึ้นหรือเล็กลง"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(ไม่เคยใช้)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"เครื่องมือช่วยเหลือแป้นพิมพ์ลัด"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"แสดงทางลัดที่มี"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ค่าเริ่มต้น"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"เมาส์/แทร็กแพด"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"ความเร็วของตัวชี้"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"อุปกรณ์ควบคุมเกม"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"ใช้การสั่นเตือน"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"การใช้งานหน้าจอตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"การใช้งานหน้าจอ"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"การสแกนเครือข่ายมือถือ"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> ที่ผ่านมา"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"การใช้งานแอปตั้งแต่ชาร์จจนเต็ม (<xliff:g id="TIME">%1$s</xliff:g> ที่ผ่านมา)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> ที่ผ่านมา"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"การใช้งานแอปตั้งแต่ชาร์จจนเต็ม (<xliff:g id="TIME">^1</xliff:g> ที่ผ่านมา)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"ระยะเวลาที่หน้าจอเปิดตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"การใช้งานอุปกรณ์ตั้งแต่ชาร์จจนเต็ม"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"การใช้แบตเตอรี่ตั้งแต่ถอดปลั๊ก"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"กล้องถ่ายรูป"</string>
     <string name="power_wifi" msgid="1135085252964054957">"WiFi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"บลูทูธ"</string>
-    <string name="power_cell" msgid="6596471490976003056">"สแตนด์บายเครือข่าย"</string>
+    <string name="power_cell" msgid="3392999761958982492">"สแตนด์บายเครือข่ายมือถือ"</string>
     <string name="power_phone" msgid="5392641106474567277">"การโทรด้วยเสียง"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ไม่มีการใช้งานแท็บเล็ต"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"ไม่มีการใช้งานโทรศัพท์"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"การใช้แบตเตอรี่เป็นการประมาณการใช้พลังงาน และไม่ได้รวมทุกสิ่งที่ใช้แบตเตอรี่ เบ็ดเตล็ดต่างจากการคำนวณการใช้พลังงานโดยประมาณและการใช้พลังงานจริงจากแบตเตอรี่"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"การใช้พลังงานที่คำนวณมากเกินไป"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"ใช้มานาน %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"ใช้ไป <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> ใช้ไป <xliff:g id="PERCENT">%1$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>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"การตั้งค่าอินพุตและเอาต์พุตเสียง"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ค้นหาด้วยเสียง"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"แป้นพิมพ์ Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"คำพูด"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"การตั้งค่าการป้อนข้อมูลด้วยเสียง"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"การป้อนข้อมูลด้วยเสียง"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"บริการป้อนข้อมูลด้วยเสียง"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"ระดับเสียงของการแจ้งเตือน"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้า"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"เสียงแจ้งเตือนเริ่มต้น"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"เสียงจากแอป"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"เสียงแจ้งเตือนเริ่มต้น"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"เสียงปลุกเริ่มต้น"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"สั่นเมื่อมีสายเรียกเข้าด้วย"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"เสียงอื่นๆ"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"ไม่ต้องแสดงการแจ้งเตือน"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"ต่ำ: ไม่มีภาพหรือเสียงรบกวน"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"กลาง: ไม่มีเสียง"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"สูง: ส่งเสียง"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"ด่วน: ส่งเสียงและแสดงบนหน้าจอ"</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="6585849855452076626">"อนุญาตให้ส่งเสียง"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"ไม่ส่งเสียงเตือน สั่น หรือแสดงชั่วครู่ในมุมมองหน้าจอปัจจุบันสำหรับการแจ้งเตือนเหล่านี้"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"ผู้ช่วยการแจ้งเตือน"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"การเข้าถึง \"ห้ามรบกวน\""</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"ไม่มีแอปที่ติดตั้งใดๆ ส่งคำขอสิทธิ์เข้าถึง \"ห้ามรบกวน\""</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android กำลังบล็อกไม่ให้การแจ้งเตือนของแอปนี้ปรากฏในอุปกรณ์นี้"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android กำลังบล็อกไม่ให้การแจ้งเตือนหมวดหมู่นี้ปรากฏในอุปกรณ์นี้"</string>
     <string name="notification_channels" msgid="5346841743182627500">"หมวดหมู่"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"อื่นๆ"</string>
     <string name="no_channels" msgid="3077375508177744586">"แอปนี้ไม่ได้โพสต์การแจ้งเตือนใดๆ"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"ใช้การวางแนวเดิม"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"รักษาความปลอดภัยเมื่อเปิดขึ้น"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"ต่อไป"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"นอกจากนี้คุณยังสามารถปกป้องอุปกรณ์เครื่องนี้เพิ่มเติมโดยกำหนดให้ต้องป้อน PIN ก่อนที่อุปกรณ์จะเริ่มต้นขึ้น อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงเสียงเตือนได้จนกว่าอุปกรณ์จะเริ่มต้นขึ้น \n\nซึ่งจะช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"นอกจากนี้คุณยังสามารถปกป้องอุปกรณ์เครื่องนี้เพิ่มเติมโดยกำหนดให้ต้องป้อนรูปแบบก่อนที่อุปกรณ์จะเริ่มต้นขึ้น อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงเสียงเตือนได้จนกว่าอุปกรณ์จะเริ่มต้นขึ้น \n\nซึ่งจะช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"นอกจากนี้คุณยังสามารถปกป้องอุปกรณ์เครื่องนี้เพิ่มเติมโดยกำหนดให้ต้องป้อนรหัสผ่านก่อนที่อุปกรณ์จะเริ่มต้นขึ้น อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือน รวมถึงเสียงเตือนได้จนกว่าอุปกรณ์จะเริ่มต้นขึ้น \n\nซึ่งจะช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์แล้ว คุณสามารถปกป้องอุปกรณ์ได้มากขึ้นโดยให้ป้อน PIN ก่อนที่เครื่องจะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับโทรศัพท์ ข้อความ การแจ้งเตือน รวมถึงการปลุกได้จนกว่าอุปกรณ์จะเริ่มทำงาน\n\nวิธีนี้จะช่วยปกป้องข้อมูลหากอุปกรณ์สูญหายหรือถูกขโมย"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์แล้ว คุณสามารถปกป้องอุปกรณ์ได้มากขึ้นโดยให้ป้อนรูปแบบก่อนที่เครื่องจะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับโทรศัพท์ ข้อความ การแจ้งเตือน รวมถึงการปลุกได้จนกว่าอุปกรณ์จะเริ่มทำงาน\n\nวิธีนี้จะช่วยปกป้องข้อมูลหากอุปกรณ์สูญหายหรือถูกขโมย"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์แล้ว คุณสามารถปกป้องอุปกรณ์นี้ได้มากขึ้นโดยให้ป้อนรหัสผ่านก่อนที่เครื่องจะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับโทรศัพท์ ข้อความ การแจ้งเตือน รวมถึงการปลุกได้จนกว่าอุปกรณ์จะเริ่มทำงาน\n\nวิธีนี้จะช่วยปกป้องข้อมูลหากอุปกรณ์สูญหายหรือถูกขโมย"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"ต้องมี PIN เพื่อเริ่มใช้งานอุปกรณ์"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"ต้องมีรูปแบบเพื่อเริ่มใช้งานอุปกรณ์"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"ต้องมีรหัสผ่านเพื่อเริ่มใช้งานอุปกรณ์"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"ไม่เป็นไร"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"ไม่เป็นไร"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"ไม่เป็นไร"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"คุณสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ป้อน PIN ก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน \n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ป้อน PIN เพื่อเริ่มต้นอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"คุณสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ใช้รูปแบบก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน \n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ใช้รูปแบบเพื่อเริ่มต้นอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"คุณสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ป้อนรหัสผ่านก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน \n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ป้อนรหัสผ่านเพื่อเริ่มต้นอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์ คุณยังสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ป้อน PIN ก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน\n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ป้อน PIN เพื่อเริ่มต้นอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์ คุณยังสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ใช้รูปแบบก่อนที่อุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน\n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ใช้รูปแบบเพื่อเริ่มต้นอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"นอกเหนือจากการใช้ลายนิ้วมือเพื่อปลดล็อกอุปกรณ์ คุณยังสามารถปกป้องอุปกรณ์นี้เพิ่มเติมโดยกำหนดให้ป้อนรหัสผ่านก่อนอุปกรณ์จะเริ่มทำงาน อุปกรณ์จะไม่สามารถรับสาย ข้อความ หรือการแจ้งเตือนซึ่งรวมถึงการปลุก จนกว่าจะเริ่มทำงาน\n\nวิธีนี้ช่วยปกป้องข้อมูลในอุปกรณ์ที่สูญหายหรือถูกขโมย กำหนดให้ป้อนรหัสผ่านเพื่อเริ่มต้นอุปกรณ์ไหม"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ใช่"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"ไม่"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"ต้องใช้ PIN ใช่ไหม"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"ต้องใช้รูปแบบใช่ไหม"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"ต้องใช้รหัสผ่านใช่ไหม"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"ใช่"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"ไม่"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"อนุญาตให้ติดตั้งแอป"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"อนุญาต"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"ไม่อนุญาต"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"อนุญาตจากแหล่งที่มานี้"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"บิด 2 ครั้งเพื่อเปิดกล้อง"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"เปิดแอปกล้องถ่ายรูปโดยบิดข้อมือ 2 ครั้ง"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"กดปุ่มเปิด/ปิด 2 ครั้งสำหรับกล้อง"</string>
@@ -3214,7 +3211,7 @@
     <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_summary" msgid="6445488991799015407">"ทำให้รายการบนหน้าจอมีขนาดเล็กลงหรือใหญ่ขึ้น แอปบางส่วนบนหน้าจออาจเปลี่ยนตำแหน่ง"</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>
     <string name="screen_zoom_make_larger_desc" msgid="2236171043607896594">"ทำให้ใหญ่ขึ้น"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"เชื่อมต่อกับ"</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>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(ปิดใช้อยู่สำหรับ <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"บริการป้อนอัตโนมัติ"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"ป้อน, อัตโนมัติ, ป้อนอัตโนมัติ"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"ทำให้ <xliff:g id="APP_NAME_0">%1$s</xliff:g> เป็นแอปการป้อนอัตโนมัติของคุณไหม <xliff:g id="APP_NAME_1">%1$s</xliff:g> จะสามารถอ่านหน้าจอและกรอกข้อมูลในช่องของแอปอื่นๆ"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;ตรวจดูว่าคุณเชื่อถือแอปนี้ได้&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google ป้อนอัตโนมัติ&gt;%1$s&lt;/xliff:g&gt; ใช้สิ่งที่อยู่บนหน้าจอเพื่อดูว่าจะป้อนข้อมูลใดโดยอัตโนมัติได้บ้าง"</string>
     <string name="device_theme" msgid="4571803018917608588">"ธีมอุปกรณ์"</string>
     <string name="default_theme" msgid="7085644992078579076">"ค่าเริ่มต้น"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"ตัวจัดการพื้นที่เก็บข้อมูล: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 43bb0db..0b9b2f0 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Wala"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Wala"</item>
     <item msgid="6189918678874123056">"PAP"</item>
@@ -233,7 +235,7 @@
     <item msgid="2681427309183221543">"GID"</item>
   </string-array>
   <string-array name="app_install_location_entries">
-    <item msgid="8151497958991952759">"Imbakan ng panloob na device"</item>
+    <item msgid="8151497958991952759">"Storage ng panloob na device"</item>
     <item msgid="3738430123799803530">"Naaalis na SD card"</item>
     <item msgid="4498124044785815005">"Hayaang magpasya ang system"</item>
   </string-array>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 4bac45f..5519575 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -72,9 +72,9 @@
     <string name="radioInfo_display_asu" msgid="1422248392727818082">"asu"</string>
     <string name="radioInfo_lac" msgid="8415219164758307156">"LAC"</string>
     <string name="radioInfo_cid" msgid="4362599198392643138">"CID"</string>
-    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"I-unmount imbakan na USB"</string>
+    <string name="sdcard_unmount" product="nosdcard" msgid="6325292633327972272">"I-unmount storage na USB"</string>
     <string name="sdcard_unmount" product="default" msgid="3364184561355611897">"I-unmount ang SD card"</string>
-    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Burahin imbakan na USB"</string>
+    <string name="sdcard_format" product="nosdcard" msgid="6285310523155166716">"Burahin storage na USB"</string>
     <string name="sdcard_format" product="default" msgid="6713185532039187532">"Burahin ang SD card"</string>
     <string name="preview_pager_content_description" msgid="8926235999291761243">"I-preview"</string>
     <string name="preview_page_indicator_content_description" msgid="4821343428913401264">"Preview, page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> ng <xliff:g id="NUM_PAGES">%2$d</xliff:g>"</string>
@@ -88,7 +88,7 @@
     <string name="font_size_preview_text_subtitle" msgid="4231671528173110093">"Kabanata 11: The Wonderful Emerald City of Oz"</string>
     <string name="font_size_preview_text_body" msgid="2846183528684496723">"Kahit na pinoprotektahan ng kulay berdeng salamin ang kanilang mga mata, nasilaw si Dorothy at ang kanyang mga kaibigan sa kislap ng kamangha-manghang Lungsod. Nakalinya sa kalsada ang magagandang bahay na gawa sa berdeng marmol at punung-puno ng mga kumikinang na esmeralda. Naglakad sila sa kalsadang gawa sa parehong berdeng marmol, may mga esmeraldang nakalagay nang magkakalapit at nakapila kung saan magkadikit ang mga bloke, at kumukutikutitap ang mga ito sa ningning ng araw. Gawa sa kulay berdeng salamin ang mga bintana; may tint na berde maging ang langit sa itaas ng Lungsod, at kulay berde ang mga sinag ng araw. \n\nMaraming tao roon, mga lalaki, babae at bata, naglalakad-lakad, at nakasuot lahat sila ng mga damit na kulay berde at kulay berde rin ang mga balat nila. Namamangha nilang tiningnan si Dorothy at ang mga kasama niyang kakaiba ang pagkakasari-sari, at tumakbo palayo at nagtago sa likod ng mga nanay nila ang mga bata noong nakita nila ang Leon; ngunit walang kumausap sa kanila. Maraming tindahan ang nakatayo sa kalsada, at nakita ni Dorothy na kulay berde ang lahat ng paninda. Berdeng kendi at berdeng pop-corn ang inaalok para itinda, pati na rin ang iba\'t ibang uri ng mga berdeng sapatos, berdeng sumbrero at berdeng damit. Sa isang lugar, may lalaking nagtitinda ng berdeng limonada, at kapag bumibili nito ang mga bata, nakikita ni Dorothy na berdeng barya ang ipinambabayad nila. \n\nTila walang mga kabayo o anumang uri ng hayop doon; dinadala ng mga lalaki ang mga bagay-bagay sa maliliit na berdeng kariton, na itinutulak nila sa kanilang harapan. Mukhang masaya, kuntento at masagana ang lahat."</string>
     <string name="font_size_save" msgid="3450855718056759095">"OK"</string>
-    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Imbakan na USB"</string>
+    <string name="sdcard_setting" product="nosdcard" msgid="8281011784066476192">"Storage na USB"</string>
     <string name="sdcard_setting" product="default" msgid="5922637503871474866">"SD card"</string>
     <string name="bluetooth" msgid="5549625000628014477">"Bluetooth"</string>
     <string name="bluetooth_is_discoverable" msgid="8373421452106840526">"Makikita ng lahat ng mga kalapit na device ng Bluetooth (<xliff:g id="DISCOVERABLE_TIME_PERIOD">%1$s</xliff:g>)"</string>
@@ -259,7 +259,7 @@
     <string name="display_label" msgid="8074070940506840792">"Screen"</string>
     <string name="phone_info_label" product="tablet" msgid="7820855350955963628">"Impormasyon ng tablet"</string>
     <string name="phone_info_label" product="default" msgid="2127552523124277664">"Impormasyon ng telepono"</string>
-    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Imbakan na USB"</string>
+    <string name="sd_card_settings_label" product="nosdcard" msgid="8101475181301178428">"Storage na USB"</string>
     <string name="sd_card_settings_label" product="default" msgid="5743100901106177102">"SD card"</string>
     <string name="proxy_settings_label" msgid="3271174136184391743">"Mga setting ng proxy"</string>
     <string name="cancel" msgid="6859253417269739139">"Kanselahin"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Mga Account"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Lokasyon"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Mga Account"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Seguridad at Lokasyon"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Pag-encrypt at mga kredensyal"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Naka-encrypt ang telepono"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Naka-encrypt ang telepono"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Mga kagustuhan sa lock screen"</string>
-    <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
-    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
+    <string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng storage ng kredensyal"</string>
+    <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng storage ng kredensyal"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Privacy"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Na-disable ng admin"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Status ng seguridad"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Lock ng screen, fingerprint"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Lock ng screen"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Fingerprint"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Pamahalaan fingerprint"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Gamit fingerprint para"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Mag-abiso kapag may available na pampublikong network na may mataas na kalidad"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Awtomatikong i-on ang Wi‑Fi"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Mag-o-on muli ang Wi‑Fi kapag malapit sa mga naka-save na network na may mataas na kalidad, gaya ng iyong home network"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Hindi available dahil naka-off ang pag-scan para sa Wi‑Fi"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Iwasan ang mahihinang koneksyon"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Huwag gumamit ng Wi-Fi network maliban kung mayroon itong mahusay na koneksyon sa Internet"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Gamit lang ng network na may maayos na koneksyon sa Internet"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"I-configure ang 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Subnet mask"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Mga IPv6 address"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Mga saved network"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Mga setting ng IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Hindi available para sa user na ito ang mga advanced na setting ng Wi‑Fi"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Naka-off"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Upang makontrol kung ano ang mangyayari kapag naka-dock o naka-sleep ang telepono, i-on ang screen saver."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Kailan magsisimula"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Kasalukuyang screen saver"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Magsimula ngayon"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Mga Setting"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Angatin upang paganahin"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Screen ng papasok notification"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ambient na display"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Paganahin ang screen kapag nakatanggap ka ng mga notification"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Palakihin o paliitin ang text"</string>
@@ -1086,8 +1083,8 @@
     <string name="storage_settings" msgid="4211799979832404953">"Storage"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Storage"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"Mga setting ng storage"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"I-unmount ang imbakan na USB, tingnan ang available na imbakan"</string>
-    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"I-unmount ang SD card, tingnan ang available na imbakan"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"I-unmount ang storage na USB, tingnan ang available na storage"</string>
+    <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"I-unmount ang SD card, tingnan ang available na storage"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"Numero ng aking telepono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -1109,7 +1106,7 @@
     <string name="status_up_time" msgid="7294859476816760399">"Oras na naka-up"</string>
     <string name="status_awake_time" msgid="2393949909051183652">"Oras ng gising"</string>
     <string name="internal_memory" msgid="9129595691484260784">"Panloob na storage"</string>
-    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Imbakan na USB"</string>
+    <string name="sd_memory" product="nosdcard" msgid="2510246194083052841">"Storage na USB"</string>
     <string name="sd_memory" product="default" msgid="151871913888051515">"SD card"</string>
     <string name="memory_available" msgid="5052397223077021181">"Available"</string>
     <string name="memory_available_read_only" msgid="6497534390167920206">"Available (read-only)"</string>
@@ -1122,19 +1119,19 @@
     <string name="memory_music_usage" msgid="1363785144783011606">"Audio (musika, mga ringtone, mga podcast, atbp.)"</string>
     <string name="memory_media_misc_usage" msgid="6094866738586451683">"Iba pang mga file"</string>
     <string name="memory_media_cache_usage" msgid="6704293333141177910">"Naka-cache na data"</string>
-    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount nabahagi imbakan"</string>
+    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"Unmount nabahagi storage"</string>
     <string name="sd_eject" product="default" msgid="6915293408836853020">"I-unmount ang SD card"</string>
     <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"I-unmount panloob USB storage"</string>
     <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"I-unmount ang SD card upang maaari mo itong ligtas na maalis"</string>
-    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Ipasok imbakan na USB sa pag-mount"</string>
+    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"Ipasok storage na USB sa pag-mount"</string>
     <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"Maglagay ng SD card para sa pag-mount"</string>
-    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"I-mount imbakan na USB"</string>
+    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"I-mount storage na USB"</string>
     <string name="sd_mount" product="default" msgid="5940523765187704135">"I-mount ang SD card"</string>
     <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>
     <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>
-    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Burahin imbakan na USB"</string>
+    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"Burahin storage na USB"</string>
     <string name="sd_format" product="default" msgid="2576054280507119870">"Burahin ang SD card"</string>
-    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Buburahin lahat ng data sa panloob na imbakan na USB, gaya ng musika at larawan"</string>
+    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"Buburahin lahat ng data sa panloob na storage na USB, gaya ng musika at larawan"</string>
     <string name="sd_format_summary" product="default" msgid="212703692181793109">"Binubura ang lahat ng data sa SD card, gaya ng mga musika at larawan"</string>
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"I-clear ang naka-cache na data?"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"Iki-clear nito ang naka-cache na data para sa lahat ng apps."</string>
@@ -1147,7 +1144,7 @@
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"Hindi ma-unmount ang USB storage. Subukang muli sa ibang pagkakataon."</string>
     <string name="dlg_error_unmount_text" product="default" msgid="3500976899159848422">"Hindi ma-unmount ang SD card. Subukang muli sa ibang pagkakataon."</string>
-    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Maa-unmount ang imbakan na USB."</string>
+    <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"Maa-unmount ang storage na USB."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Maa-unmount ang SD card."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Pag-unmount"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Nagaganap ang pag-unmount"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"System"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"I-explore ang <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Kasama sa iba ang mga nakabahaging file na na-save ng mga app, file na na-download mula sa Internet o Bluetooth, file ng Android at iba pa. \n\nUpang makita ang mga nakikitang content ng <xliff:g id="NAME">^1</xliff:g> na ito, i-tap ang I-explore."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Kasama sa system ang mga file na ginagamit upang patakbuhin ang bersyon ng Android na <xliff:g id="VERSION">%s</xliff:g>"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Kasama sa system ang mga file na ginagamit para patakbuhin ang bersyon <xliff:g id="VERSION">%s</xliff:g> ng Android"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"Maaaring may mga na-save si <xliff:g id="USER_0">^1</xliff:g> na larawan, musika, app, o iba pang data, na gumagamit ng <xliff:g id="SIZE">^2</xliff:g> ng storage. \n\nUpang tingnan ang mga detalye, lumipat sa <xliff:g id="USER_1">^1</xliff:g>."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"I-set up ang iyong <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Gamitin bilang portable na storage"</string>
@@ -1280,7 +1277,7 @@
     <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">"Network settings reset"</string>
+    <string name="reset_network_title" msgid="4557113742173895074">"I-reset, network setting"</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>
@@ -1301,7 +1298,7 @@
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"Musika"</li>\n<li>"Mga Larawan"</li>\n<li>"Ibang data ng user"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"Upang i-clear ang musika, mga larawan at iba pang data ng user, kailangang mabura ang "<b>"USB storage"</b>"."</string>
     <string name="master_clear_desc_erase_external_storage" product="default" msgid="4801026652617377093">\n\n"Upang i-clear ang musika, mga larawan at ibang data ng user, kailangang mabura ang "<b>"SD card"</b>"."</string>
-    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Burahin ang imbakan na USB"</string>
+    <string name="erase_external_storage" product="nosdcard" msgid="969364037450286809">"Burahin ang storage na USB"</string>
     <string name="erase_external_storage" product="default" msgid="1397239046334307625">"Burahin ang SD card"</string>
     <string name="erase_external_storage_description" product="nosdcard" msgid="4728558173931599429">"Burahin ang lahat ng data sa panloob na USB storage, gaya ng musika o mga larawan"</string>
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"Burahin ang lahat ng data sa SD card, gaya ng musika o mga larawan"</string>
@@ -1513,7 +1510,7 @@
     </plurals>
     <string name="clear_uri_btn_text" msgid="8575655132961012158">"I-clear ang access"</string>
     <string name="controls_label" msgid="7611113077086853799">"Mga Kontrol"</string>
-    <string name="force_stop" msgid="7435006169872876756">"Sapilitang pagtigil"</string>
+    <string name="force_stop" msgid="7435006169872876756">"Sapilitang itigil"</string>
     <string name="total_size_label" msgid="1048676419552557254">"Kabuuan"</string>
     <string name="application_size_label" msgid="7376689739076506885">"Laki ng app"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB storage na app"</string>
@@ -1551,16 +1548,16 @@
     <string name="filter_apps_disabled" msgid="5862632369555319938">"Mga naka-disable na app"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"Na-download"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Tumatakbo"</string>
-    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Imbakan na USB"</string>
+    <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"Storage na USB"</string>
     <string name="filter_apps_onsdcard" product="default" msgid="1477351142334784771">"Sa SD card"</string>
     <string name="disabled" msgid="9206776641295849915">"Naka-disable"</string>
     <string name="not_installed" msgid="2797554494953450291">"Hindi naka-install para sa user na ito"</string>
     <string name="installed" msgid="3070865169422600098">"Naka-install"</string>
-    <string name="no_applications" msgid="7336588977497084921">"Walang apps."</string>
+    <string name="no_applications" msgid="7336588977497084921">"Walang app."</string>
     <string name="internal_storage" msgid="1584700623164275282">"Panloob na storage"</string>
     <string name="internal_storage_sentence" msgid="889098931914857143">"internal storage"</string>
-    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Imbakan na USB"</string>
-    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card imbakan"</string>
+    <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"Storage na USB"</string>
+    <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD card storage"</string>
     <string name="recompute_size" msgid="7722567982831691718">"Muling kino-compute ang laki…"</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"I-delete ang data ng app?"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"Permanenteng made-delete ang lahat ng data ng app na ito. Kabilang dito ang lahat ng file, setting, account, database, atbp."</string>
@@ -1589,7 +1586,7 @@
     <string name="move_app" msgid="5042838441401731346">"Ilipat"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"Ilipat sa tablet"</string>
     <string name="move_app_to_internal" product="default" msgid="3895430471913858185">"Ilipat sa telepono"</string>
-    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Ilipat sa imbakan na USB"</string>
+    <string name="move_app_to_sdcard" product="nosdcard" msgid="4350451696315265420">"Ilipat sa storage na USB"</string>
     <string name="move_app_to_sdcard" product="default" msgid="1143379049903056407">"Lumipat sa SD card"</string>
     <string name="moving" msgid="6431016143218876491">"Paglilipat"</string>
     <string name="another_migration_already_in_progress" msgid="7817354268848365487">"Mayroon nang kasalukuyang isinasagawang isa pang paglipat."</string>
@@ -1599,7 +1596,7 @@
     <string name="invalid_location" msgid="4354595459063675191">"Hindi wasto ang lokasyon ng pag-install."</string>
     <string name="system_package" msgid="1352722848400644991">"Hindi ma-install ang mga pag-update sa system sa panlabas na media."</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Hindi maaaring i-install sa external na media ang app ng admin ng device"</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"Sapilitang pagtigil?"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"Sapilitang itigil?"</string>
     <string name="force_stop_dlg_text" msgid="7208364204467835578">"Kung sapilitan mong ititigil ang isang app, maaari itong kumilos nang hindi tama."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Hindi mailipat ang app. <xliff:g id="REASON">%1$s</xliff:g>"</string>
@@ -1615,11 +1612,12 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Store"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Mga detalye ng app"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Na-install ang app mula sa <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Higit pang impormasyon sa <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Pagpapagana ng app"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Gumagana"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Hindi pa nagamit)"</string>
     <string name="no_default_apps" msgid="2915315663141025400">"Walang default na Apps."</string>
-    <string name="storageuse_settings_title" msgid="5657014373502630403">"Paggamit ng imbakan"</string>
+    <string name="storageuse_settings_title" msgid="5657014373502630403">"Paggamit ng storage"</string>
     <string name="storageuse_settings_summary" msgid="3748286507165697834">"Tingnan ang storage na ginagamit ng apps"</string>
     <string name="service_restarting" msgid="2242747937372354306">"Pag-restart"</string>
     <string name="cached" msgid="1059590879740175019">"Naka-cache na proseso sa background"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Helper sa mga keyboard shortcut"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Ipakita ang mga available na shortcut"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Default"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Mouse/trackpad"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Bilis ng pointer"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Game Controller"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Gamitin ang vibrator"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Paggamit ng screen mula noong napuno ang baterya"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Pagkonsumo ng screen"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Pag-scan ng mobile network"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> na ang nakalipas"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Paggamit ng app mula noong napuno ang baterya (<xliff:g id="TIME">%1$s</xliff:g> na ang nakalipas)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> na ang nakalipas"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Paggamit ng app mula noong napuno ang baterya (<xliff:g id="TIME">^1</xliff:g> na ang nakalipas)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Haba ng oras na naka-on ang screen mula noong napuno ang baterya"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Paggamit ng device mula noong napuno ang baterya"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Paggamit ng baterya mula nang hindi nakasaksak"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Camera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Standby ng cell"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Naka-standby ang mobile network"</string>
     <string name="power_phone" msgid="5392641106474567277">"Mga boses ng tawag"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Idle ang tablet"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Idle ang telepono"</string>
@@ -1978,7 +1975,7 @@
     <string name="usage_type_total_battery_capacity" msgid="3798285287848675346">"Kabuuang kakayahan ng baterya"</string>
     <string name="usage_type_computed_power" msgid="5862792259009981479">"Nakalkulang paggamit ng power"</string>
     <string name="usage_type_actual_power" msgid="7047814738685578335">"Naobserbahang paggamit ng power"</string>
-    <string name="battery_action_stop" msgid="649958863744041872">"Sapilitang pagtigil"</string>
+    <string name="battery_action_stop" msgid="649958863744041872">"Sapilitang itigil"</string>
     <string name="battery_action_app_details" msgid="7861051816778419018">"Impormasyon ng app"</string>
     <string name="battery_action_app_settings" msgid="4570481408106287454">"Mga setting ng app"</string>
     <string name="battery_action_display" msgid="7338551244519110831">"Mga setting ng screen"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Ang paggamit ng baterya ay pagtataya ng paggamit ng power at hindi nito sinasama ang bawat pinagmumulan ng pagka-ubos ng baterya. Ang Miscellaneous ang diperensya sa pagitan ng nakalkulang tinatayang paggamit ng power at ng aktwal na naoobserbahang pagkaubos ng baterya."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sobrang nakalkulang paggamit ng power"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> (na) mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Ginamit nang %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Ginamit nang <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> ang ginagamit ng <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> ng kabuuang baterya"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Breakdown mula noong huling napuno ang baterya"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Pag-input ng boses &amp; mga setting ng output"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Paghahanap gamit ang boses"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android keyboard"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Pananalita"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Mga setting ng input na boses"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Input na boses"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Mga serbisyo ng input na boses"</string>
@@ -2140,11 +2136,11 @@
     <string name="credentials_reset_hint" msgid="6297256880896133631">"Alisin ang lahat ng content"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"Dapat na may hindi bababa sa 8 character ang password."</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"Hindi tamang password."</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"Hindi tamang password. Mayroon kang isa pang pagkakataon bago mabura ang imbakan ng kredensyal."</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Hindi tamang password. Mayroon kang <xliff:g id="NUMBER">%1$d</xliff:g> pang pagkakataon bago mabura ang imbakan ng kredensyal."</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"Hindi tamang password. Mayroon kang isa pang pagkakataon bago mabura ang storage ng kredensyal."</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"Hindi tamang password. Mayroon kang <xliff:g id="NUMBER">%1$d</xliff:g> pang pagkakataon bago mabura ang storage ng kredensyal."</string>
     <string name="credentials_erased" msgid="2907836028586342969">"Binura: storage ng kredensyal."</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"Di mbura storage ng krednsyal."</string>
-    <string name="credentials_enabled" msgid="7588607413349978930">"Pinagana ang imbakan ng kredensyal."</string>
+    <string name="credentials_enabled" msgid="7588607413349978930">"Pinagana ang storage ng kredensyal."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kailangan mong magtakda ng PIN o password ng lock screen bago mo magamit ang storage ng kredensyal."</string>
     <string name="usage_access_title" msgid="332333405495457839">"App na may access sa paggamit"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Tonong pang-emergency"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume ng notification"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Default, tunog ng notification"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Tunog mula sa app"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Default na tunog ng notification"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Default na tunog ng alarm"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Mag-vibrate din para sa tawag"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Iba pang mga tunog"</string>
@@ -2753,7 +2751,7 @@
       <item quantity="other">May <xliff:g id="ON_COUNT">%d</xliff:g> na awtomatikong panuntunang naka-on</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Mga kagustuhan sa Huwag Istorbohin"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pinapayagan lang ng priyoridad"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Pinapayagan lang ng prioridad"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Mga awtomatikong panuntunan"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Magtakda ng panuntunan ng Huwag Istorbohin"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Limitahan ang tunog at pag-vibrate sa partikular na oras"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Kapag naka-lock ang iyong device, paano mo gustong lumabas ang mga notification tungkol sa profile?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Mga notification sa profile"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Mga Notification"</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_blocked" msgid="7938180808339386300">"Huwag kailanman magpakita ng mga notification"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Mababa: Walang tunog o visual na pag-abala"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Katamtaman: Walang tunog"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Mataas: Gumawa ng tunog"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Agaran: Gumawa ng tunog at mag-pop uo 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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Assistant para sa notification"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Pinipigilan ng Android na lumabas ang mga notification ng app na ito sa device na ito"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Pinipigilan ng Android na lumabas ang ganitong kategorya ng mga notification sa device na ito"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Mga Kategorya"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Iba Pa"</string>
     <string name="no_channels" msgid="3077375508177744586">"Walang anumang notification para sa app na ito"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Manatili sa kasalukuyang oryentasyon"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Secure na pagsisimula"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Magpatuloy"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Maaari mong higit pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng iyong PIN bago ito magbukas. Hanggang sa magbukas ang device, hindi ito makakatanggap ng mga tawag, mensahe o notification, kasama ang mga alarm. \n\nNakakatulong itong protektahan ang data sa mga nawala o nanakaw na device."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Maaari mong higit pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng iyong pattern bago ito magbukas. Hanggang sa magbukas ang device, hindi ito makakatanggap ng mga tawag, mensahe o notification, kasama ang mga alarm. \n\nNakakatulong itong protektahan ang data sa mga nawala o nanakaw na device."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Maaari mong higit pang maprotektahan ang device na ito sa pamamagitan ng paghingi ng iyong password bago ito magbukas. Hanggang sa magbukas ang device, hindi ito makakatanggap ng mga tawag, mensahe o notification, kasama ang mga alarm. \n\nNakakatulong itong protektahan ang data sa mga nawala o nanakaw na device."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Bukod pa sa paggamit ng fingerprint upang i-unlock ang iyong device, maaari mo pang maprotektahan ang device na ito sa pamamagitan ng paghiling sa iyong PIN bago ito magsimula. Hanggang sa magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe o notification, pati na ng mga alarm.\n\nTumutulong ito na protektahan ang data sa mga nawala o nanakaw na device."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Bukod pa sa paggamit ng fingerprint upang i-unlock ang iyong device, maaari mo pang maprotektahan ang device na ito sa pamamagitan ng paghiling sa iyong pattern bago ito magsimula. Hanggang sa magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe o notification, pati na ng mga alarm.\n\nTumutulong ito na protektahan ang data sa mga nawala o nanakaw na device."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Bukod pa sa paggamit ng fingerprint upang i-unlock ang iyong device, maaari mo pang maprotektahan ang device na ito sa pamamagitan ng paghiling sa iyong password bago ito magsimula. Hanggang sa magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe o notification, pati na ng mga alarm.\n\nTumutulong ito na protektahan ang data sa mga nawala o nanakaw na device."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Humingi ng PIN upang buksan ang device"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Humingi ng pattern upang buksan ang device"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Humingi ng password upang buksan ang device"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Salamat na lang"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Salamat na lang"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Salamat na lang"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong PIN bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng PIN upang simulan ang device mo?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong pattern bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng pattern upang simulan ang device mo?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng iyong password bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm. \n\nNakakatulong ito na protektahan ang data ng mga nawawala o ninakaw na device. Humingi ng password upang simulan ang device mo?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng PIN mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng PIN upang simulan ang iyong device?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng pattern mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng pattern upang simulan ang iyong device?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Bukod sa paggamit ng iyong fingerprint upang i-unlock ang device mo, mas mapoprotektahan mo ang device na ito sa pamamagitan ng paghingi ng password mo bago ito magsimula. Hanggang magsimula ang device, hindi ito makakatanggap ng mga tawag, mensahe, o notification, kabilang ang mga alarm.\n\nNakakatulong ito na protektahan data ng mga nawawala o ninakaw na device. Humingi ng password upang simulan ang iyong device&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Oo"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Huwag"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Hingin ang PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Hingin ang pattern?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Hingin ang password?"</string>
@@ -3151,7 +3148,7 @@
     <string name="no_memory_use_summary" msgid="2016900536806235588">"Walang memory na nagamit sa nakalipas na 3 oras"</string>
     <string name="sort_avg_use" msgid="3998036180505143129">"Uriin ayon sa avg na paggamit"</string>
     <string name="sort_max_use" msgid="4629247978290075124">"Uriin ayon sa max na paggamit"</string>
-    <string name="memory_performance" msgid="5661005192284103281">"Pagganap"</string>
+    <string name="memory_performance" msgid="5661005192284103281">"Performance"</string>
     <string name="total_memory" msgid="2017287600738630165">"Kabuuang memory"</string>
     <string name="average_used" msgid="5338339266517245782">"Average na ginamit (%)"</string>
     <string name="free_memory" msgid="4003936141603549746">"Libre"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Nagbibigay-daan ang pahintulot na ito sa isang app na baguhin ang mga setting ng system."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Oo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hindi"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Oo"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Hindi"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Payagan ang mga pag-install ng app"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Pinapayagan"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Hindi pinapayagan"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Payagan mula sa pinagmulang ito"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Dobleng pag-twist para sa camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Buksan ang camera app sa pamamagitan ng pag-twist sa iyong kamay nang dalawang beses"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Pindutin nang dalawang beses ang power button para sa camera"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Nakakonekta sa"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Mga tile ng developer para sa mga mabilisang setting"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Narito kami upang tumulong"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(na-disable para kay user <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Serbisyo ng autofill"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"awtomatiko, punan, autofill"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Gawing autofill na app mo ang <xliff:g id="APP_NAME_0">%1$s</xliff:g>? Mababasa ng <xliff:g id="APP_NAME_1">%1$s</xliff:g> ang iyong screen at pupunan ang mga field sa iba pang mga app."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Tiyaking pinagkakatiwalaan mo ang app na ito&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; Ginagamit ng &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ang nasa iyong screen upang matukoy kung ano ang maaaring i-autofill."</string>
     <string name="device_theme" msgid="4571803018917608588">"Tema ng device"</string>
     <string name="default_theme" msgid="7085644992078579076">"Default"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Manger ng Storage: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index a7df115..482d43a 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Yok"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GT"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Yok"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index bb2cd1d..a47a2f6 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -120,7 +120,7 @@
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Yakınlarda Bluetooth cihazı bulunamadı."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Bluetooth eşleşme isteği"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Eşleşme isteği"</string>
-    <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlemek için hafifçe dokunun."</string>
+    <string name="bluetooth_notif_message" msgid="5057417127600942904">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> ile eşlemek için dokunun."</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Alınan dosyaları göster"</string>
     <string name="device_picker" msgid="4978696506172252813">"Bluetooth cihazı seçin"</string>
     <string name="bluetooth_ask_enablement" msgid="3387222809404177525">"<xliff:g id="APP_NAME">%1$s</xliff:g>, Bluetooth\'u açmak istiyor"</string>
@@ -147,7 +147,7 @@
     <string name="bluetooth_turning_off" msgid="2337747302892025192">"Bluetooth kapatılıyor..."</string>
     <string name="bluetooth_auto_connect" msgid="40711424456733571">"Otomatik bağlan"</string>
     <string name="bluetooth_connection_permission_request" msgid="4747918249032890077">"Bluetooth bağlantısı isteği"</string>
-    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak için hafifçe dokunun."</string>
+    <string name="bluetooth_connection_notif_message" msgid="3603316575471431846">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak için dokunun."</string>
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"\"<xliff:g id="DEVICE_NAME">%1$s</xliff:g>\" adlı cihaza bağlanmak istiyor musunuz?"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"Telefon defterine erişim isteği"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> kişilerinize ve çağrı geçmişinize erişmek istiyor. <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> cihazına erişim verilsin mi?"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hesaplar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Konum"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hesaplar"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Güvenlik ve Konum"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Şifreleme ve kimlik bilgileri"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon şifrelendi"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon şifrelendi"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Kilit ekranı tercihleri"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Gizlilik"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Yönetici devre dışı bıraktı"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Güvenlik durumu"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Ekran kilidi, parmak izi"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekran kilidi"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Parmak izi"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Parmak izi yönetimi"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Parmak izi kullanımı:"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Herkese açık yüksek kaliteli bir ağ kullanılabilir olduğunda bildir"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Kablosuz ağı otomatik olarak aç"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Ev ağınız gibi yüksek kaliteli kayıtlı ağların yakınında olduğunuzda kablosuz özelliği tekrar açılır"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Kablosuz ağ taraması kapalı olduğu için kullanılamıyor"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Kötü bağlantılardan kaçın"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"İnternet bağlantısı iyi olmadıkça Kablosuz ağı kullanma"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Yalnızca iyi İnternet bağlantısı olan ağları kullanın"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Kablosuz ayarları yapılandır"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Alt ağ maskesi"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 adresleri"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Kayıtlı ağlar"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP ayarları"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Bu kullanıcı, gelişmiş Kablosuz ayarlarını kullanamaz"</string>
@@ -917,9 +915,9 @@
     <string name="alarm_volume_title" msgid="2285597478377758706">"Alarm"</string>
     <string name="dock_settings_summary" msgid="455802113668982481">"Takılı yuva için ses ayarları"</string>
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Tuşlara basınca ses çıksın"</string>
-    <string name="sound_effects_enable_title" msgid="4429690369187229592">"Hafifçe dokunma sesleri"</string>
+    <string name="sound_effects_enable_title" msgid="4429690369187229592">"Dokunma sesleri"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Ekran kilidi sesi"</string>
-    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Hafifçe dokunulduğunda titret"</string>
+    <string name="haptic_feedback_enable_title" msgid="7152163068278526530">"Dokunulduğunda titret"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Gürültü giderme"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Müzik, video, oyunlar ve diğer medyalar"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Zil sesi ve bildirimler"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Kapalı"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Telefon yuvaya yerleştirildiğinde ve/veya uyku durumundayken ne olacağını kontrol etmek için ekran koruyucuyu etkinleştirin."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Başlama zamanı"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Geçerli ekran koruyucu"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Şimdi başlat"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Ayarlar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Kaldırarak uyandır"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Gelen bildirim ekranı"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Ortam ekranı"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirim geldiğinde ekranı uyandır"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Metni daha büyük veya daha küçük yapın"</string>
@@ -1469,7 +1466,7 @@
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Ekran kilidini açmak için desen çizmek gerekir"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Deseni görünür yap"</string>
     <string name="lockpattern_settings_enable_visible_pattern_title_profile" msgid="4864525074768391381">"Profil desenini görünür yap"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Hafifçe dokunulduğunda titret"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="4389015658335522989">"Dokunulduğunda titret"</string>
     <string name="lockpattern_settings_enable_power_button_instantly_locks" msgid="5735444062633666327">"Güç düğmesi hemen kilitlesin"</string>
     <string name="lockpattern_settings_power_button_instantly_locks_summary" msgid="8196258755143711694">"<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> tarafından kilit açık tutulmadığında"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Kilit açma desenini ayarla"</string>
@@ -1538,7 +1535,7 @@
     <string name="sort_order_alpha" msgid="1410278099123670628">"Ada göre sırala"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"Boyuta göre sırala"</string>
     <string name="show_running_services" msgid="5736278767975544570">"Çalışan hizmetleri göster"</string>
-    <string name="show_background_processes" msgid="2009840211972293429">"Önbllğe alınan işlm göstr"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"Önbellekteki işlemleri göster"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"Acil durum uygulaması"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"Uygulama tercihlerini sıfırla"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"Uygulama tercihleri sıfırlansın mı?"</string>
@@ -1548,7 +1545,7 @@
     <string name="filter" msgid="2018011724373033887">"Filtre"</string>
     <string name="filter_dlg_title" msgid="8693024463731076091">"Filtre seçeneklerini belirleyin"</string>
     <string name="filter_apps_all" msgid="8899612398848280352">"Tüm uygulamalar"</string>
-    <string name="filter_apps_disabled" msgid="5862632369555319938">"Devre dışı bırakılan uygulamalar"</string>
+    <string name="filter_apps_disabled" msgid="5862632369555319938">"Devre dışı uygulamalar"</string>
     <string name="filter_apps_third_party" msgid="7786348047690140979">"İndirilenler"</string>
     <string name="filter_apps_running" msgid="7767071454371350486">"Çalışanlar"</string>
     <string name="filter_apps_onsdcard" product="nosdcard" msgid="4843063154701023349">"USB bellek"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Mağaza"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Uygulama ayrıntıları"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Uygulama <xliff:g id="APP_STORE">%1$s</xliff:g> üzerinden yüklendi"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"<xliff:g id="APP_STORE">%1$s</xliff:g> hakkında daha fazla bilgi"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Uygulama çalışma ayarları"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Çalışıyor"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Hiç kullanılmadı)"</string>
@@ -1655,7 +1653,7 @@
     <string name="service_stop_description" msgid="9146619928198961643">"Bu hizmet, uygulaması tarafından başlatıldı. Hizmetin durdurulması uygulamanın başarısız olmasına neden olabilir."</string>
     <string name="heavy_weight_stop_description" msgid="6050413065144035971">"Bu uygulama güvenli bir şekilde durdurulamıyor. Durdurursanız, mevcut işlerinizin bir kısmını kaybedebilirsiniz."</string>
     <string name="background_process_stop_description" msgid="3834163804031287685">"Bu, tekrar gerekirse diye hâlâ çalışan eski bir uygulama işlemidir. Genellikle bunu durdurmanız gerekmez."</string>
-    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: şu anda kullanılıyor. Kontrol etmek için Ayarlar\'a hafifçe dokunun."</string>
+    <string name="service_manage_description" msgid="479683614471552426">"<xliff:g id="CLIENT_NAME">%1$s</xliff:g>: şu anda kullanılıyor. Kontrol etmek için Ayarlar\'a dokunun."</string>
     <string name="main_running_process_description" msgid="1130702347066340890">"Kullanımda olan ana işlem."</string>
     <string name="process_service_in_use_description" msgid="8993335064403217080">"<xliff:g id="COMP_NAME">%1$s</xliff:g> hizmeti kullanımda."</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"Sağlayıcı <xliff:g id="COMP_NAME">%1$s</xliff:g> kullanımda."</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Klavye kısayol yardımcısı"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Kullanılabilir kısayolları görüntüle"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Varsayılan"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Fare/dokunmatik alan"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"İşaretçi hızı"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Oyun Denetleyici"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Titreşimi kullan"</string>
@@ -1717,7 +1714,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Kelimeyi düzenle"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Düzenle"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Sil"</string>
-    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Kullanıcı sözlüğünde kelime yok. Bir kelime eklemek için Ekle (+) düğmesine hafifçe dokunun."</string>
+    <string name="user_dict_settings_empty_text" msgid="1971969756133074922">"Kullanıcı sözlüğünde kelime yok. Bir kelime eklemek için Ekle (+) düğmesine dokunun."</string>
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Tüm diller için"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Diğer diller…"</string>
     <string name="testing" msgid="6584352735303604146">"Test ediliyor"</string>
@@ -1866,7 +1863,7 @@
     <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"İşlemlerinizi izleme"</string>
     <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"Bir uygulamayla etkileşim kurduğunuzda bildirim alın."</string>
     <string name="disable_service_title" msgid="3624005212728512896">"<xliff:g id="SERVICE">%1$s</xliff:g> durdurulsun mu?"</string>
-    <string name="disable_service_message" msgid="2247101878627941561">"Tamam\'a hafifçe dokunulduğunda <xliff:g id="SERVICE">%1$s</xliff:g> hizmeti durdurulur."</string>
+    <string name="disable_service_message" msgid="2247101878627941561">"Tamam\'a dokunulduğunda <xliff:g id="SERVICE">%1$s</xliff:g> hizmeti durdurulur."</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"Hiçbir hizmet yüklenmedi"</string>
     <string name="accessibility_no_service_selected" msgid="2840969718780083998">"Hizmet seçilmedi"</string>
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"Hiçbir açıklama sağlanmadı."</string>
@@ -1912,13 +1909,13 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Uygulamalar kullanılmadıklarında arka planda çalıştırılabilir"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Kullanılmadığında uygulamanın arka plan etkinliği sınırlandı"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Uygulamanın arka planda çalıştırılmasına izin verilmiyor"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Tam şarjdan sonraki ekran kullanımı"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Tam şarj sonrası ekran kullanımı"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekranın pil tüketimi"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil ağ tarama"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> önce"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Tam şarjdan sonraki uygulama kullanımı (<xliff:g id="TIME">%1$s</xliff:g> önce)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> önce"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Tam şarj sonrası uygulama kullanımı (<xliff:g id="TIME">^1</xliff:g> önce)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Tam şarjdan sonra ekranın açık olduğu süre"</string>
-    <string name="device_usage_list_summary" msgid="5623036661468763251">"Tam şarjdan sonraki cihaz kullanımı"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"Tam şarj sonrası cihaz kullanımı"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Fişten çekildikten sonra pil kullanımı"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"Sıfırlamadan itibaren pil kullanımı"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"Pilde <xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Kablosuz"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Telefon beklemesi"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Mobil ağ beklemede"</string>
     <string name="power_phone" msgid="5392641106474567277">"Sesli aramalar"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Tablet boşta"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Telefon boşta"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Pil kullanımı, güç tüketimini yaklaşık olarak gösterir ve pili harcayan kaynakların hepsini hesaba dahil etmez. Çeşitli kaynaklar adı altında belirtilen değer, hesaplanan yaklaşık güç tüketimi ile pilin gerçek kullanımı arasındaki farktır."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Fazla hesaplanan güç kullanımı"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s kullandı"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> süreyle kullanıldı"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kadarı <xliff:g id="APP">%2$s</xliff:g> tarafından kullanılıyor"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"Toplam pilin <xliff:g id="PERCENT">%1$s</xliff:g> kadarı"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Son tam şarjdan sonraki kullanım dökümü"</string>
+    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Son tam şarj sonrası kullanım dökümü"</string>
     <string name="battery_last_full_charge" msgid="7151251641099019361">"Son tam şarj"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"Kalan pil süresi yaklaşık bir değerdir ve kullanıma dayalı olarak değişebilir"</string>
     <string name="battery_detail_foreground" msgid="3350401514602032183">"Etkin kullanımdayken"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ses giriş/çıkış ayarları"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ses ile arama"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android klavyesi"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Konuşma"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Ses girişi ayarları"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Ses girişi"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ses girişi hizmetleri"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Kimlik bilgileri deposu silinemedi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Kimlik bilgileri deposu etkin."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Kimlik bilgileri depolamasını kullanabilmek için öncelikle bir ekran PIN\'i veya şifre ayarlamanız gerekir."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Kullanım erişimi olan uygulamalar"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Erişimi olan uygulamalar"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Acil sesi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Acil çağrı yapıldığında nasıl işlev göreceğini ayarlayın"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Yedekle"</string>
@@ -2193,7 +2189,7 @@
     <string name="wifi_setup_title_connecting_network" msgid="5572226790101017822">"<xliff:g id="NETWORK_NAME">%s</xliff:g> kablosuz ağına bağlanıyor…"</string>
     <string name="wifi_setup_title_connected_network" msgid="1608788657122010919">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıldı"</string>
     <string name="wifi_setup_title_add_network" msgid="6932651000151032301">"Ağ ekleyin"</string>
-    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Bağlanmadı"</string>
+    <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Bağlı değil"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Ağ ekle"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Listeyi yenile"</string>
     <string name="wifi_setup_skip" msgid="6661541841684895522">"Atla"</string>
@@ -2205,7 +2201,7 @@
     <string name="wifi_setup_save" msgid="3659235094218508211">"Kaydet"</string>
     <string name="wifi_setup_cancel" msgid="3185216020264410239">"İptal"</string>
     <string name="wifi_setup_status_scanning" msgid="5317003416385428036">"Ağlar taranıyor..."</string>
-    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Bağlanmak için bir ağa hafifçe dokunun"</string>
+    <string name="wifi_setup_status_select_network" msgid="3960480613544747397">"Bağlanmak için bir ağa dokunun"</string>
     <string name="wifi_setup_status_existing_network" msgid="6394925174802598186">"Mevcut ağa bağlan"</string>
     <string name="wifi_setup_status_unsecured_network" msgid="8143046977328718252">"Güvenli olmayan ağa bağlan"</string>
     <string name="wifi_setup_status_edit_network" msgid="4765340816724760717">"Ağ yapılandırmasını yazın"</string>
@@ -2215,7 +2211,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="6796317704783144190">"EAP desteklenmiyor."</string>
     <string name="wifi_setup_eap_not_supported" msgid="6812710317883658843">"Kurulum sırasında EAP Kablosuz bağlantısı yapılandıramazsınız. Kurulumdan sonra bunu, Ayarlar &gt; Kablosuz ve ağlar bölümünde yapabilirsiniz."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"Bağlanma birkaç dakika sürebilir..."</string>
-    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye hafifçe dokunun.\n\nFarklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye hafifçe dokunun."</string>
+    <string name="wifi_setup_description_connected" msgid="6649168170073219153">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun.\n\nFarklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Senkronizasyon etkinleştirildi"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Senkronizasyon devre dışı"</string>
     <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Şimdi senkronize ediliyor"</string>
@@ -2243,7 +2239,7 @@
     <string name="settings_backup_summary" msgid="7916877705938054035">"Ayarlarımı yedekle"</string>
     <string name="sync_menu_sync_now" msgid="6154608350395805683">"Şimdi senkronize et"</string>
     <string name="sync_menu_sync_cancel" msgid="8292379009626966949">"Senkronizasyonu iptal et"</string>
-    <string name="sync_one_time_sync" msgid="3733796114909082260">"Şimdi senkronize etmek için hafifçe dokunun<xliff:g id="LAST_SYNC_TIME">
+    <string name="sync_one_time_sync" msgid="3733796114909082260">"Şimdi senkronize etmek için dokunun<xliff:g id="LAST_SYNC_TIME">
 %1$s</xliff:g>"</string>
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"Takvim"</string>
@@ -2510,7 +2506,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Kısıtlanmış profiller hesap ekleyemez"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Bu cihazdan sil: <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Kilit ekranı ayarları"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Kilit ekranından kullanıcı ekleme"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Kilit ekranından kullanıcı eklensin"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Yeni kullanıcı"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Yeni profil"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Kendinizi silmek istiyor musunuz?"</string>
@@ -2617,9 +2613,9 @@
     <string name="sim_settings_title" msgid="6822745211458959756">"SIM kartlar"</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 kartlar değişti"</string>
-    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Etkinlikleri ayarlamak için hafifçe dokunun"</string>
+    <string name="sim_cards_changed_message_summary" msgid="8258058274989383204">"Etkinlikleri ayarlamak için dokunun"</string>
     <string name="sim_cellular_data_unavailable" msgid="9109302537004566098">"Mobil veri kullanılamıyor"</string>
-    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Veri SIM\'i seçmek için hafifçe dokunun"</string>
+    <string name="sim_cellular_data_unavailable_summary" msgid="5416535001368135327">"Veri SIM\'i seçmek için dokunun"</string>
     <string name="sim_calls_always_use" msgid="7936774751250119715">"Çağrılar için her zaman bunu kullan"</string>
     <string name="select_sim_for_data" msgid="2366081042162853044">"Veri için bir SIM kart seçin"</string>
     <string name="data_switch_started" msgid="2040761479817166311">"Veri için kullanılan SIM kart değiştiriliyor. Bu işlem bir dakika kadar sürebilir..."</string>
@@ -2647,7 +2643,7 @@
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"Ağ Adı Yayınının Devre Dışı Bırakılması, gizli ağlara otomatik olarak bağlanmayı engeller."</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM kartlar değiştirildi."</string>
-    <string name="sim_notification_summary" msgid="8858043655706669772">"Ayarlamak için hafifçe dokunun"</string>
+    <string name="sim_notification_summary" msgid="8858043655706669772">"Ayarlamak için dokunun"</string>
     <string name="sim_pref_divider" msgid="6778907671867621874">"Şunun için tercih edilen SIM:"</string>
     <string name="sim_calls_ask_first_prefs_title" msgid="7941299533514115976">"Her zaman sor"</string>
     <string name="sim_selection_required_pref" msgid="3446721423206414652">"Seçim gerekiyor"</string>
@@ -2714,7 +2710,7 @@
     <string name="keywords_backup" msgid="470070289135403022">"yedek, yedekleme"</string>
     <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</string>
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
-    <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete hafifçe dokunun..."</string>
+    <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete dokunun..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Geçersiz şifre. Tekrar deneyin."</string>
     <string name="status_write_success" msgid="5228419086308251169">"Başarıyla yazıldı!"</string>
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC etiketine veri yazılamıyor. Sorun devam ederse başka bir etiket deneyin"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirim sesi düzeyi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Varsayılan bildirim sesi"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Uygulama ile sağlanan ses"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Varsayılan bildirim sesi"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Varsayılan alarm sesi"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Çağrılarda ayrıca titret"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Diğer sesler"</string>
@@ -2739,7 +2737,7 @@
     <string name="charging_sounds_title" msgid="1132272552057504251">"Şarj sesleri"</string>
     <string name="docking_sounds_title" msgid="155236288949940607">"Yuvaya yerleştirme sesleri"</string>
     <string name="touch_sounds_title" msgid="5326587106892390176">"Dokunma sesleri"</string>
-    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Hafifçe dokunulduğunda titret"</string>
+    <string name="vibrate_on_touch_title" msgid="5388579924689395023">"Dokunulduğunda titret"</string>
     <string name="dock_audio_media_title" msgid="1346838179626123900">"Yuva hoparlörü çalsın"</string>
     <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tüm ses"</string>
     <string name="dock_audio_media_enabled" msgid="667849382924908673">"Yalnızca medya sesi"</string>
@@ -2753,7 +2751,7 @@
       <item quantity="one">1 otomatik kural açıldı</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"Rahatsız Etmeyin tercihleri"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Yalnızca öncelik şunlara izin verir"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Öncelikli olanlar"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Otomatik kurallar"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Rahatsız Etmeyin kurallarını ayarla"</string>
     <string name="zen_mode_automation_suggestion_summary" msgid="4732808039946935657">"Belirli zamanlarda sesleri ve titreşimleri sınırlandır"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Cihazınız kilitliyken profil bildirimlerinin nasıl gösterilmesini istersiniz?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profil bildirimleri"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Bildirimler"</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_blocked" msgid="7938180808339386300">"Bildirimleri hiçbir zaman gösterme"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Düşük: Ses veya görsel kesme yok"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Orta: Ses yok"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Yüksek: Ses çıkar"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Acil: Ses çıkar ve ekranda 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="6585849855452076626">"Sese İzin Ver"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ses çıkarma, titreştirme veya bu bildirimleri geçerli ekrana getirme."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Bildirim yardımcısı"</string>
@@ -2836,6 +2835,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android, bu uygulamanın bildirimlerinin bu cihazda görünmesini engelliyor"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android, bu kategorideki bildirimlerin bu cihazda görünmesini engelliyor"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Kategoriler"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Diğer"</string>
     <string name="no_channels" msgid="3077375508177744586">"Bu uygulama herhangi bir bildirim yayınlamadı"</string>
@@ -2954,7 +2955,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"Açık"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"Kapalı"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekran sabitleme"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Bu ayar açık olduğunda, ekran sabitlemeyi kullanarak, geçerli ekranı sabitleme kaldırılıncaya kadar görünümde tutabilirsiniz.\n\nEkran sabitlemeyi kullanmak için:\n\n1. Ekran sabitlemenin açık olduğundan emin olun.\n\n2. Sabitlemek istediğiniz ekranı açın.\n\n3. Genel Bakış\'a hafifçe dokunun.\n\n4. Yukarı doğru hızlıca kaydırın ve sabitle simgesine hafifçe dokunun."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Bu ayar açık olduğunda, ekran sabitlemeyi kullanarak, geçerli ekranı sabitleme kaldırılıncaya kadar görünümde tutabilirsiniz.\n\nEkran sabitlemeyi kullanmak için:\n\n1. Ekran sabitlemenin açık olduğundan emin olun.\n\n2. Sabitlemek istediğiniz ekranı açın.\n\n3. Genel Bakış\'a dokunun.\n\n4. Yukarı doğru hızlıca kaydırın ve sabitle simgesine dokunun."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Sabitlemeyi kaldırmadan önce kilit açma desenini sor"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Sab. kald. önce PIN\'i sor"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Sabitlemeyi kaldırmadan önce şifre sor"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Geçerli yönde kal"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Güvenli başlatma"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Devam"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Başlatılmadan önce PIN\'inizin girilmesini isteyerek bu cihazı daha ileri düzeyde koruyabilirsiniz. Cihaz başlayana kadar çağrılar, iletiler veya bildirimler alınamaz. \n\nBu tedbir, kaybedilen veya çalınan cihazlardaki verileri korumaya yardımcı olur."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Başlatılmadan önce deseninizin girilmesini isteyerek bu cihazı daha ileri düzeyde koruyabilirsiniz. Cihaz başlayana kadar çağrılar, iletiler veya bildirimler alınamaz. \n\nBu tedbir, kaybedilen veya çalınan cihazlardaki verileri korumaya yardımcı olur."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Başlatılmadan önce şifrenizin girilmesini isteyerek bu cihazı daha ileri düzeyde koruyabilirsiniz. Cihaz başlayana kadar çağrılar, iletiler veya bildirimler alınamaz. \n\nBu tedbir, kaybedilen veya çalınan cihazlardaki verileri korumaya yardımcı olur."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Cihazınızın kilidini açmak için parmak izinizi kullanmanın yanı sıra, başlatılması için PIN\'inizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz başlatılana kadar, alarmlar dahil olmak üzere çağrı, ileti veya bildirimleri almaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Cihazınızın kilidini açmak için parmak izinizi kullanmanın yanı sıra, başlatılması için deseninizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz başlatılana kadar, alarmlar dahil olmak üzere çağrı, ileti veya bildirimleri almaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Cihazınızın kilidini açmak için parmak izinizi kullanmanın yanı sıra, başlatılması için şifrenizin girilmesini zorunlu hale getirerek bu cihaz için ek koruma sağlayabilirsiniz. Cihaz başlatılana kadar, alarmlar dahil olmak üzere çağrı, ileti veya bildirimleri almaz.\n\nBu özellik, kaybolan veya çalınan cihazlardaki verileri korumaya yardımcı olur."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Cihazı başlatmak için PIN gerektir"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Cihazı başlatmak için desen gerektir"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Cihazı başlatmak için şifre gerektir"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Hayır, teşekkürler"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Hayır, teşekkürler"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Hayır, teşekkürler"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Başlatılmadan önce PIN\'inizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için PIN girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Başlatılmadan önce deseninizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için desen girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Başlatılmadan önce şifrenizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için şifre girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Cihazınızın kilidini açmak için parmak izinizi kullanmaya ek olarak, başlatılmadan önce PIN\'inizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için PIN girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Cihazınızın kilidini açmak için parmak izinizi kullanmaya ek olarak, başlatılmadan önce deseninizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için desen girilmesi zorunlu kılınsın mı?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Cihazınızın kilidini açmak için parmak izinizi kullanmaya ek olarak, başlatılmadan önce şifrenizi girmeyi zorunlu kılarak bu cihazı daha da koruyabilirsiniz. Cihaz başlatılıncaya kadar alarmlar dahil olmak üzere çağrı, mesaj veya bildirim alamaz.\n\nBu, kayıp veya çalıntı cihazlarda verilerin korunmasına yardımcı olur. Cihazınızı başlatmak için şifre girilmesini zorunlu tutun&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Evet"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Hayır"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN istensin mi?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Desen istensin mi?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Şifre istensin mi?"</string>
@@ -3046,8 +3043,8 @@
     <string name="unknown_app" msgid="5275921288718717656">"Bilinmeyen uygulama"</string>
     <string name="app_permissions" msgid="4148222031991883874">"Uygulama izinleri"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"<xliff:g id="APPS">%1$s</xliff:g> kullanan uygulamalar"</string>
-    <string name="tap_to_wake" msgid="7211944147196888807">"Hafifçe dokunarak uyandır"</string>
-    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Cihazı uyandırmak için ekranda herhangi bir yere iki kez hafifçe dokunun"</string>
+    <string name="tap_to_wake" msgid="7211944147196888807">"Dokunarak uyandır"</string>
+    <string name="tap_to_wake_summary" msgid="4341387904987585616">"Cihazı uyandırmak için ekranda herhangi bir yere iki kez dokunun"</string>
     <string name="domain_urls_title" msgid="3132983644568821250">"Açılış bağlantıları"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Desteklenen bağlantıları açma"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"<xliff:g id="DOMAIN">%s</xliff:g> alanını açan"</string>
@@ -3190,23 +3187,23 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"İzni olan uygulamalar"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Evet"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Hayır"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Bilinmeyen uygulamaları yükleme"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"Bilinmeyen uygulamaları yükle"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"uygulamalar yükleme bilinmeyen kaynaklar"</string>
-    <string name="write_settings" msgid="4797457275727195681">"Sistem ayarlarını değiştirme"</string>
+    <string name="write_settings" msgid="4797457275727195681">"Sistem ayarlarını değiştir"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"yazma değiştirme sistem ayarları"</string>
     <string name="write_settings_summary" msgid="4302268998611412696">"<xliff:g id="COUNT_0">%1$d</xliff:g>/<xliff:g id="COUNT_1">%2$d</xliff:g> uygulamanın sistem ayarlarını değiştirmesine izin verildi"</string>
     <string name="filter_install_sources_apps" msgid="3102976274848199118">"Diğer uygulamaları yükleyebilir"</string>
     <string name="filter_write_settings_apps" msgid="2914615026197322551">"Sistem ayarlarını değiştirebilir"</string>
     <string name="write_settings_title" msgid="4232152481902542284">"Sistem ayarlarını değiştirebilir"</string>
-    <string name="write_system_settings" msgid="3482913590601096763">"Sistem ayarlarını değiştirme"</string>
+    <string name="write_system_settings" msgid="3482913590601096763">"Sistem ayarlarını değiştir"</string>
     <string name="write_settings_preference" msgid="3407383041273067448">"Uygulamanın, sistem ayarlarını değiştirme izni"</string>
     <string name="permit_write_settings" msgid="6393779336656870080">"Sistem ayarlarını değiştirmeye izin ver"</string>
     <string name="write_settings_description" msgid="6868293938839954623">"Bu izin, bir uygulanın sistem ayarlarını değiştirmesine olanak sağlar."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Evet"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Hayır"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Evet"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Hayır"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Uygulamaların yüklenmesine izin ver"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"İzin verildi"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"İzin verilmiyor"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Bu kaynaktan izin verin"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera için iki kez bükün"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Bileğinizi iki kez bükerek kamera uygulamasını açın"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamera için güç düğmesine iki kez bas"</string>
@@ -3228,7 +3225,7 @@
     <string name="screen_zoom_conversation_timestamp_2" msgid="7107225702890747588">"Sal 18:01"</string>
     <string name="screen_zoom_conversation_timestamp_3" msgid="3785674344762707688">"Sal 18:02"</string>
     <string name="screen_zoom_conversation_timestamp_4" msgid="2511469395448561259">"Sal 18:03"</string>
-    <string name="disconnected" msgid="4836600637485526329">"Bağlanmadı"</string>
+    <string name="disconnected" msgid="4836600637485526329">"Bağlı değil"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"<xliff:g id="AMOUNT">%1$s</xliff:g> veri kullanıldı"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> uygulama için kapalı</item>
@@ -3269,7 +3266,7 @@
     <string name="condition_hotspot_summary" msgid="3433182779269409683">"Taşınabilir Kablosuz hotspot <xliff:g id="ID_1">%1$s</xliff:g> etkin durumda. Bu cihazın Kablosuz bağlantı özelliği kapalı."</string>
     <string name="condition_airplane_title" msgid="287356299107070503">"Uçak modu açık"</string>
     <string name="condition_airplane_summary" msgid="5561586417832393666">"Kablosuz bağlantı, Bluetooth ve mobil ağ kapalı. Telefon edemez veya internete bağlanamazsınız."</string>
-    <string name="condition_zen_title" msgid="2679168532600816392">"Rahatsız etmeyin ayarı açık (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
+    <string name="condition_zen_title" msgid="2679168532600816392">"Rahatsız etme ayarı açık (<xliff:g id="ID_1">%1$s</xliff:g>)"</string>
     <string name="condition_battery_title" msgid="3272131008388575349">"Pil Tasarrufu açık"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"Performans azaldı. Konum hizmetleri ve arka plan veriler kapatıldı."</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"Mobil veri kapalı"</string>
@@ -3299,9 +3296,9 @@
     <string name="ethernet_data_template" msgid="5782476509881033590">"<xliff:g id="AMOUNT">^1</xliff:g> ethernet verisi"</string>
     <string name="cell_warning_only" msgid="763147658209027140">"<xliff:g id="ID_1">%1$s</xliff:g> Veri uyarısı"</string>
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> Veri uyarısı / <xliff:g id="ID_2">%2$s</xliff:g> Veri sınırı"</string>
-    <string name="billing_cycle" msgid="5169909190811133499">"Faturalandırma döngüsü"</string>
+    <string name="billing_cycle" msgid="5169909190811133499">"Fatura dönemi"</string>
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Aylık döngü, her ayın <xliff:g id="ID_1">%1$s</xliff:g> günü başlar"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Aylık döngü başlangıcı: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Aylık dönem başlangıcı: <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Ağ kısıtlamaları"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> kısıtlama</item>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Şu cihaza bağlandı:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Hızlı ayarlar geliştirici blokları"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Yardımcı olmak için buradayız"</string>
@@ -3455,7 +3453,7 @@
     <string name="gesture_preference_summary" product="tablet" msgid="4717535378272065510">"Tabletinizi kontrol etmek için pratik hareketler"</string>
     <string name="gesture_preference_summary" product="device" msgid="4205941452664950852">"Cihazınızı kontrol etmek için pratik hareketler"</string>
     <string name="double_tap_power_for_camera_title" msgid="64716226816032800">"Kamerayı hızlı açma"</string>
-    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamerayı hızlıca açmak için güç düğmesine iki kez basın. Tüm ekranlarda çalışır."</string>
+    <string name="double_tap_power_for_camera_summary" msgid="242037150983277829">"Kamerayı çabuk açmak için güç düğmesine iki kez dokunun. Tüm ekranlarda çalışır."</string>
     <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Kamerayı çevir"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></string>
     <string name="ambient_display_title" product="default" msgid="5144814600610448504">"Telefonu kontrol etmek için iki kez dokunun"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> için devre dışı bırakıldı)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Otomatik doldurma hizmeti"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"otomatik, doldur, otomatik doldur"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g>, otomatik doldurma uygulamanız olsun mu? <xliff:g id="APP_NAME_1">%1$s</xliff:g>, ekranınızı okuyabilecek ve diğer uygulamalardaki alanları doldurabilecek."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Bu uygulamaya güvendiğinizden emin olun&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Otomatik Doldurma&gt;%1$s&lt;/xliff:g&gt; otomatik doldurulabilecek öğeleri belirlemek için ekranınızdaki bilgileri kullanır."</string>
     <string name="device_theme" msgid="4571803018917608588">"Cihaz teması"</string>
     <string name="default_theme" msgid="7085644992078579076">"Varsayılan"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Depolama Yöneticisi: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 436d4cd..4d706ff 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Немає"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Немає"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 526a828..689ea60 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -320,33 +320,32 @@
     <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="TIMEOUT_STRING">%1$s</xliff:g> після режиму сну, якщо не заблоковано довірчим агентом <xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>"</string>
-    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показувати дані про власника на екрані блокування"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"Текст на заблок.екрані"</string>
+    <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"Показувати дані про власника на заблоков. екрані"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"Текст на екрані"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Увімкнути віджети"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"Вимкнено адміністратором"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"Немає"</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">"Наприклад, \"Android Олега\"."</string>
     <string name="user_info_settings_title" msgid="1195015434996724736">"Дані користувача"</string>
-    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показувати інформацію профілю на екрані блокування"</string>
+    <string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показувати інформацію профілю на заблокованому екрані"</string>
     <string name="profile_info_settings_title" msgid="3518603215935346604">"Інформація профілю"</string>
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Облікові записи"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Місцезнаходження"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Облікові записи"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Безпека та місцезнаходження"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Шифрування й облікові дані"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Телефон зашифровано"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Телефон зашифровано"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Параметри блокування екрана"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Конфіденційність"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Вимкнено адміністратором"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Статус безпеки"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"Керування відбитками"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Використ. відбиток для"</string>
@@ -369,11 +368,11 @@
     <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Пропустити"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Додати відбиток пальця"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Функції захисту пристрою не буде активовано. Інші люди зможуть користуватися цим планшетом, якщо його буде загублено, викрадено чи очищено."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим пристроєм, якщо його буде втрачено, викрадено чи очищено."</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим телефоном, якщо його буде втрачено, викрадено чи очищено."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим планшетом, якщо його буде загублено чи викрадено."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим пристроєм, якщо його буде загублено чи викрадено."</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функції захисту пристрою не буде активовано. Ви не зможете завадити іншим користуватися цим телефоном, якщо його буде загублено чи викрадено."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Функції захисту пристрою не буде активовано. Якщо пристрій буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"Функції захисту пристрою не буде активовано. Якщо телефон буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"Функції захисту пристрою не буде активовано. Якщо планшет буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"Функції захисту пристрою не буде активовано. Якщо пристрій буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"Функції захисту пристрою не буде активовано. Якщо телефон буде загублено чи викрадено, ним зможуть скористатися сторонні."</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"Пропустити"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"Назад"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"Знайдіть датчик"</string>
@@ -588,7 +587,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"Скасувати"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"Далі"</string>
     <string name="lock_setup" msgid="3355847066343753943">"Налаштування завершено."</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"Додатки для керування адміністраторами пристрою"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Додатки адміністратора пристрою"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Немає активних додатків"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="one"><xliff:g id="COUNT_1">%d</xliff:g> активний додаток</item>
@@ -714,6 +713,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Недоступно, оскільки сканування Wi‑Fi вимкнено"</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>
@@ -837,11 +837,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Налаштувати Wi-Fi"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC-адреса"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"ІР-адреса"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Маска підмережі"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Адреси IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Збережені мережі"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Налаштування IP-адр."</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Розширені налаштування Wi-Fi недоступні для цього користувача"</string>
@@ -1041,17 +1039,16 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Вимк."</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Щоб контролювати поведінку телефона, коли він у док-станції та/або в режимі сну, увімкніть заставку."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Коли почати"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Поточна заставка"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Почати зараз"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Налаштування"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Підняти, щоб активувати"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Екран вхідних сповіщень"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Активація екрана"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Активувати екран, коли надходять сповіщення"</string>
     <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>
+    <string name="sim_lock_settings" msgid="3392331196873564292">"Налаштування блокування SIM-карти"</string>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"Блокування SIM-карти"</string>
     <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"Вимкнено"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"Заблоковано"</string>
@@ -1230,7 +1227,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Система"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"Переглянути файли, які містить <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Інше – це файли, збережені додатками чи завантажені через Інтернет або Bluetooth, файли 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_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_wizard_init_title" msgid="5085400514028585772">"Налаштуйте пристрій пам’яті <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Використовувати як портативний пристрій пам’яті"</string>
@@ -1450,7 +1447,7 @@
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"Інф-я про безпеку"</string>
     <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="settings_safetylegal_activity_loading" msgid="8059022597639516348">"Завантаження…"</string>
     <string name="lockpassword_choose_your_password_header" msgid="8624900666929394990">"Виберіть пароль"</string>
     <string name="lockpassword_choose_your_pattern_header" msgid="6949761069941694050">"Створіть ключ"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"Виберіть свій PIN"</string>
@@ -1645,6 +1642,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ніколи не використовується)"</string>
@@ -1721,7 +1719,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Довідник із комбінацій клавіш"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Показати доступні ярлики"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"За умовчанням"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Миша/сенсорна панель"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Швидкість указівника"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Ігровий контролер"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Використовувати вібросигнал"</string>
@@ -1811,7 +1808,7 @@
     <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="6752037184140789970">"Ярлик"</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>
@@ -1954,11 +1951,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"Додаток може працювати у фоновому режимі, коли не використовується"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Роботу додатка у фоновому режимі обмежено, коли він не використовується"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Додатку заборонено працювати у фоновому режимі"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"Викор. екраном після повного заряджання"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"Використання екрана після повного заряджання"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Споживання заряду екраном"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Сканування мобільної мережі"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> тому"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Використання додатками після повного заряджання (<xliff:g id="TIME">%1$s</xliff:g> тому)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> тому"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Використання додатками після повного заряджання (<xliff:g id="TIME">^1</xliff:g> тому)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Час з увімкненим екраном після повного заряджання"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Викор. пристроєм після повного заряджання"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Споживання акумулятора з часу відключення"</string>
@@ -1978,7 +1975,7 @@
     <string name="awake" msgid="387122265874485088">"Час активн. пристрою"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Час роботи Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Час роботи Wi-Fi"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Інформація щодо ефективнішого використання заряду акумулятора"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Відомості про використання заряду"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Дані про використання"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Використання заряду"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Вжиток"</string>
@@ -1989,10 +1986,10 @@
     <string name="power_camera" msgid="4976286950934622605">"Камера"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Тел.у реж.очік."</string>
+    <string name="power_cell" msgid="3392999761958982492">"Мобільна мережа в режимі очікування"</string>
     <string name="power_phone" msgid="5392641106474567277">"Голос. дзвінки"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Режим очікув."</string>
-    <string name="power_idle" product="default" msgid="9055659695602194990">"Режим очік."</string>
+    <string name="power_idle" product="default" msgid="9055659695602194990">"Режим очікування"</string>
     <string name="power_unaccounted" msgid="709925017022660740">"Інше"</string>
     <string name="power_overcounted" msgid="2762354976171358445">"Переоцінене"</string>
     <string name="power_apps" msgid="2043554781293951327">"Додатки"</string>
@@ -2049,10 +2046,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Споживання заряду акумулятора – це приблизний обсяг спожитої енергії, який включає не всі джерела використання заряду акумулятора. Невраховане споживання заряду акумулятора – це різниця між обчисленим приблизним і фактичним споживанням."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Переоцінене енергоспоживання"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> мА/год"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Використовується %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Час використання: <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_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_detail_foreground" msgid="3350401514602032183">"Поки активно використовується"</string>
@@ -2121,7 +2118,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Налашт-ня голосового вводу та виводу"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Голос. пошук"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Клавіатура Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Мовлення"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Налаштування голосового вводу"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Голосовий ввід"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Служби голосового вводу"</string>
@@ -2560,7 +2556,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Обмежені профілі не можуть додавати облікові записи"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"<xliff:g id="USER_NAME">%1$s</xliff:g> – видалити з пристрою"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"Параметри блокування екрана"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Додавайте користувачів на заблокованому екрані"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"Додавати користувачів на заблокованому екрані"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"Новий користувач"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"Новий профіль"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"Видалити ваш профіль?"</string>
@@ -2783,6 +2779,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Гучність сповіщень"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Мелодія телефона"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Стандартний сигнал сповіщень"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Сигнал додатків"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Сигнал сповіщень за умовчанням"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Стандартний сигнал будильника"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Вібрація під час дзвінка"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Інші звуки"</string>
@@ -2806,7 +2804,7 @@
       <item quantity="many">Увімкнено <xliff:g id="ON_COUNT">%d</xliff:g> автоматичних правил</item>
       <item quantity="other">Увімкнено <xliff:g id="ON_COUNT">%d</xliff:g> автоматичного правила</item>
     </plurals>
-    <string name="zen_mode_settings_title" msgid="842308776768942600">"Налаштування режиму \"Не турбувати\""</string>
+    <string name="zen_mode_settings_title" msgid="842308776768942600">"Режим \"Не турбувати\""</string>
     <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"Дозволити лише пріоритетні"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"Авторежим"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"Налаштувати правила режиму \"Не турбувати\""</string>
@@ -2834,7 +2832,7 @@
     <string name="advanced_section_header" msgid="8833934850242546903">"Розширені налаштування"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"Робочі сповіщення"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"Блимання"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На екрані блокування"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"На заблокованому екрані"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показувати весь вміст сповіщень"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ховати конфіденційний вміст сповіщень"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Узагалі не показувати сповіщення"</string>
@@ -2846,6 +2844,7 @@
     <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="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_blocked" msgid="7938180808339386300">"Ніколи не показувати сповіщення"</string>
@@ -2853,10 +2852,10 @@
     <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_min_summary" msgid="8233873580287975662">"Низький пріоритет: без звуку та візуальних сповіщень"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Середній пріоритет: без звуку"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Високий пріоритет: зі звуком"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Терміново: зі звуком і спливаючими вікнами"</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="6585849855452076626">"Дозвольте звуковий сигнал"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Не подавати звуковий сигнал і вібросигнал та не показувати ці сповіщення на поточному екрані."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Диспетчер сповіщень"</string>
@@ -2868,14 +2867,14 @@
       <item quantity="many">%d додатків можуть читати сповіщення</item>
       <item quantity="other">%d додатка можуть читати сповіщення</item>
     </plurals>
-    <string name="no_notification_listeners" msgid="3487091564454192821">"Установлені додатки не просять доступу до сповіщень."</string>
+    <string name="no_notification_listeners" msgid="3487091564454192821">"Установлені додатки не запитували доступу до сповіщень."</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"Надати додатку <xliff:g id="SERVICE">%1$s</xliff:g> доступ для сповіщень?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"Додаток <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> зможе переглядати всі сповіщення, зокрема особисту інформацію, як-от імена контактів і тексти отриманих повідомлень. Він також зможе закривати сповіщення й активувати в них командні кнопки. \n\nДодаток зможе вмикати й вимикати режим \"Не турбувати\" та змінювати пов’язані з ним налаштування."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Якщо ви вимкнете доступ додатка <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> до сповіщень, доступ до режиму \"Не турбувати\" також буде вимкнено."</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Вимкнути"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Скасувати"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"Допоміжні VR-сервіси"</string>
-    <string name="no_vr_listeners" msgid="2689382881717507390">"Установлені додатки не запитують запуск у режимі допоміжних служб віртуальної реальності."</string>
+    <string name="no_vr_listeners" msgid="2689382881717507390">"Установлені додатки не запитували доступу для роботи в режимі допоміжних служб VR."</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"Надати VR-сервісу доступ до сервісу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
     <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g> запускатиметься, коли ви вмикатимете в додатках режим віртуальної реальності"</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"Коли пристрій у VR-режимі"</string>
@@ -2890,8 +2889,10 @@
     <string name="picture_in_picture_on" msgid="6103704909710176555">"Так"</string>
     <string name="picture_in_picture_off" msgid="5654388666434625247">"Ні"</string>
     <string name="manage_zen_access_title" msgid="2611116122628520522">"Доступ у режимі \"Не турбувати\""</string>
-    <string name="zen_access_empty_text" msgid="8772967285742259540">"Установлені додатки не просили доступу в режимі \"Не турбувати\""</string>
+    <string name="zen_access_empty_text" msgid="8772967285742259540">"Установлені додатки не запитували доступу до функції \"Не турбувати\""</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>
     <string name="notification_channels_other" msgid="5645317113885788226">"Інше"</string>
     <string name="no_channels" msgid="3077375508177744586">"Цей додаток не надсилав сповіщень"</string>
@@ -2920,7 +2921,7 @@
     <string name="notification_badge_summary" msgid="3944771498030335669">"Показувати сповіщення у вигляді значків у додатку Home (якщо він підтримується)."</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"Заміна режиму \"Не турбувати\""</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"Показувати ці сповіщення, коли в режимі \"Не турбувати\" вибрано \"Лише пріоритетні\""</string>
-    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На екрані блокування"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"На заблокованому екрані"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблоковано"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"Пріоритетні"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Конфіденційно"</string>
@@ -3033,18 +3034,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Залишити поточну орієнтацію"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Захищений запуск"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Продовжити"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Можна додатково захистити пристрій, якщо вводити PIN-код перед увімкненням. Вимкнений пристрій не зможе приймати дзвінки, повідомлення або сповіщення, зокрема сигнали будильника. \n\nЦе допомагає захистити дані на загублених або викрадених пристроях."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Можна додатково захистити пристрій, якщо вводити ключ перед увімкненням. Вимкнений пристрій не зможе приймати дзвінки, повідомлення або сповіщення, зокрема сигнали будильника. \n\nЦе допомагає захистити дані на загублених або викрадених пристроях."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Можна додатково захистити пристрій, якщо вводити пароль перед увімкненням. Вимкнений пристрій не зможе приймати дзвінки, повідомлення або сповіщення, зокрема сигнали будильника. \n\nЦе допомагає захистити дані на загублених або викрадених пристроях."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Якщо ви розблоковуєте пристрій відбитком пальця, можна додатково захистити його PIN-кодом перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення чи сповіщення, зокрема сигнали.\n\nЦе допомагає захистити дані на загублених або викрадених пристроях."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Якщо ви розблоковуєте пристрій відбитком пальця, можна додатково захистити його ключем перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення чи сповіщення, зокрема сигнали.\n\nЦе допомагає захистити дані на загублених або викрадених пристроях."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Якщо ви розблоковуєте пристрій відбитком пальця, можна додатково захистити його паролем перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення чи сповіщення, зокрема сигнали.\n\nЦе допомагає захистити дані на загублених або викрадених пристроях."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Вводити PIN-код перед запуском пристрою"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Вводити ключ перед запуском пристрою"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Вводити пароль перед запуском пристрою"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Ні, дякую"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Ні, дякую"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Ні, дякую"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Ви можете додатково захистити цей пристрій, увімкнувши запит PIN-коду перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники. \n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати PIN-код перед запуском?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Ви можете додатково захистити цей пристрій, увімкнувши запит ключа перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники. \n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати ключ перед запуском?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Ви можете додатково захистити цей пристрій, увімкнувши запит пароля перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники. \n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати пароль перед запуском?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Окрім розблокування відбитком пальця, ви можете додатково захистити пристрій, увімкнувши запит PIN-коду перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати PIN-код перед запуском?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Окрім розблокування відбитком пальця, ви можете додатково захистити пристрій, увімкнувши запит ключа перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати ключ перед запуском?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Окрім розблокування відбитком пальця, ви можете додатково захистити пристрій, увімкнувши запит пароля перед запуском. Доки пристрій не запуститься, він не прийматиме дзвінки, повідомлення та сповіщення, і на ньому не працюватимуть будильники.\n\nЦе допомагає захистити дані на загублених чи викрадених пристроях. Запитувати пароль перед запуском?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Так"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Ні"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Вводити PIN-код?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Вводити ключ?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Вводити пароль?"</string>
@@ -3056,7 +3053,7 @@
     <string name="imei_information_summary" msgid="2074095606556565233">"Інформація про IMEI"</string>
     <string name="slot_number" msgid="3762676044904653577">"(Гніздо <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
     <string name="launch_by_default" msgid="1840761193189009248">"Відкривати за умовчанням"</string>
-    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Посилання для відкривання"</string>
+    <string name="app_launch_domain_links_title" msgid="1160925981363706090">"Відкривання посилань"</string>
     <string name="app_launch_open_domain_urls_title" msgid="8914721351596745701">"Відкривати підтримувані посилання"</string>
     <string name="app_launch_open_domain_urls_summary" msgid="5367573364240712217">"Відкривати, не запитуючи"</string>
     <string name="app_launch_supported_domain_urls_title" msgid="8250695258211477480">"Підтримувані посилання"</string>
@@ -3118,7 +3115,7 @@
     <string name="app_permissions_summary" msgid="5163974162150406324">"Додатки, які використовують <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Торкніться, щоб активувати"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Двічі торкніться екрана, щоб активувати пристрій"</string>
-    <string name="domain_urls_title" msgid="3132983644568821250">"Посилання для відкривання"</string>
+    <string name="domain_urls_title" msgid="3132983644568821250">"Відкривання посилань"</string>
     <string name="domain_urls_summary_none" msgid="2639588015479657864">"Не відкривати підтримувані посилання"</string>
     <string name="domain_urls_summary_one" msgid="3704934031930978405">"Відкривати <xliff:g id="DOMAIN">%s</xliff:g>"</string>
     <string name="domain_urls_summary_some" msgid="3950089361819428455">"Відкрити сайт <xliff:g id="DOMAIN">%s</xliff:g> та інші URL-адреси"</string>
@@ -3144,7 +3141,7 @@
     <string name="choose_voice_input_title" msgid="975471367067718019">"Вибрати голосовий ввід"</string>
     <string name="default_browser_title" msgid="8101772675085814670">"Додаток веб-переглядача"</string>
     <string name="default_browser_title_none" msgid="2124785489953628553">"Немає веб-переглядача за умовчанням"</string>
-    <string name="default_phone_title" msgid="282005908059637350">"Телефонний додаток"</string>
+    <string name="default_phone_title" msgid="282005908059637350">"Додаток для дзвінків"</string>
     <string name="default_app" msgid="6864503001385843060">"(За умовчанням)"</string>
     <string name="system_app" msgid="9068313769550747372">"(Система)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(За умовчанням)"</string>
@@ -3278,9 +3275,9 @@
     <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_trusted" msgid="6857780460845250885">"Так"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Ні"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Дозволити встановлювати додатки"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Дозволено"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Заборонено"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Камера: двічі натиснути кнопку живлення"</string>
@@ -3470,11 +3467,12 @@
     <string name="page_tab_title_support" msgid="6330657582897417458">"Підтримка"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"Точок: <xliff:g id="ID_1">%d</xliff:g>"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"Найменша ширина"</string>
-    <string name="premium_sms_none" msgid="8268105565738040566">"Установлені додатки не запитували доступ до платних SMS"</string>
+    <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_connected_summary" msgid="8733997010923307915">"З’єднано з пристроєм"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Швидкі налаштування блоку розробника"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Ми готові допомогти"</string>
@@ -3544,13 +3542,13 @@
     <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>
-    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Як змінити камеру"</string>
+    <string name="double_twist_for_camera_mode_title" msgid="4877834147983530479">"Змінити камеру"</string>
     <string name="double_twist_for_camera_mode_summary" msgid="122977081337563340"></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="2521630136233865893">"Щоб швидко переглянути сповіщення, двічі торкніться екрана."</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="8696432220086951466">"Щоб швидко переглянути сповіщення, візьміть телефон у руки."</string>
@@ -3674,7 +3672,7 @@
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"Пам’ять телефона"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
     <string name="storage_volume_total" msgid="3499221850532701342">"Використовується з <xliff:g id="TOTAL">%1$s</xliff:g>"</string>
-    <string name="storage_percent_full" msgid="6095012055875077036">"викор."</string>
+    <string name="storage_percent_full" msgid="6095012055875077036">"зайнято"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"Очистити дані додатка"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"Видалити цей додаток із миттєвим запуском?"</string>
     <string name="game_storage_settings" msgid="3410689937046696557">"Ігри"</string>
@@ -3683,7 +3681,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(вимкнено для користувача <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Служба автозаповнення"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"автоматично, заповнювати, автозаповнення"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Зробити <xliff:g id="APP_NAME_0">%1$s</xliff:g> додатком автозаповнення? Додаток <xliff:g id="APP_NAME_1">%1$s</xliff:g> зможе зчитувати дані з екрана й заповнювати поля в інших додатках."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Переконайтеся, що додаток надійний&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Функція Автозаповнення Google&gt;%1$s&lt;/xliff:g&gt; використовує інформацію на екрані, щоб визначати поля для автозаповнення."</string>
     <string name="device_theme" msgid="4571803018917608588">"Тема пристрою"</string>
     <string name="default_theme" msgid="7085644992078579076">"За умовчанням"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Диспетчер пам’яті: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index e7f9b2f..5d159c7 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"کوئی نہیں"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'‎"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"کوئی نہیں"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 282edf0..e3c58c1 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"اکاؤنٹس"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"مقام"</string>
     <string name="account_settings_title" msgid="626177544686329806">"اکاؤنٹس"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"سیکیورٹی اور مقام"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"مرموز کاری اور اسناد"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"فون مرموز کیا گيا"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"فون مرموز کیا گيا"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"مقفل اسکرین کی ترجیحات"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"‏میرا مقام، اسکرین اَن لاک، SIM کارڈ لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"میرا مقام، اسکرین ان لاک، اسناد کے اسٹوریج کا لاک سیٹ کریں"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"رازداری"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"منتظم کی طرف سے غیر فعال کردہ"</string>
     <string name="security_status_title" msgid="5848766673665944640">"سیکیورٹی کی صورتحال"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"فنگر پرنٹس کا نظم کریں"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"فنگر پرنٹ استعمال کریں برائے"</string>
@@ -570,7 +569,7 @@
     <string name="lockpattern_tutorial_cancel_label" msgid="6431583477570493261">"منسوخ کریں"</string>
     <string name="lockpattern_tutorial_continue_label" msgid="3559793618653400434">"اگلا"</string>
     <string name="lock_setup" msgid="3355847066343753943">"سیٹ اپ مکمل ہو گیا ہے۔"</string>
-    <string name="manage_device_admin" msgid="537804979483211453">"آلہ کے منتظم کی ایپس"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"آلہ کے نظم و نسق کی ایپس"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"کوئی فعال ایپ نہیں"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> فعال ایپس</item>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"‏Wi‑Fi اسکیننگ آف ہونے کی وجہ سے Wi-Fi ویک اپ دستیاب نہیں ہے"</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>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"‏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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"سب نیٹ ماسک"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"‏IPv6  پتے"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"محفوظ کردہ نیٹ ورکس"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"‏IP ترتیبات"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"‏اس صارف کیلئے Wi‑Fi کی اعلی ترتیبات دستیاب نہیں ہیں"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"آف"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"فون ڈاک کیے ہونے اور/یا سوئے ہوئے ہونے کے دوران کیا ہو اسے کنٹرول کرنے کیلئے، اسکرین سیور آن کریں۔"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"وقت آغاز"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"موجودہ اسکرین سیور"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"ابھی شروع کریں"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"ترتیبات"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"خود کار چمک"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"جگانے کیلئے اٹھائیں"</string>
-    <string name="doze_title" msgid="5389406335828323273">"آنے والی اطلاع کی اسکرین"</string>
+    <string name="doze_title" msgid="2259176504273878294">"ایمبی اینٹ ڈسپلے"</string>
     <string name="doze_summary" msgid="3846219936142814032">"اطلاعات موصول ہونے پر اسکرین کو جگائیں"</string>
     <string name="title_font_size" msgid="4405544325522105222">"فونٹ سائز"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"متن کو چھوٹا یا بڑا کریں"</string>
@@ -1316,24 +1313,24 @@
     <string name="master_clear_progress_text" msgid="6559096229480527510">"براہ کرم انتظار کریں…"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"کال کی ترتیبات"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"‏صوتی میل، کال فاورڈنگ، کال ویٹنگ، کالر ID کو ترتیب دیں"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB مربوط کرنا"</string>
+    <string name="tether_settings_title_usb" msgid="6688416425801386511">"‏USB ٹیتھرنگ"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"پورٹیبل ہاٹ اسپاٹ"</string>
-    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ مربوط کرنا"</string>
-    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"مربوط کرنا"</string>
+    <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ ٹیتھرنگ"</string>
+    <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ٹیتھرنگ"</string>
     <string name="tether_settings_title_all" msgid="3058586928118801157">"ہاٹ اسپاٹ اور ٹیتھرنگ"</string>
-    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ، ربط بنانا  آن ہے"</string>
+    <string name="tether_settings_summary_hotspot_on_tether_on" msgid="930464462687425777">"ہاٹ اسپاٹ آن، ٹیتھرنگ"</string>
     <string name="tether_settings_summary_hotspot_on_tether_off" msgid="3473671453891735907">"ہاٹ اسپاٹ آن ہے"</string>
-    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ربط بنانا آن ہے"</string>
+    <string name="tether_settings_summary_hotspot_off_tether_on" msgid="1618256180720077354">"ٹیتھرنگ"</string>
     <string name="tether_settings_disabled_on_data_saver" msgid="1576908608463904152">"ڈیٹا سیور آن ہوتے ہوئے ربط نہیں بنایا جا سکتا یا پورٹیبل ہاٹ اسپاٹس استعمال نہیں ہو سکتے"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB مربوط کرنا"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"‏USB ٹیتھرنگ"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"‏USB مربوط ہو گیا، ربط بنانے کیلئے چیک کریں"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"مربوط"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="8427089411146908205">"‏USB اسٹوریج زیر استعمال ہونے پر ربط نہیں بنا سکتا"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"‏USB مربوط نہیں ہے"</string>
     <string name="usb_tethering_turnon_subtext" msgid="4748616058219273033">"آن کرنے کیلئے مربوط کریں"</string>
-    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"‏USB مربوط کرنے کی خرابی"</string>
-    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"بلوٹوتھ مربوط کرنا"</string>
+    <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"‏USB ٹیتھرنگ کی خرابی"</string>
+    <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"بلوٹوتھ ٹیتھرنگ"</string>
     <string name="bluetooth_tethering_available_subtext" product="tablet" msgid="2092766774943506688">"اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک کر رہا ہے"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="313873759999970236">"اس فون کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے اشتراک کر رہا ہے"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="6388191062495199481">"اس ٹیبلیٹ کے انٹرنیٹ کنکشن کا بلوٹوتھ کے ذریعے 1 آلے سے اشتراک کیا جا رہا ہے"</string>
@@ -1431,7 +1428,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"‏اپنے PIN کی توثیق کریں"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"پاس ورڈز مماثل نہیں ہیں"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"‏PINs مماثل نہیں ہیں"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"انتخاب کو غیر مقفل کریں"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"غیر مقفل کرنے کیلئے انتخاب"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"پاس ورڈ سیٹ کر دیا گیا ہے"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"‏PIN سیٹ کر دیا گیا ہے"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"پیٹرن سیٹ کر دیا گیا ہے"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(کبھی استعمال نہیں ہوا)"</string>
@@ -1676,7 +1674,7 @@
     <string name="hardkeyboard_category" msgid="5957168411305769899">"فزیکل کی بورڈ کی ترتیبات"</string>
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"\".\" کو داخل کرنے کیلئے اسپیس کلید کو دو بار دبائیں"</string>
     <string name="show_password" msgid="4837897357002495384">"پاس ورڈ دکھائیں"</string>
-    <string name="show_password_summary" msgid="3365397574784829969">"آپ کے ٹائپ کرتے وقت حروف کو اختصار کے ساتھ ڈسپلے کریں"</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_quick_settings" msgid="246728645150092058">"ترتیبات"</string>
     <string name="spellchecker_language" msgid="6041050114690541437">"زبان"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"کی بورڈ شارٹ کٹس کا مددگار"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"دستیاب شارٹ کٹس ڈسپلے کریں"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"ڈیفالٹ"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"ماؤس/ٹریک پیڈ"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"پوائنٹر کی رفتار"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"گیم کنٹرولر"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"وائبریٹر استعمال کریں"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"مکمل چارج کے بعد سے اسکرین کا استعمال"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"اسکرین کی کھپت"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"موبائل نیٹ ورک اسکیننگ"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> قبل"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"مکمل چارج کے بعد سے ایپ کا استعمال (<xliff:g id="TIME">%1$s</xliff:g> قبل)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> قبل"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"مکمل چارج کے بعد سے ایپ کا استعمال (<xliff:g id="TIME">^1</xliff:g> قبل)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"مکمل چارج کے بعد سے اسکرین آن ہونے کے وقت کی مقدار"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"مکمل چارج کے بعد سے آلہ کا استعمال"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"پلگ ہٹانے کے بعد سے بیٹری کا استعمال"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"کیمرا"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"بلوٹوتھ"</string>
-    <string name="power_cell" msgid="6596471490976003056">"سیل اسٹینڈ بائی"</string>
+    <string name="power_cell" msgid="3392999761958982492">"موبائل نیٹ ورک اسٹینڈ بائی"</string>
     <string name="power_phone" msgid="5392641106474567277">"صوتی کالز"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"ٹیبلٹ معطل ہے"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"فون معطل"</string>
@@ -2007,13 +2004,13 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"بیٹری کا استعمال پاور کے استعمال کا ایک تخمینہ ہوتا ہے اور اس میں بیٹری ڈرین کا ہر ماخذ شامل نہیں ہوتا ہے۔ متفرق شمار کردہ پاور کے تخمینی استعمال اور بیٹری پر مشاہدہ کردہ اصل ڈرین کے درمیان فرق ہوتا ہے۔"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"پاور کا ضرورت سے زیادہ استعمال"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"‏%1$s کیلئے استعمال کیا گيا"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"<xliff:g id="TIME">^1</xliff:g> کیلئے استعمال کیا گیا"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> کے ذریعے <xliff:g id="PERCENT">%1$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_detail_foreground" msgid="3350401514602032183">"فعال کے استعمال کے دوران"</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>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"‏مجموعی ایپ کے استعمال میں سے <xliff:g id="PERCENT">%1$s</xliff:g> (mAh<xliff:g id="POWER">%2$d</xliff:g>)"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"صوتی ان پٹ اور آؤٹ پٹ کی ترتیبات"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"صوتی تلاش"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"‏Android کی بورڈ"</string>
-    <string name="voice_category" msgid="1430370497125803904">"اسپیچ"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"صوتی ان پٹ کی ترتیبات"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"صوتی ان پٹ"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"صوتی  ان پٹ سروسز"</string>
@@ -2169,7 +2165,7 @@
     <string name="remove_device_admin" msgid="9207368982033308173">"اس آلہ کے منتظم کی ایپ غیر فعال کریں"</string>
     <string name="uninstall_device_admin" msgid="271120195128542165">"ایپ کو اَن انسٹال کریں"</string>
     <string name="remove_and_uninstall_device_admin" msgid="3837625952436169878">"غیر فعال اور اَن انسٹال کریں"</string>
-    <string name="select_device_admin_msg" msgid="7347389359013278077">"آلہ کے منتظم کی ایپس"</string>
+    <string name="select_device_admin_msg" msgid="7347389359013278077">"آلہ کے نظم و نسق کی ایپس"</string>
     <string name="no_device_admins" msgid="4846602835339095768">"آلہ کے منتظم کی کوئی ایپ دستیاب نہیں ہے"</string>
     <string name="personal_device_admin_title" msgid="2849617316347669861">"ذاتی"</string>
     <string name="managed_device_admin_title" msgid="7853955652864478435">"دفتر"</string>
@@ -2729,6 +2725,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"اطلاع کا والیوم"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"فون رنگ ٹون"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"اطلاع کی ڈیفالٹ آواز"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"ایپ کی فراہم کردہ آواز"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"اطلاع کی ڈیفالٹ آواز"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"الارم کی ڈیفالٹ آواز"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"کالز کیلئے وائبریٹ بھی کرے"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"دیگر آوازیں"</string>
@@ -2790,6 +2788,7 @@
     <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="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_blocked" msgid="7938180808339386300">"کبھی اطلاعات نہ دکھائیں"</string>
@@ -2797,10 +2796,10 @@
     <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_min_summary" msgid="8233873580287975662">"کم: کوئی آواز یا بصری مداخلت نہیں ہے"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"متوسط: کوئی آواز نہیں ہے"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"زیادہ: آواز نکالیں"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"فوری: آواز نکالیں اور اسکرین پر پاپ کریں"</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="6585849855452076626">"آواز کی اجازت دیں"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"آواز نہ نکالیں، وائبریٹ نہ کریں اور ان اطلاعات کو موجودہ اسکرین پر نہ دکھائیں۔"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"اطلاع کا معاون"</string>
@@ -2834,6 +2833,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"ڈسٹرب نہ کریں تک رسائی"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"کسی انسٹال کردہ ایپس نے ڈسٹرب نہ کریں تک رسائی کی درخواست نہیں کی ہے"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"ایپس لوڈ ہو رہی ہیں…"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"‏Android اس ایپ کی اطلاعات کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"‏Android اطلاعات کے اس زمرے کو اس آلہ پر ظاہر ہونے سے مسدود کررہا ہے"</string>
     <string name="notification_channels" msgid="5346841743182627500">"زمرے"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"دیگر"</string>
     <string name="no_channels" msgid="3077375508177744586">"اس ایپ نے کوئی اطلاعات شائع نہیں کیا ہے"</string>
@@ -2967,18 +2968,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"موجودہ سمت بندی میں رہیں"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"محفوظ آغاز"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"جاری رکھیں"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"‏آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"‏اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی فنگر پرنٹ استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"‏آلہ شروع کرنے کیلئے PIN کا تقاضہ کریں"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"آلہ شروع کرنے کیلئے پیٹرن کا تقاضہ کریں"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"آلہ شروع کرنے کیلئے پاس ورڈ کا تقاضہ کریں"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"نہیں شکریہ"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"نہیں شکریہ"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"نہیں شکریہ"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"‏آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے PIN طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پیٹرن طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"آپ یہ آلہ شروع ہونے سے پہلے اپنے پاسورڈ کا تقاضہ کر کے، اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا ہے۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پاسورڈ طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"‏اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے PIN کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع ہونے سے پہلے PIN طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پیٹرن کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پیٹرن طلب کریں؟"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"اپنے آلہ کو غیر مقفل کرنے کیلئے اپنی انگلی کا نشان استعمال کرنے کے علاوہ، آپ یہ آلہ شروع ہونے سے پہلے اپنے پاس ورڈ کا تقاضہ کر کے اسے مزید محفوظ بنا سکتے ہیں۔ جب تک آلہ شروع نہیں ہو جاتا ہے، یہ الارمز سمیت، کالیں، پیغامات یا اطلاعات موصول نہیں کر سکتا۔\n\nاس سے گمشدہ یا چوری ہوئے آلات پر ڈیٹا کی حفاظت کرنے میں مدد ملتی ہے۔ آپ کا آلہ شروع کرنے سے پہلے پاسورڈ طلب کریں؟"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"ہاں"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"نہیں"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"‏PIN درکار ہے؟"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"پیٹرن درکار ہے؟"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"پاس ورڈ درکار ہے؟"</string>
@@ -3134,7 +3131,7 @@
     <string name="background_check_pref" msgid="7550258400138010979">"پس منظر کی جانچ"</string>
     <string name="background_check_title" msgid="4534254315824525593">"پس منظر تک مکمل رسائی"</string>
     <string name="assist_access_context_title" msgid="2269032346698890257">"سکرین سے متن استعمال کریں"</string>
-    <string name="assist_access_context_summary" msgid="1991421283142279560">"معاون ایپ کو سکرین مشمولات بطور متن تک رسائی کرنے کی اجازت دیں"</string>
+    <string name="assist_access_context_summary" msgid="1991421283142279560">"معاون ایپ کو سکرین مشمولات تک بطور متن رسائی کرنے کی اجازت دیں"</string>
     <string name="assist_access_screenshot_title" msgid="4034721336291215819">"اسکرین شاٹ استعمال کریں"</string>
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"معاون ایپ کو اسکرین کی ایک تصویر تک رسائی کرنے کی اجازت دیں"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"اسکرین فلیش کریں"</string>
@@ -3202,9 +3199,9 @@
     <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_trusted" msgid="6857780460845250885">"ہاں"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"نہیں"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"ایپ انسٹالز کو اجازت دیں"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"اجازت ہے"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"اجازت نہیں ہے"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"کیمرا کیلئے پاور بٹن دو بار دبائیں"</string>
@@ -3339,7 +3336,7 @@
     <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="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>
@@ -3371,7 +3368,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"کوئی نہیں"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"رینکنگ آبجیکٹ غائب ہے۔"</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"یہ کلید رینکنگ آبجیکٹ میں موجود نہیں ہے۔"</string>
-    <string name="special_access" msgid="3458780842491881155">"خاص ایپ کی رسائی"</string>
+    <string name="special_access" msgid="3458780842491881155">"ایپ کی خاص رسائی"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ایپس غیر محدود ڈیٹا کا استعمال کر سکتی ہیں</item>
       <item quantity="one">1 ایپ غیر محدود ڈیٹا کا استعمال کر سکتی ہے</item>
@@ -3383,14 +3380,15 @@
     <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="6330657582897417458">"سپورٹ"</string>
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"سب سے چھوٹی چوڑائی"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"‏کسی انسٹال کردہ ایپ نے پریمیم SMS تک رسائی کی درخواست نہیں کی"</string>
     <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_connected_summary" msgid="8733997010923307915">"اس سے منسلک"</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>
@@ -3466,7 +3464,7 @@
     <string name="ambient_display_pickup_summary" product="default" msgid="8696432220086951466">"اپنی اطلاعات فوری طور پر چیک کرنے کیلئے، اپنا فون اٹھائیں۔"</string>
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"اپنی اطلاعات فوری طور پر چیک کرنے کیلئے، اپنا ٹیبلیٹ اٹھائیں۔"</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"اپنی اطلاعات فوری طور پر چیک کرنے کیلئے، اپنا آلہ اٹھائیں۔"</string>
-    <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"اطلاعات کیلئے فنگر پرنٹ سوائپ کریں"</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>
@@ -3579,7 +3577,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(صارف کے لیے غیر فعال ہوگیا <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"آٹو فل سروس"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"آٹو، فل، آٹو فل"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> کو اپنا آٹو فل ایپ بنائيں؟ <xliff:g id="APP_NAME_1">%1$s</xliff:g> آپ کے اسکرین کو پڑھنے اور دوسرے ایپس میں فیلڈز کو بھرنے کے لائق ہوجائے گا۔"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"‏&lt;b&gt;یہ یقینی بنائیں کہ آپ کو اس ایپ پر اعتماد ہے&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;  آٹو فل کی جانے والی چیزوں کی تعیین کرنے کیلئے آپ کی اسکرین پر موجود چیزوں کو استعمال کرتا ہے۔"</string>
     <string name="device_theme" msgid="4571803018917608588">"آلہ کا تھیم"</string>
     <string name="default_theme" msgid="7085644992078579076">"ڈیفالٹ"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"اسٹوریج مینیجر: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index edca660..e43e78b 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -67,7 +67,7 @@
   </string-array>
   <string-array name="wifi_status">
     <item msgid="1922181315419294640"></item>
-    <item msgid="8934131797783724664">"Tekshirib chiqilmoqda…"</item>
+    <item msgid="8934131797783724664">"Qidiruv…"</item>
     <item msgid="8513729475867537913">"Ulanmoqda…"</item>
     <item msgid="515055375277271756">"Tasdiqdan o‘tilmoqda…"</item>
     <item msgid="1943354004029184381">"IP manzil o‘zlashtirilmoqda…"</item>
@@ -81,7 +81,7 @@
   </string-array>
   <string-array name="wifi_status_with_ssid">
     <item msgid="7714855332363650812"></item>
-    <item msgid="8878186979715711006">"Tekshirilmoqda…"</item>
+    <item msgid="8878186979715711006">"Qidiruv…"</item>
     <item msgid="355508996603873860">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> tarmog‘iga ulanilmoqda…"</item>
     <item msgid="554971459996405634">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> bilan aloqa o‘rnatilyapti…"</item>
     <item msgid="7928343808033020343">"<xliff:g id="NETWORK_NAME">%1$s</xliff:g> IP manzil beryapti…"</item>
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Hech biri"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Yo‘q"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index ff9fcfe..e0015d4 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -235,7 +235,7 @@
     <string name="sdcard_settings_scanning_status" product="default" msgid="2763464949274455656">"SD kartada media ma‘lumotlar borligi tekshirilmoqda..."</string>
     <string name="sdcard_settings_read_only_status" product="nosdcard" msgid="3624143937437417788">"USB xotirasi faqat o‘qish uchun ulangan."</string>
     <string name="sdcard_settings_read_only_status" product="default" msgid="4518291824764698112">"SD xotira kartasi faqat o‘qish uchun ulangan."</string>
-    <string name="skip_label" msgid="47510779345218297">"O‘tkazib yuborish"</string>
+    <string name="skip_label" msgid="47510779345218297">"Tashlab ketish"</string>
     <string name="next_label" msgid="4693520878012668114">"Keyingisi"</string>
     <string name="language_picker_title" msgid="3596315202551687690">"Tillar"</string>
     <string name="pref_title_lang_selection" msgid="2014920136978776034">"Til sozlamalari"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Hisoblar"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Joylashuv"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Hisoblar"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Xavfsizlik va joylashuv"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Shifrlash va hisob ma’lumotlari"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Telefon shifrlangan"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Telefon shifrlangan"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Ekran qulfi parametrlari"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Joylashuv va xavfsizlik sozlamalari"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Mening joylashuvim, ekran qulfi, hisob ma‘lumotlari omborini qulflash sozlamalari"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Maxfiylik"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Administrator tomonidan o‘chirilgan"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Xavfsizlik holati"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Ekran qulfi, barmoq izi"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Ekran qulfi"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Barmoq izi"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Barmoq izlari"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Barmoq izi sozlamalari"</string>
@@ -360,7 +359,7 @@
     <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"Telefonni qulfdan chiqarish, xaridlarni amalga oshirish yoki ilovalarga kirish uchun shunchaki barmoq izi skaneriga tegining. Telefoningizga qo‘shilgan har qanday barmoq izi yordamida bularni bajarish mumkin, shuning uchun ehtiyot undan bo‘lib foydalaning.\n\nEslatma: Barmoq izining himoya darajasi chizmali kalit yoki PIN kodnikidek emas."</string>
     <string name="security_settings_fingerprint_enroll_introduction_cancel" msgid="3199351118385606526">"Bekor qilish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue" msgid="7472492858148162530">"Davom etish"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"O‘tkazib yuborish"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_cancel_setup" msgid="5021369420474432665">"Tashlab ketish"</string>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"Barmoq izi qo‘shish"</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"Qurilmani himoyalash funksiyalari faollashmaydi. Agar planshetingiz yo‘qolsa, o‘g‘irlansa yoki ma’lumotlari tozalab tashlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
     <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"Qurilmani himoyalash funksiyalari faollashtirilmaydi. Agar qurilmangiz yo‘qolsa, o‘g‘irlansa yoki ma’lumotlari tozalab tashlansa, siz boshqalarning undan foydalanishiga to‘sqinlik qila olmaysiz."</string>
@@ -446,7 +445,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 qo‘shimcha usulni ham tanlang."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"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>
@@ -666,16 +665,16 @@
     <string name="wifi_ask_enable" msgid="2795469717302060104">"<xliff:g id="REQUESTER">%s</xliff:g> ilovasi Wi-Fi tarmog‘ini yoqmoqchi"</string>
     <string name="wifi_ask_disable" msgid="728366570145493573">"<xliff:g id="REQUESTER">%s</xliff:g> ilovasi Wi-Fi tarmog‘ini o‘chirib qo‘ymoqchi"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Planshet boshqa qurilma bilan o‘zaro bog‘langanida ma’lumot almashishga ruxsat berish"</string>
-    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Telefon boshqa qulilmaga tekkizilganda ma‘lumotlar almashinishiga ruxsat berish"</string>
+    <string name="nfc_quick_toggle_summary" product="tablet" msgid="8302974395787498915">"Planshet boshqa qurilmaga tekkizilganda axborot almashinuviga ruxsat berish"</string>
+    <string name="nfc_quick_toggle_summary" product="default" msgid="5237208142892767592">"Telefon boshqa qurilmaga tekkizilganda axborot almashinuviga ruxsat berish"</string>
     <string name="nfc_disclaimer_title" msgid="4364003873202264039">"NFC funksiyasini yoqish"</string>
     <string name="nfc_disclaimer_content" msgid="5566907911915158075">"NFC yordamida bu qurilma boshqa qurilmalar bilan yoki yaqin-atrofdagi obyektlar, jumladan, to‘lov terminallari, ruxsat uchun ma’lumotlarni o‘qish qurilmalari, interfaol reklamalar va teglar bilan ma’lumotlar almashadi."</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
-    <string name="android_beam_on_summary" msgid="3618057099355636830">"Ilova kontentini NFC orqali uzatib berishga tayyor"</string>
+    <string name="android_beam_on_summary" msgid="3618057099355636830">"NFC orqali axborot almashish"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"O‘chiq"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"NFC o‘chiqligi tufayli bajarilmadi"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"Ushbu xususiyat yoqilganda NFC bilan ishlay oladigan boshqa qurilmani yaqin ushlab, unga nur orqali ma’lumot uzatishingiz mumkin. Masalan, veb-sahifalar, YouTube videolari, kontaktlar va boshqa ko‘pgina narsalarni.\n\nQurilmalarni birgalikda (odatda orqama-orqa) ushlang va keyin ekranni bosing. Ilova nima olish kerakliligini aniqlaydi."</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"Bu funksiya qurilmalarni bir-biriga tekkizib, axborot almashish imkonini beradi. Deyarli hamma narsani, jumladan, kontaktlar, veb-sahifa va videolarni uzatish mumkin.\n\nQurilmalarni bir-biriga (odatda, orqama-orqa qilib) yaqinlashtiring va keyin ekran ustiga bosing. Nimani yuborish mumkinligini ilova aniqlaydi."</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"Wi‑Fi"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"Wi‑Fi‘ni yoqish"</string>
     <string name="wifi_settings" msgid="29722149822540994">"Wi‑Fi"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Yuqori sifatli ochiq tarmoqlar haqida xabar qilinsin"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Wi‑Fi tarmoqni avtomatik yoqish"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Saqlab olingan tarmoqlar (m-n, uy) ichidan signali yaxshisi chiqsa, Wi-Fi qayta yoqilsin"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi tarmoqlarni qidirish o‘chiqligi uchun ishlamaydi"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Sifatsiz ulanishdan chetlashish"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Internet aloqasi yomon bo‘lsa, Wi-Fi tarmog‘iga ulanilmasin"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Faqat kuchli signalga ega tarmoqlardan foydalanilsin"</string>
@@ -766,7 +766,7 @@
     <string name="wifi_eap_identity" msgid="4359453783379679103">"Nom"</string>
     <string name="wifi_eap_anonymous" msgid="2989469344116577955">"Anonim nom"</string>
     <string name="wifi_password" msgid="5948219759936151048">"Parol"</string>
-    <string name="wifi_show_password" msgid="6461249871236968884">"Parol ko‘rsatilsin"</string>
+    <string name="wifi_show_password" msgid="6461249871236968884">"Parol berkitilmasin"</string>
     <string name="wifi_ap_band_config" msgid="1611826705989117930">"Wi-Fi chastotalari diapazoni"</string>
     <string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GGs"</string>
     <string name="wifi_ap_choose_5G" msgid="8137061170937978040">"5 GGs"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Wi‑Fi tarmog‘ini sozlash"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Quyi tarmoq niqobi"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 manzillar"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Saqlangan tarmoqlar"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP sozlamalari"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Ushbu foydalanuvchi Wi-Fi kengaytirilgan sozlamalaridan foydalana olmaydi"</string>
@@ -1001,7 +999,7 @@
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Quyosh chiqishi bilan avtomatik o‘chirib qo‘yiladi."</string>
     <string name="screen_timeout" msgid="4351334843529712571">"Uyqu rejimi"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Ekranning o‘chishi"</string>
-    <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan so‘ng"</string>
+    <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> harakatsizlikdan keyin"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fon rasmi"</string>
     <string name="wallpaper_settings_summary_default" msgid="3395741565658711416">"Standart"</string>
     <string name="wallpaper_settings_summary_custom" msgid="515035303981687172">"Maxsus"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"O‘chiq"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Telefon dok-stansiyaga ulanganda yoki uyqu rejimiga o‘tganida uning ekranida nima ko‘rinishini sozlash uchun ekran lavhasini yoqing."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Qachon boshlansin"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Joriy ekran lavhasi"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Hozir yoqish"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Sozlamalar"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Avtomatik yorqinlik"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Tik holatda faollashtirish"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Kiruvchi bildirishnoma ekrani"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Sezgir ekran"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bildirishnoma kelganda ekran yonadi"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Shrift o‘lchami"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Matnni kattalashtirish yoki kichiklashtirish"</string>
@@ -1034,10 +1031,10 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM-kartani qulflash"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"SIM kartani qulflash"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"Planshetdan foydalanish uchun PIN-kod so‘raladi"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Telefondan foydalanish uchun PIN-kod so‘raladi"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"Telefonni yoqishda PIN kod talab qilinadi"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"Planshetdan foydalanish uchun PIN-kod so‘raladi"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Telefondan foydalanish uchun PIN-kod so‘raladi"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"SIM kartaning PIN kodini o‘zgartirish"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"Telefonni yoqishda PIN kod talab qilinadi"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"SIM karta PIN kodini almashtirish"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM karta PIN kodi"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"SIM kartani qulflash"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"SIM karta qulfini ochish"</string>
@@ -1069,7 +1066,7 @@
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"Tizimni yangilash"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
     <string name="firmware_version" msgid="4801135784886859972">"Android versiyasi"</string>
-    <string name="security_patch" msgid="8438384045870296634">"Xavfsizlik tizimi yangilanishi"</string>
+    <string name="security_patch" msgid="8438384045870296634">"Tizim xavfsizligi uchun yangilanish"</string>
     <string name="model_info" msgid="1952009518045740889">"Model"</string>
     <string name="hardware_info" msgid="2605080746512527805">"Model va apparat ta’minoti"</string>
     <string name="hardware_revision" msgid="8893547686367095527">"Apparat versiyasi"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"Tizim"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="8907101974576694793">"Boshqa fayllarga ilovalar tomonidan saqlangan umumiy fayllar, Internetdan yuklab olingan yoki Bluetooth orqali olingan fayllar, Android fayllari va boshqalar kiradi. \n\nUshbu SD karta (<xliff:g id="NAME">^1</xliff:g>) ichidagi narsalarni ko‘rish uchun “Ko‘rib chiqish” tugmasini bosing."</string>
-    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Tizim o‘zi ichiga <xliff:g id="VERSION">%s</xliff:g> versiyali Android tizimini ishga tushirishga mo‘ljallangan fayllarni oladi"</string>
+    <string name="storage_detail_dialog_system" msgid="862835644848361569">"Tizim rukniga Android <xliff:g id="VERSION">%s</xliff:g> uchun zarur fayllar kiradi"</string>
     <string name="storage_detail_dialog_user" msgid="3267254783294197804">"<xliff:g id="USER_0">^1</xliff:g> <xliff:g id="SIZE">^2</xliff:g> surat, musiqa, ilova yoki boshqa ma’lumotlarni saqlagan bo‘lishi mumkin. \n\nTafsilotlarni ko‘rish uchun <xliff:g id="USER_1">^1</xliff:g> profiliga o‘ting."</string>
     <string name="storage_wizard_init_title" msgid="5085400514028585772">"<xliff:g id="NAME">^1</xliff:g> kartasini sozlang"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"Ko‘chma xotira sifatida foydalanish"</string>
@@ -1240,7 +1237,7 @@
     <string name="battery_level_title" msgid="2965679202786873272">"Batareya quvvati darajasi"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Ulanish nuqtasini tahrirlash"</string>
-    <string name="apn_not_set" msgid="4974192007399968164">"Ko‘rsatilmagan"</string>
+    <string name="apn_not_set" msgid="4974192007399968164">"Kiritilmagan"</string>
     <string name="apn_name" msgid="4115580098369824123">"Nomi"</string>
     <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"Proksi"</string>
@@ -1361,17 +1358,17 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"Tarmoq ulanishlarini boshqarish uchun “<xliff:g id="NEW_APP">%s</xliff:g>” ilovasidan foydalanilsinmi?"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Noma’lum uyali aloqa operatori"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"<xliff:g id="OPERATOR">%1$s</xliff:g> operatorida sinxronlash uchun sayti yo‘q"</string>
-    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Iltimos, SIM kartani joylashtirib, qurilmani ochirib-yoqing"</string>
+    <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM karta solib, qurilmani qayta ishga tushiring"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Iltimos, Internetga ulaning"</string>
     <string name="location_title" msgid="1029961368397484576">"Mening joylashuvim"</string>
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Ishchi profil joyi"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Rejim"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Yuqori aniqlik"</string>
     <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Batareya quvvatini tejash"</string>
-    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Faqat qurilma bo‘yicha"</string>
+    <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Faqat qurilma asosida"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Joylashuv xizmati o‘chiq"</string>
-    <string name="location_app_level_permissions" msgid="1825588230817081339">"Ilova ruxsatnomalari"</string>
-    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"So‘nggi joylashuv axboroti so‘rovlari"</string>
+    <string name="location_app_level_permissions" msgid="1825588230817081339">"Ilovalar uchun ruxsatlar"</string>
+    <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Joylashuv axboroti so‘rovlari"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Hech qanday ilova yaqin vaqtda joylashuv ma‘lumotini so‘ramadi"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Joylashuv axboroti xizmatlari"</string>
     <string name="location_high_battery_use" msgid="517199943258508020">"Yuqori batareya sarfi"</string>
@@ -1380,7 +1377,7 @@
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Joylashuvni aniqlash uchun GPS, Wi-Fi, Bluetooth  yoki mobil tarmoqlardan foydalanish"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Joylashuvni aniqlash uchun Wi-Fi, Bluetooth yoki mobil tarmoqlardan foydalanish"</string>
     <string name="location_mode_sensors_only_description" msgid="788127681455735699">"Joylashuvni GPS yordamida aniqlash"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Joylashuvni aniqlash"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"Qidiruv"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi orqali aniqlash"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"Joylashuv axboroti aniq bo‘lishi uchun tizimga oid ilova va xizmatlarga xohlagan vaqtda yaqin-atrofdagi Wi-Fi tarmoqlarini qidirishiga ruxsat bering."</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"Bluetooth orqali aniqlash"</string>
@@ -1489,7 +1486,7 @@
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"Qurilmaning qulflash usulidan foydalanish"</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Ilovalar boshqaruvi"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"O‘rnatilgan ilovlarni boshqarish yoki o‘chirish"</string>
-    <string name="applications_settings" msgid="5281808652705396152">"Ilova haqida"</string>
+    <string name="applications_settings" msgid="5281808652705396152">"Ilovalar haqida"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"Ilovalarni boshqarish, tez ishga tushirish yorliqlarini sozlash"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"Ilova sozlamalari"</string>
     <string name="install_applications" msgid="4872012136210802181">"Noma’lum manbalar"</string>
@@ -1523,7 +1520,7 @@
     <string name="uninstall_text" msgid="3644892466144802466">"O‘chirib tashlash"</string>
     <string name="uninstall_all_users_text" msgid="851857393177950340">"Ilovani barcha foydalanuvchilar uchun ochirib yuborish"</string>
     <string name="install_text" msgid="884360662922471113">"O‘rnatish"</string>
-    <string name="disable_text" msgid="6544054052049395202">"O‘chirib qo‘yish"</string>
+    <string name="disable_text" msgid="6544054052049395202">"Faolsizlantirish"</string>
     <string name="enable_text" msgid="9217362512327828987">"Yoqish"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"Ma’lumotlarni tozalash"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"Yangilanishlarni o‘chirish"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Do‘kon"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Ilova haqida"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Ilova <xliff:g id="APP_STORE">%1$s</xliff:g> orqali o‘rnatilgan"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Batafsil axborot: <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Ilova operatsiyalari"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Ishlamoqda"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Foydalanilmagan)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Tezkor tugmalar yordamchisi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Tezkor tugmalarni ko‘rsatish"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Standart"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Sichqoncha va sensorli panel"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Kursor tezligi"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"O‘yin qurilmasi"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Tebrangichdan foydalanish"</string>
@@ -1743,13 +1740,13 @@
     <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>k <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>"</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>daq"</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>daq"</string>
-    <string name="battery_history_minutes_no_seconds" msgid="7780294302606853082">"<xliff:g id="MINUTES">%1$d</xliff:g>daq"</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>
@@ -1888,7 +1885,7 @@
     <string name="print_menu_item_add_printer" msgid="8251218970577291032">"Printer qo‘shish"</string>
     <string name="print_menu_item_search" msgid="7025589328240514553">"Qidiruv"</string>
     <string name="print_searching_for_printers" msgid="4680248496457576358">"Printerlar qidirilmoqda"</string>
-    <string name="print_service_disabled" msgid="7739452396114245222">"Chop etish xizmati o‘chirib qo‘yilgan"</string>
+    <string name="print_service_disabled" msgid="7739452396114245222">"Chop etish xizmati yoniq emas"</string>
     <string name="print_print_jobs" msgid="3582094777756968793">"Chop etish buyruqlari"</string>
     <string name="print_print_job" msgid="7563741676053287211">"Chop etish vazifasi"</string>
     <string name="print_restart" msgid="8373999687329384202">"Qayta boshlash"</string>
@@ -1909,14 +1906,18 @@
     <string name="power_charge_remaining" msgid="6132074970943913135">"Batareya quvvati <xliff:g id="UNTIL_CHARGED">%1$s</xliff:g>dan so‘ng to‘ladi"</string>
     <string name="background_activity_title" msgid="8618384801540759730">"Fondagi jarayonlar"</string>
     <string name="background_activity_summary" msgid="8140094430510517362">"Ilovaga fonda ishlashiga ruxsat berish"</string>
-    <string name="background_activity_summary_on" msgid="649282072540085599">"Ilova ishlamayotgan vaqtda ham fonda ishlayveradi"</string>
+    <string name="background_activity_summary_on" msgid="649282072540085599">"Bu ilova ochilmagan vaqtda ham fonda ishlayveradi"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"Ilova ishlatilmaganda, fondagi harakati cheklanadi"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"Ilovaga fonda ishlashiga ruxsat berilmagan"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"To‘liq quvvat olganidan beri ekranning quvvat sarfi"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for device_screen_usage (3386088035570409683) -->
+    <skip />
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ekran sarfi"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Mobil tarmoqni tekshirish"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> oldin"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"To‘liq quvvat olganidan beri ilovalarning quvvat sarfi (<xliff:g id="TIME">%1$s</xliff:g> oldin)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> oldin"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for power_usage_list_summary (6775339745194635000) -->
+    <skip />
     <string name="screen_usage_summary" msgid="6687403051423153550">"To‘liq quvvat olganidan beri ekran yoniq turgan vaqt miqdori"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"To‘liq quvvat olganidan beri qurilmaning quvvat sarfi"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Quvvat manbaidan uzilganidan keyin sarflangan batareya quvvati"</string>
@@ -1936,7 +1937,7 @@
     <string name="awake" msgid="387122265874485088">"Qurilmaning uyg‘oqlik vaqti"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi o‘z vaqtida"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi o‘z vaqtida"</string>
-    <string name="advanced_battery_title" msgid="2068039111517508622">"Batareya sarfining kengaytirilgan parametrlari"</string>
+    <string name="advanced_battery_title" msgid="2068039111517508622">"Batareya sarfi tafsilotlari"</string>
     <string name="history_details_title" msgid="3608240585315506067">"Tafsilotlar"</string>
     <string name="battery_details_title" msgid="6101394441569858580">"Batareya sarfi"</string>
     <string name="details_subtitle" msgid="32593908269911734">"Batareya sarfi"</string>
@@ -1947,7 +1948,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Kamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Tarmoq bilan aloqa"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Kutish rejimidagi mobil tarmoq"</string>
     <string name="power_phone" msgid="5392641106474567277">"Ovozli qo‘ng‘iroqlar"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Planshet faol emas"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Kutish rejimi"</string>
@@ -1986,7 +1987,7 @@
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Bluetooth sozlamalari"</string>
     <string name="battery_desc_voice" msgid="8980322055722959211">"Ovoz qo‘ng‘iroqlarining batareya sarfi"</string>
     <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Planshet noafaol holatda batareyani qancha sarflagani"</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Telefon nofaol holatda batareyani qancha sarflaganligi"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Kutish rejimidagi batareya sarfi"</string>
     <string name="battery_desc_radio" msgid="5479196477223185367">"Uyali radio batareyani qancha sarflaganligi"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Aloqa yo‘q joylarda, uchish rejimiga o‘tib, batareya tejashingiz mumkin"</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Fonar uchun sarflangan batareya quvvati"</string>
@@ -2007,17 +2008,23 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Ushbu ma’lumotlar taxminiy bo‘lib, u energiya iste’molining barcha manbalarini o‘z ichiga olmaydi. Quyida keltirilgan ko‘rsatkich energiya iste’molining taxminiy hisob-kitobi va batareya quvvatining haqiqiy sarfi o‘rtasidagi farqni bildiradi."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Orttirib hisoblangan quvvat sarfi"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mA/s"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"%1$s ishlatildi"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Ishlatilgan vaqti: <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> – <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> batareya quvvati"</string>
-    <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"To‘liq quvvat olganidan beri sarflangan quvvat"</string>
-    <string name="battery_last_full_charge" msgid="7151251641099019361">"Oxirgi marta to‘liq quvvat olganidan beri"</string>
-    <string name="battery_footer_summary" msgid="4701358808575132647">"Qolgan batareya vaqti taxminiy va foydalanish intensivligiga qarab o‘zgarishi mumkin"</string>
-    <string name="battery_detail_foreground" msgid="3350401514602032183">"Faol ishlatilganda"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_detail_since_full_charge (7515347842046955855) -->
+    <skip />
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_last_full_charge (7151251641099019361) -->
+    <skip />
+    <string name="battery_footer_summary" msgid="4701358808575132647">"Batareyaning qolgan vaqti taxminiy va u foydalanish intensivligiga qarab farq qilishi mumkin"</string>
+    <string name="battery_detail_foreground" msgid="3350401514602032183">"Faol rejimda"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"Fon rejimida"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"Batareya sarfi"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"Jami ilovalar sarfining <xliff:g id="PERCENT">%1$s</xliff:g> qismi (<xliff:g id="POWER">%2$d</xliff:g> mA*soat)"</string>
-    <string name="battery_detail_info_title" msgid="8227822131405620369">"To‘liq quvvat olganidan beri"</string>
+    <!-- String.format failed for translation -->
+    <!-- no translation found for battery_detail_info_title (8227822131405620369) -->
+    <skip />
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"Batareya sarfini boshqarish"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"Taxminiy qolgan vaqt"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"Quvvati to‘lishigacha qolgan vaqt"</string>
@@ -2034,7 +2041,7 @@
     <string name="battery_saver_turn_on_automatically_never" msgid="6610846456314373">"Hech qachon"</string>
     <string name="battery_saver_turn_on_automatically_pct" msgid="8665950426992057191">"batareya quvvati: <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
     <string name="battery_percentage" msgid="723291197508049369">"Batareya quvvati foizi"</string>
-    <string name="battery_percentage_description" msgid="8511658577507384014">"Batareya quvvati foizini holat panelida ko‘rsatish"</string>
+    <string name="battery_percentage_description" msgid="8511658577507384014">"Holat qatorida batareya foizini chiqarish"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"Jarayonlar statistikasi"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"Ish jarayonlari haqidagi g‘alati statistikalar"</string>
     <string name="app_memory_use" msgid="7849258480392171939">"Band xotira"</string>
@@ -2079,7 +2086,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Ovoz kiritish &amp; chiqarish sozlamalari"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ovozli qidiruv"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android klaviaturasi"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Nutq"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Ovoz bilan yozish sozlamalari"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Ovoz bilan yozish"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Ovoz bilan yozish xizmatlari"</string>
@@ -2146,7 +2152,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Hisob ma’lumotlari omborini o‘chirib bo‘lmaydi."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Hisob ma’lumotlari ombori yoqilgan."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Hisob ma’lumotlari omboridan foydalanishdan oldin ekran qulfi uchun PIN-kod yoki parol o‘rnatish lozim."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Foydalanish huquqi bor ilovalar"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"Ruxsati bor ilovalar"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Favqulodda vaziyat tovushi"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Favqulodda qo‘ng‘iroq uchun xususiyat o‘rnatish"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Zaxiralash"</string>
@@ -2196,7 +2202,7 @@
     <string name="wifi_setup_not_connected" msgid="6997432604664057052">"Ulanmagan"</string>
     <string name="wifi_setup_add_network" msgid="5939624680150051807">"Tarmoq qo‘shish"</string>
     <string name="wifi_setup_refresh_list" msgid="3411615711486911064">"Ro‘yxatni yangilash"</string>
-    <string name="wifi_setup_skip" msgid="6661541841684895522">"O‘tkazib yuborish"</string>
+    <string name="wifi_setup_skip" msgid="6661541841684895522">"Tashlab ketish"</string>
     <string name="wifi_setup_next" msgid="3388694784447820477">"Keyingisi"</string>
     <string name="wifi_setup_back" msgid="144777383739164044">"Orqaga"</string>
     <string name="wifi_setup_detail" msgid="2336990478140503605">"Tarmoq tafsilotlari"</string>
@@ -2434,7 +2440,7 @@
     <string name="vpn_missing_cert" msgid="5357192202207234745">"Sertifikat topilmadi. Iltimos, profilni tahrirlang."</string>
     <string name="trusted_credentials_system_tab" msgid="3984284264816924534">"Tizim"</string>
     <string name="trusted_credentials_user_tab" msgid="2244732111398939475">"Foydalanuvchi"</string>
-    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"O‘chirib qo‘yish"</string>
+    <string name="trusted_credentials_disable_label" msgid="3864493185845818506">"Faolsizlantirish"</string>
     <string name="trusted_credentials_enable_label" msgid="2498444573635146913">"Yoqish"</string>
     <string name="trusted_credentials_remove_label" msgid="3633691709300260836">"O‘chirish"</string>
     <string name="trusted_credentials_trust_label" msgid="8003264222650785429">"Ishonch bildirish"</string>
@@ -2601,9 +2607,9 @@
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"Bluetooth"</string>
     <string name="restriction_bluetooth_config_summary" msgid="8372319681287562506">"Bluetooth aloqasi va sozlamalarini o‘zgartirishga ruxsat berilsinmi?"</string>
     <string name="restriction_nfc_enable_title" msgid="5888100955212267941">"NFC"</string>
-    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"“<xliff:g id="DEVICE_NAME">%1$s</xliff:g>” qurilmasi boshqa NFC qurilmasiga tekkizilganda ma’lumot ayirboshlashga ruxsat berish"</string>
-    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Planshet boshqa qurilma bilan o‘zaro bog‘lansa ma’lumot almashishiga ruxsat berish"</string>
-    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Telefon boshqa qurilma bilan o‘zaro bog‘lansa ma’lumot almashishiga ruxsat berish"</string>
+    <string name="restriction_nfc_enable_summary_config" msgid="3232480757215851738">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> qurilmasi boshqa NFC qurilmaga tekkizilganda axborot almashinuviga ruxsat berish"</string>
+    <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"Planshet boshqa qurilmaga tekkizilganda axborot almashinuviga ruxsat berish"</string>
+    <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"Telefon boshqa qurilmaga tekkizilganda axborot almashinuviga ruxsat berish"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"Joylashuv"</string>
     <string name="restriction_location_enable_summary" msgid="3489765572281788755">"Ilovalarga joylashuvingiz ma‘lumotidan foydalanishga ruxsat berish"</string>
     <string name="wizard_back" msgid="5567007959434765743">"Orqaga"</string>
@@ -2731,6 +2737,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirishnomalar ovozi"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Telefon ringtoni"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Standart bildirishnoma signali"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Ilova tovushi"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Standart bildirishnoma signali"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Standart signal"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Chaqiruv vaqtida tebranish"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Boshqa ovozlar"</string>
@@ -2786,12 +2794,13 @@
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"Bildirishnomalar ko‘rsatilmasin"</string>
     <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"Qurilmangiz qulflanganda, bildirishnomalar qanday ko‘rsatilsin?"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"Bildirishnomalar"</string>
-    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Ishchi profil bildirishnomalari to‘liq ko‘rsatilsin"</string>
+    <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"Ishchi bildirishnomalar to‘liq ko‘rsatilsin"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"Maxfiy ishchi profil bildirishnomalari berkitilsin"</string>
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"Ishchi profil bildirishnomalari ko‘rsatilmasin"</string>
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Qurilmangiz qulflanganda, profil bildirishnomalari qanday ko‘rsatilsin?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Profil bildirishnomalari"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Bildirishnomalar"</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_blocked" msgid="7938180808339386300">"Bildirishnomalar hech qachon ko‘rsatilmasin"</string>
@@ -2799,10 +2808,10 @@
     <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_min_summary" msgid="8233873580287975662">"Past: ovozsiz yoki vizual bildirishnomasiz"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"O‘rtacha: ovozsiz"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Yuqori: ovozli"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Shoshilinch: ovozli va ekranda qalqib chiqadi"</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="6585849855452076626">"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="default_notification_assistant" msgid="7631945224761430146">"Bildirishnoma yordamchisi"</string>
@@ -2816,7 +2825,7 @@
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"<xliff:g id="SERVICE">%1$s</xliff:g> xizmatiga bildirishnomalarga kirish uchun ruxsat berilsinmi?"</string>
     <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> barcha bildirishnomalarni, jumladan, kontakt ismlari va siz qabul qilgan xabarlar matni kabi shaxsiy ma’lumotlarni o‘qiy oladi. Shuningdek, u bildirishnomalarni yopishi yoki ulardagi turli amal tugmalarini ishga tushira oladi. \n\nIlova “Bezovta qilinmasin” rejimini yoqish va o‘chirish hamda shu bilan bog‘liq sozlamalarni ham o‘zgartirishi mumkin."</string>
     <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"Agar <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> uchun bildirishnomalardan foydalanish o‘chirib qo‘yilsa, “Bezovta qilinmasin” fuksiyasi ham o‘chirib qo‘yiladi."</string>
-    <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"O‘chirib qo‘yish"</string>
+    <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"Faolsizlantirish"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"Bekor qilish"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"Yordamchi VR xizmatlar"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"Hech qaysi ilova yordamchi VR xizmatlar sifatida ishga tushirilishiga ruxsat so‘ramagan."</string>
@@ -2836,6 +2845,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"“Bezovta qilinmasin” fuksiyasi"</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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android bu qurilmada ushbu ilova bildirishnomasini bloklamoqda"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android bu qurilmada ushbu turkum bildirishnomalarini bloklamoqda"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Turkumlar"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Boshqa"</string>
     <string name="no_channels" msgid="3077375508177744586">"Bu ilova hech qanday bildirishnoma joylamagan"</string>
@@ -2954,7 +2965,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"YONIQ"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"O‘CHIQ"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"Ekranni mahkamlash"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"Agar bu parametr yoqilsa, ekranda bir ilovadan ikkinchisiga o‘tishni taqiqlab qo‘yish mumkin.\n\nEkranni mahkamlash uchun:\n\n1. Ekranni mahkamlash funksiyasini yoqing.\n\n2. Kerakli ekranni oching.\n\n3. “Umumiy ma’lumot” tugmasini bosing.\n\n4. Ekranni barmog‘ingiz bilan tepaga suring va mahkamlash tugmasini bosing."</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"Agar bu xususiyat yoqilsa, ekran faqat bitta ilovaga mahkamlanadi.\n\nEkranni mahkamlash uchun:\n\n1. Ekranni mahkamlash xususiyatini yoqing.\n\n2. Kerakli ekranni oching.\n\n3. Menyu tugmasini bosing.\n\n4. Ekranni tepaga suring va mahkamlash tugmasini bosing."</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"Yechishdan oldin grafik kalit so‘ralsin"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"Yechishda PIN-kod so‘ralsin"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"Yechishdan oldin parol so‘ralsin"</string>
@@ -2969,18 +2980,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Joriy holatda qolsin"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Xavfsiz ishga tushirish"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Davom etish"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Qurilmani ishga tushirishda PIN-kod talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Shaxsiy ma’lumotlaringizni himoya qilish uchun qurilmani yoqishda grafik kalit so‘raladigan qilib sozlab olishingiz mumkin. Qurilma qulfi ochilmaguncha qo‘ng‘iroqlar, xabar va bildirishnomalar, jumladan, uyg‘otkich signallaridan foydalanib bo‘lmaydi. \n\nBu usul yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Qurilmani ishga tushirishda parol talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda PIN-kod kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda grafik kalit kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda parol kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Qurilmani ishga tushirish uchun PIN-kod talab qilinsin"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Qurilmani ishga tushirishda grafik kalit so‘ralsin"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Qurilmani ishga tushirish uchun parol talab qilinsin"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Yo‘q, kerak emas"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Yo‘q, kerak emas"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Yo‘q, kerak emas"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Qurilmani ishga tushirishda PIN kod talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun PIN kod talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Shaxsiy ma’lumotlaringizni himoya qilish uchun qurilmani yoqishda grafik kalit so‘raladigan qilib sozlab olishingiz mumkin. Qurilma qulfi ochilmaguncha qo‘ng‘iroqlar, xabar va bildirishnomalar, jumladan, uyg‘otkich signallaridan foydalanib bo‘lmaydi. \n\nBu usul yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun grafik kalit talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Qurilmani ishga tushirishda parol talab qilish orqali uni yanada kuchliroq himoyalashingiz mumkin. Qurilma ishga tushmaguncha, u qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallarini qabul qila olmaydi. \n\nBu yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun parol talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda PIN kod kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun PIN kod talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda chizmali kalit kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun grafik kalit talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Qurilmani qulfdan chiqarish uchun siz nafaqat barmoq izidan foydalanish, balki unga qo‘shimcha tarzda parol kiritilishini ham talab qilishingiz mumkin. Qurilma ishga tushmaguncha, qo‘ng‘iroqlar, xabarlar yoki bildirishnomalar, jumladan, uyg‘otkich signallari ishlamaydi.\n\nBu xususiyat yo‘qolgan yoki o‘g‘irlangan qurilmadagi ma’lumotlarni himoyalashga yordam beradi. Qurilmani ishga tushirish uchun parol talab qilinsinmi?"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Ha"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Yo‘q"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"PIN-kod talab qilinsinmi?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Chiz. parol talab qil-mi?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Parol talab qilinsinmi?"</string>
@@ -3092,15 +3099,15 @@
     <string name="memory_avg_desc" msgid="1551240906596518412">"O‘rtacha <xliff:g id="MEMORY">%1$s</xliff:g>"</string>
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
-    <string name="high_power_apps" msgid="3459065925679828230">"Batareya cheklovlari"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"Quvvat sarfi"</string>
+    <string name="high_power_apps" msgid="3459065925679828230">"Batareya quvvatini tejash"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"Ogohlantirishlar"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"Barcha ilovalarni ko‘rsatish"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"Qo‘shimcha ilovalarni berkitish"</string>
-    <string name="high_power_filter_on" msgid="3222265297576680099">"Cheklov o‘rnatilmagan"</string>
-    <string name="high_power_on" msgid="6216293998227583810">"Cheklov o‘rnatilmagan"</string>
+    <string name="high_power_filter_on" msgid="3222265297576680099">"Quvvat tejamaydi"</string>
+    <string name="high_power_on" msgid="6216293998227583810">"Quvvat tejamaydi"</string>
     <string name="high_power_off" msgid="3393904131961263278">"Batareya cheklovi o‘rnatilgan"</string>
-    <string name="high_power_system" msgid="7362862974428225301">"Batareya cheklovi mavjud emas"</string>
-    <string name="high_power_desc" msgid="6283926163708585760">"Batareya cheklovlari joriy etilmasin. Batareya quvvati tez sarflanishi mumkin."</string>
+    <string name="high_power_system" msgid="7362862974428225301">"Batareya quvvatini tejamaydi"</string>
+    <string name="high_power_desc" msgid="6283926163708585760">"Batareya quvvati tejalmaydi. Batareya quvvati tez sarflanishi mumkin."</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Ilova doim fonda ishlashiga ruxsat berilsinmi?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"<xliff:g id="APP_NAME">%1$s</xliff:g> ilovasiga doim fonda ishlashiga ruxsat berilsa, batareya quvvati tezroq sarflanadi. \n\nBuni keyinroq Sozlamalar &gt; Ilovalar va bildirishnomalar orqali o‘zgartirishingiz mumkin."</string>
     <string name="battery_summary" msgid="8044042095190688654">"To‘liq quvvatlanganidan beri <xliff:g id="PERCENTAGE">%1$s</xliff:g> quvvat sarflandi"</string>
@@ -3204,14 +3211,14 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Bu ruxsatnoma ilovaga tizim sozlamalarini o‘zgaritish uchun ruxsat beradi."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Ha"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Yo‘q"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Ha"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Yo‘q"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Ilovalarni o‘rnatishga ruxsat"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Ruxsat berilgan"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Ruxsat berilmagan"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Bu manbaga ruxsat bering"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Kamera uchun bilakni ikki marta bukish"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Kamera ilovasini ochish uchun bilagingizni ikki marta buking"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Kamerani tezkor ishga tushirish"</string>
     <string name="camera_double_tap_power_gesture_desc" msgid="7355664631775680376">"Quvvat tugmasini ikki marta bosib kamerani ishga tushirish"</string>
-    <string name="screen_zoom_title" msgid="5233515303733473927">"Ekrandagi elementlar o‘lchami"</string>
+    <string name="screen_zoom_title" msgid="5233515303733473927">"Ekrandagi tasvir masshtabi"</string>
     <string name="screen_zoom_short_summary" msgid="7291960817349834688">"Ekrandagi elementlarni kattalashtirish yoki kichiklashtirish"</string>
     <string name="screen_zoom_keywords" msgid="9176477565403352552">"ekran, zichlik, ekran, ko‘lam, miqyos, oshirish"</string>
     <string name="screen_zoom_summary" msgid="6445488991799015407">"Ekrandagi elementlarni kattalashtirish yoki kichiklashtirish. Bosh ekrandagi ilovalar joylashuvi o‘zgarishi mumkin."</string>
@@ -3261,7 +3268,7 @@
     <string name="admin_profile_owner_message" msgid="5860816886981109626">"Administratoringiz ishchi profilingiz bilan bog‘liq ilova va ma’lumotlarni, jumladan, sozlamalar, ruxsatnomalar, korporativ kirish huquqi, tarmoqdagi faollik va qurilmaning joylashuvi haqidagi ma’lumotlarni kuzatishi va boshqarishi mumkin."</string>
     <string name="admin_profile_owner_user_message" msgid="3842630535450382172">"Administratoringiz bu foydalanuvchi bilan bog‘liq ilova va ma’lumotlarni, jumladan, sozlamalar, ruxsatnomalar, korporativ kirish huquqi, tarmoqdagi faollik va qurilmaning joylashuvi haqidagi ma’lumotlarni kuzatishi va boshqarishi mumkin."</string>
     <string name="admin_device_owner_message" msgid="6232893638259790789">"Administratoringiz bu qurilma bilan bog‘liq ilova va ma’lumotlarni, jumladan, sozlamalar, ruxsatnomalar, korporativ kirish huquqi, tarmoqdagi faollik va qurilmaning joylashuvi haqidagi ma’lumotlarni kuzatishi va boshqarishi mumkin."</string>
-    <string name="condition_turn_off" msgid="1960945836880080298">"O‘chirib qo‘yish"</string>
+    <string name="condition_turn_off" msgid="1960945836880080298">"Faolsizlantirish"</string>
     <string name="condition_turn_on" msgid="9089876276117874591">"Yoqish"</string>
     <string name="condition_expand_show" msgid="608202020023489939">"Ko‘rsatish"</string>
     <string name="condition_expand_hide" msgid="948507739223760667">"Berkitish"</string>
@@ -3339,7 +3346,7 @@
     <string name="battery_saver_off_summary" msgid="8309471955051162327">"O‘chiq / <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="battery_saver_desc_turn_on_auto_never" msgid="6715896635178578813">"Hech qachon avtomatik yoqilmasin"</string>
     <string name="battery_saver_desc_turn_on_auto_pct" msgid="7472323223085636533">"Batareya quvvati %1$s qolganda avtomatik yoqilsin"</string>
-    <string name="not_battery_optimizing" msgid="5362861851864837617">"Quvvat tejash rejimi o‘chiq"</string>
+    <string name="not_battery_optimizing" msgid="5362861851864837617">"Batareya quvvati tejalmayapti"</string>
     <string name="lockscreen_remote_input" msgid="969871538778211843">"Qurilma qulflangan bo‘lsa, bildirishnomalarda matn kiritish taqiqlansin"</string>
     <string name="default_spell_checker" msgid="8506899870026026660">"Birlamchi imlo tekshirgich"</string>
     <string name="choose_spell_checker" msgid="6596539862291699367">"Imlo tekshirgich"</string>
@@ -3392,7 +3399,8 @@
     <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">"SMSdan foydalanish"</string>
     <string name="bluetooth_disabled" msgid="2456198532288640046">"Boshqa qurilmalarga ko‘rinmaydi"</string>
-    <string name="bluetooth_connected_summary" msgid="8733997010923307915">"Bunga ulangan:"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Tezkor sozlamalarning dasturchi tugmalari"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Sizga yordam berish uchun shu yerdamiz"</string>
@@ -3581,7 +3589,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(<xliff:g id="USER">%s</xliff:g> uchun o‘chirib qo‘yilgan)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Avtomatik to‘ldirish xizmati"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"avtomatik, to‘ldirish, avtomatik to‘ldirish"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> boshqa ilovalarda maydonlarni avtomatik to‘ldiradi. <xliff:g id="APP_NAME_1">%1$s</xliff:g> ilovasi ekrandagilarni o‘qiy oladi. Rozimisiz?"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Bu ilova ishonchli ekanini tekshiring&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; ekraningizda nimani avtomatik to‘ldirish kerakligini aniqlaydi."</string>
     <string name="device_theme" msgid="4571803018917608588">"Qurilma mavzusi"</string>
     <string name="default_theme" msgid="7085644992078579076">"Standart"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Xotira menejeri: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 8586a25..3856fc0 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Không có"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Không"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 04b25ec..15695c3 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Tài khoản"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Vị trí"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Tài khoản"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Bảo mật và vị trí"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Mã hóa và thông tin đăng nhập"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Điện thoại được mã hóa"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Điện thoại được mã hóa"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Tùy chọn màn hình khóa"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khóa màn hình, khóa bộ nhớ thông tin xác thực"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Bảo mật"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Bị quản trị viên vô hiệu hóa"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Trạng thái bảo mật"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Khóa màn hình, vân tay"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Khóa màn hình"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Vân tay"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Quản lý vân tay"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sử dụng vân tay để"</string>
@@ -570,7 +569,7 @@
     <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>
-    <string name="manage_device_admin" msgid="537804979483211453">"Ứng dụng dành cho quản trị viên thiết bị"</string>
+    <string name="manage_device_admin" msgid="537804979483211453">"Ư.dụng cho quản trị viên th.bị"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"Không có ứng dụng nào hiện hoạt"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
       <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> ứng dụng hiện hoạt</item>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Thông báo khi có mạng công cộng chất lượng cao"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Bật Wi-Fi tự động"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"Wi-Fi sẽ bật lại gần các mạng đã lưu chất lượng cao, giống như mạng gia đình của bạn"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Không khả dụng vì tính năng quét tìm Wi‑Fi đang tắt"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Tránh kết nối kém"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Không sử dụng mạng Wi‑Fi trừ khi mạng này có kết nối Internet tốt"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Chỉ sử dụng mạng có kết nối Internet tốt"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Định cấu hình Wi‑Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Mặt nạ mạng con"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Địa chỉ IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Mạng đã lưu"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Cài đặt IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Cài đặt nâng cao Wi‑Fi không khả dụng cho người dùng này"</string>
@@ -999,7 +997,7 @@
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"Sẽ không bao giờ tự động tắt."</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"Sẽ tự động tắt lúc <xliff:g id="ID_1">%1$s</xliff:g>."</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"Sẽ tự động tắt lúc bình minh."</string>
-    <string name="screen_timeout" msgid="4351334843529712571">"Thời gian chờ"</string>
+    <string name="screen_timeout" msgid="4351334843529712571">"Ngủ"</string>
     <string name="screen_timeout_title" msgid="5130038655092628247">"Màn hình tắt"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Tắt"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Để kiểm soát những gì diễn ra khi điện thoại được gắn đế và/hoặc ở chế độ ngủ, hãy bật trình bảo vệ màn hình."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Khi khởi động"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Trình bảo vệ màn hình hiện tại"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Bắt đầu ngay"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Cài đặt"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Nhấc lên để đánh thức"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Màn hình thông báo đến"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Màn hình xung quanh"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Bật màn hình khi bạn nhận được thông báo"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Phóng to hoặc thu nhỏ văn bản"</string>
@@ -1615,6 +1612,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Cửa hàng"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Chi tiết ứng dụng"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Ứng dụng đã được cài đặt từ <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Thông tin thêm về <xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Hoạt động của ứng dụng"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Ðang chạy"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Chưa bao giờ được sử dụng)"</string>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Trình trợ giúp về phím tắt"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Hiển thị các phím tắt có sẵn"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Mặc định"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Chuột/bàn di chuột"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Tốc độ con trỏ"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Trình điều khiển trò chơi"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Sử dụng bộ rung"</string>
@@ -1772,7 +1769,7 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"Nhấn vào mục trên màn hình của bạn để nghe mục được đọc to"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"Phụ đề"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"Phóng to"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Phóng đại bằng thao tác nhấn ba lần"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"Phóng đại bằng cách nhấn 3 lần"</string>
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"Phóng đại bằng nút"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"Phóng đại bằng nút và nhấn ba lần"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"Phóng to trên màn hình"</string>
@@ -1915,8 +1912,8 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Mức sử dụng màn hình kể từ lần sạc đầy"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Mức tiêu thụ của màn hình"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Quét mạng di động"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"cách đây <xliff:g id="TIME">%1$s</xliff:g>"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Mức sử dụng ứng dụng kể từ khi sạc đầy (cách đây <xliff:g id="TIME">%1$s</xliff:g>)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"cách đây <xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Mức sử dụng ứng dụng kể từ khi sạc đầy (cách đây <xliff:g id="TIME">^1</xliff:g>)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Lượng thời gian sử dụng màn hình kể từ khi sạc đầy"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Mức sử dụng thiết bị kể từ lần sạc đầy"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Sử dụng pin từ khi tháo đầu cắm"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Máy ảnh"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Chế độ chờ của điện thoại di động"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Chờ mạng di động"</string>
     <string name="power_phone" msgid="5392641106474567277">"Cuộc gọi thoại"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Máy tính bảng ở chế độ rảnh"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Điện thoại ở chế độ rảnh"</string>
@@ -2007,7 +2004,7 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Mức sử dụng pin là mức sử dụng nguồn ước tính và không bao gồm mọi nguồn sử dụng pin. Chênh lệch chính là sự khác biệt giữa mức sử dụng nguồn ước tính và mức pin tiêu hao thực sự theo quan sát."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Sử dụng nguồn vượt mức"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Đã sử dụng trong %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Được sử dụng cho <xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> được sử dụng bởi <xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> trong tổng số thời lượng pin"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Chi tiết từ lần sạc đầy gần đây nhất"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Cài đặt nhập liệu bằng giọng nói &amp; đầu ra bằng giọng nói"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Tìm kiếm bằng giọng nói"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Bàn phím Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Giọng nói"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Cài đặt nhập bằng giọng nói"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Nhập bằng giọng nói"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Dịch vụ nhập bằng giọng nói"</string>
@@ -2146,7 +2142,7 @@
     <string name="credentials_not_erased" msgid="7685932772284216097">"Ko thể xóa b.nhớ t.tin x.thực."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Bộ nhớ thông tin xác thực đã bật."</string>
     <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"Bạn cần đặt mã PIN hoặc mật khẩu khóa màn hình trước khi có thể sử dụng vùng lưu trữ thông tin xác thực."</string>
-    <string name="usage_access_title" msgid="332333405495457839">"Ứng dụng có quyền truy cập sử dụng"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"ƯD có quyền tr.cập s.dụng"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Âm khẩn cấp"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Đặt chế độ khi cuộc gọi khẩn cấp được thực hiện"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"Sao lưu"</string>
@@ -2154,7 +2150,7 @@
     <string name="personal_data_section_title" msgid="7815209034443782061">"Dữ liệu cá nhân"</string>
     <string name="backup_data_title" msgid="1239105919852668016">"Sao lưu dữ liệu của tôi"</string>
     <string name="backup_data_summary" msgid="708773323451655666">"Sao lưu dữ liệu ứng dụng, mật khẩu Wi-Fi và các cài đặt khác vào máy chủ Google"</string>
-    <string name="backup_configure_account_title" msgid="3790872965773196615">"Sao lưu tài khoản"</string>
+    <string name="backup_configure_account_title" msgid="3790872965773196615">"Tài khoản sao lưu"</string>
     <string name="include_app_data_title" msgid="2829970132260278394">"Bao gồm dữ liệu ứng dụng"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Tự động khôi phục"</string>
     <string name="auto_restore_summary" msgid="4235615056371993807">"Khi cài đặt lại một ứng dụng, khôi phục dữ liệu và cài đặt đã sao lưu"</string>
@@ -2450,9 +2446,9 @@
     <string name="user_credential_removed" msgid="6514189495799401838">"Đã xóa thông tin xác thực: <xliff:g id="CREDENTIAL_NAME">%s</xliff:g>"</string>
     <string name="user_credential_none_installed" msgid="3729607560420971841">"Không có thông tin xác thực người dùng nào được cài đặt"</string>
     <string name="spellcheckers_settings_title" msgid="399981228588011501">"Kiểm tra chính tả"</string>
-    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Nhập toàn bộ mật khẩu sao lưu hiện tại của bạn vào đây"</string>
-    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Nhập mật khẩu mới để sao lưu toàn bộ vào đây"</string>
-    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Nhập lại toàn bộ mật khẩu sao lưu mới của bạn vào đây"</string>
+    <string name="current_backup_pw_prompt" msgid="7735254412051914576">"Nhập mật khẩu hiện tại cho sao lưu toàn bộ vào đây"</string>
+    <string name="new_backup_pw_prompt" msgid="8755501377391998428">"Nhập mật khẩu mới cho sao lưu toàn bộ vào đây"</string>
+    <string name="confirm_new_backup_pw_prompt" msgid="3238728882512787864">"Nhập lại mật khẩu mới cho sao lưu toàn bộ vào đây"</string>
     <string name="backup_pw_set_button_text" msgid="2387480910044648795">"Đặt mật khẩu sao lưu"</string>
     <string name="backup_pw_cancel_button_text" msgid="8845630125391744615">"Hủy"</string>
     <string name="additional_system_update_settings_list_item_title" msgid="214987609894661992">"Bản cập nhật hệ thống bổ sung"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Âm lượng thông báo"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Nhạc chuông điện thoại"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Âm thanh thông báo mặc định"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Âm thanh do ứng dụng cung cấp"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Âm thanh thông báo mặc định"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Âm thanh báo thức mặc định"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Đồng thời rung khi có cuộc gọi"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Âm thanh khác"</string>
@@ -2792,6 +2790,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Khi thiết bị của bạn bị khóa, bạn muốn thông báo hồ sơ hiển thị như thế nào?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Thông báo hồ sơ"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Thông báo"</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_blocked" msgid="7938180808339386300">"Không bao giờ hiển thị thông báo"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"Thấp: Không làm gián đoạn bằng âm báo hoặc hình ảnh"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Trung bình: Không có âm báo"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Cao: Phát âm báo"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Khẩn cấp: Phát âm báo và 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="6585849855452076626">"Phát ra â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="default_notification_assistant" msgid="7631945224761430146">"Trợ lý thông báo"</string>
@@ -2836,6 +2835,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android đang chặn hiển thị các thông báo của ứng dụng này trên thiết bị này"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android đang chặn hiển thị loại thông báo này trên thiết bị này"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Danh mục"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Khác"</string>
     <string name="no_channels" msgid="3077375508177744586">"Ứng dụng chưa đăng bất kỳ thông báo nào"</string>
@@ -2907,7 +2908,7 @@
     <string name="summary_range_symbol_combination" msgid="5695218513421897027">"<xliff:g id="START">%1$s</xliff:g> - <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="summary_range_verbal_combination" msgid="8467306662961568656">"<xliff:g id="START">%1$s</xliff:g> đến <xliff:g id="END">%2$s</xliff:g>"</string>
     <string name="zen_mode_calls" msgid="7051492091133751208">"Cuộc gọi"</string>
-    <string name="zen_mode_messages" msgid="5886440273537510894">"Tin nhắn"</string>
+    <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"Tất cả thông báo"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"Tin nhắn đã chọn"</string>
     <string name="zen_mode_from_anyone" msgid="2638322015361252161">"Từ bất cứ ai"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Giữ nguyên hướng hiện tại"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Khởi động an toàn"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Tiếp tục"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN của mình trước khi khởi động thiết bị. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi khởi động thiết bị. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc lấy cắp."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình của mình trước khi khởi động thiết bị. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi khởi động thiết bị. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc lấy cắp."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu của mình trước khi khởi động thiết bị. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi khởi động thiết bị. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc lấy cắp."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Ngoài việc sử dụng dấu vân tay của mình để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi thiết bị khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Ngoài việc sử dụng dấu vân tay của mình để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi thiết bị khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Ngoài việc sử dụng dấu vân tay của mình để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Thiết bị sẽ không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức cho đến khi thiết bị khởi động.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Yêu cầu mã PIN để khởi động thiết bị"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Yêu cầu hình để khởi động thiết bị"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Yêu cầu mật khẩu để khởi động thiết bị"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Không, cảm ơn"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Không, cảm ơn"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Không, cảm ơn"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức. \n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mã PIN trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mã PIN để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu hình mở khóa trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu hình mở khóa để khởi động thiết bị của bạn?"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ngoài việc sử dụng vân tay để mở khóa thiết bị, bạn có thể bảo vệ thiết bị này hơn nữa bằng cách yêu cầu mật khẩu trước khi thiết bị khởi động. Cho đến khi khởi động, thiết bị không thể nhận cuộc gọi, tin nhắn hoặc thông báo, bao gồm cả báo thức.\n\nĐiều này giúp bảo vệ dữ liệu trên các thiết bị bị mất hoặc bị đánh cắp. Yêu cầu mật khẩu để khởi động thiết bị của bạn&gt;"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Có"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Không"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Yêu cầu mã PIN?"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Yêu cầu hình?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Yêu cầu mật khẩu?"</string>
@@ -3044,7 +3041,7 @@
     <string name="advanced_apps" msgid="4812975097124803873">"Nâng cao"</string>
     <string name="configure_apps" msgid="6685680790825882528">"Định cấu hình ứng dụng"</string>
     <string name="unknown_app" msgid="5275921288718717656">"Ứng dụng không xác định"</string>
-    <string name="app_permissions" msgid="4148222031991883874">"Giấy phép ứng dụng"</string>
+    <string name="app_permissions" msgid="4148222031991883874">"Quyền của ứng dụng"</string>
     <string name="app_permissions_summary" msgid="5163974162150406324">"Ứng dụng sử dụng <xliff:g id="APPS">%1$s</xliff:g>"</string>
     <string name="tap_to_wake" msgid="7211944147196888807">"Nhấn để đánh thức"</string>
     <string name="tap_to_wake_summary" msgid="4341387904987585616">"Nhấn đúp vào vị trí bất kỳ trên màn hình để đánh thức thiết bị"</string>
@@ -3104,7 +3101,7 @@
     <string name="high_power_prompt_title" msgid="6358673688590282655">"Cho phép ứng dụng luôn chạy trong nền?"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"Cho phép <xliff:g id="APP_NAME">%1$s</xliff:g> luôn chạy trong nền có thể làm giảm thời lượng pin. \n\nBạn có thể thay đổi điều này sau đó từ Cài đặt &gt; Ứng dụng và thông báo."</string>
     <string name="battery_summary" msgid="8044042095190688654">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> sử dụng kể từ lần sạc đầy gần đây nhất"</string>
-    <string name="battery_power_management" msgid="5571519699679107523">"Quản lý quyền hạn"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"Quản lý nguồn"</string>
     <string name="no_battery_summary" msgid="3528036835462846814">"Không sử dụng pin kể từ lần sạc đầy cuối cùng"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"Cài đặt ứng dụng"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"Hiện Bộ điều chỉnh SystemUI"</string>
@@ -3190,7 +3187,7 @@
     <string name="filter_overlay_apps" msgid="6965969283342557573">"Các ứng dụng có quyền"</string>
     <string name="system_alert_window_on" msgid="2939489395109048888">"Có"</string>
     <string name="system_alert_window_off" msgid="6189115687233061992">"Không"</string>
-    <string name="install_other_apps" msgid="6986686991775883017">"Cài đặt ứng dụng không xác định"</string>
+    <string name="install_other_apps" msgid="6986686991775883017">"C.đặt ư.dụng ko xác định"</string>
     <string name="keywords_install_other_apps" msgid="761078076051006558">"cài đặt ứng dụng từ nguồn không xác định"</string>
     <string name="write_settings" msgid="4797457275727195681">"Sửa đổi cài đặt hệ thống"</string>
     <string name="keywords_write_settings" msgid="6415597272561105138">"ghi/sửa đổi cài đặt hệ thống"</string>
@@ -3204,9 +3201,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Quyền này cho phép ứng dụng sửa đổi cài đặt hệ thống."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Có"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Không"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Có"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Không"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Cho phép cài đặt ứng dụng"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Được phép"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Không được phép"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Cho phép từ nguồn này"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Xoắn đúp cho camera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Mở ứng dụng camera bằng cách vặn cổ tay hai lần"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Nhấn nút nguồn hai lần để mở máy ảnh"</string>
@@ -3301,7 +3298,7 @@
     <string name="cell_warning_and_limit" msgid="2273413629267437470">"<xliff:g id="ID_1">%1$s</xliff:g> cảnh báo dữ liệu / <xliff:g id="ID_2">%2$s</xliff:g> giới hạn dữ liệu"</string>
     <string name="billing_cycle" msgid="5169909190811133499">"Chu kỳ thanh toán"</string>
     <string name="billing_cycle_summary" msgid="9009106526129293752">"Chu kỳ hàng tháng bắt đầu vào <xliff:g id="ID_1">%1$s</xliff:g> mỗi tháng"</string>
-    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Bắt đầu hàng tháng <xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="billing_cycle_fragment_summary" msgid="1940518156600077066">"Hàng tháng, bắt đầu vào ngày <xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="network_restrictions" msgid="8234695294536675380">"Hạn chế của mạng"</string>
     <plurals name="network_restrictions_summary" formatted="false" msgid="4301618027244595839">
       <item quantity="other"><xliff:g id="COUNT">%1$d</xliff:g> hạn chế</item>
@@ -3313,7 +3310,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 <xliff:g id="ID_2">%2$s</xliff:g>"</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="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">
@@ -3321,7 +3318,7 @@
       <item quantity="one">1 ứng dụng được phép sử dụng dữ liệu không hạn chế khi Trình tiết kiệm dữ liệu đang bật</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"Trình tiết kiệm dữ liệu"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Truy cập dữ liệu không hạn chế"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"Tr.cập dữ liệu ko hạn chế"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"Dữ liệu nền bị tắt"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"Bật"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"Tắt"</string>
@@ -3373,7 +3370,7 @@
     <string name="notification_log_details_none" msgid="184131801230614059">"không có"</string>
     <string name="notification_log_details_ranking_null" msgid="244660392058720919">"Thiếu đối tượng xếp hạng."</string>
     <string name="notification_log_details_ranking_none" msgid="599607025882587844">"Đối tượng xếp hạng không chứa khóa này."</string>
-    <string name="special_access" msgid="3458780842491881155">"Quyền truy cập ứng dụng đặc biệt"</string>
+    <string name="special_access" msgid="3458780842491881155">"Quyền tr.cập ư.dụng đặc biệt"</string>
     <plurals name="special_access_summary" formatted="false" msgid="260765309935675867">
       <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> ứng dụng có thể sử dụng dữ liệu không bị hạn chế</item>
       <item quantity="one">1 ứng dụng có thể sử dụng dữ liệu không bị hạn chế</item>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Đã kết nối với"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Ô nhà phát triển cài đặt nhanh"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Chúng tôi sẵn sàng trợ giúp"</string>
@@ -3469,9 +3467,9 @@
     <string name="ambient_display_pickup_summary" product="tablet" msgid="2442551819015699120">"Để kiểm tra nhanh thông báo, hãy nhấc máy tính bảng lên."</string>
     <string name="ambient_display_pickup_summary" product="device" msgid="2369325441608811599">"Để kiểm tra nhanh thông báo, hãy nhấc thiết bị lên."</string>
     <string name="fingerprint_swipe_for_notifications_title" msgid="5816346492253270243">"Vuốt dấu vân tay để xem thông báo"</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Để kiểm tra thông báo của bạn, hãy vuốt xuống từ cảm biến vân tay trên mặt sau của điện thoại."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Để kiểm tra thông báo của bạn, hãy vuốt xuống từ cảm biến vân tay trên mặt sau của máy tính bảng."</string>
-    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Để kiểm tra thông báo của bạn, hãy vuốt xuống từ cảm biến vân tay trên mặt sau của thiết bị."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="default" msgid="1770661868393713922">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau điện thoại."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="tablet" msgid="902719947767712895">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau máy tính bảng."</string>
+    <string name="fingerprint_swipe_for_notifications_summary" product="device" msgid="5372926094116306647">"Để kiểm tra thông báo, hãy vuốt xuống trên cảm biến vân tay ở mặt sau thiết bị."</string>
     <string name="assist_gesture_title" msgid="7746563137898655539">"Cử chỉ hỗ trợ"</string>
     <string name="assist_gesture_summary" msgid="7575773425455374300"></string>
     <string name="assist_gesture_sensitivity_title" msgid="8424299091547331080">"Độ nhạy cảm"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(đã tắt cho người dùng <xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Dịch vụ tự động điền"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"tự động, điền, tự động điền"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Đặt <xliff:g id="APP_NAME_0">%1$s</xliff:g> làm ứng dụng tự động điền của bạn? <xliff:g id="APP_NAME_1">%1$s</xliff:g> sẽ có thể đọc màn hình của bạn và điền các trường trong ứng dụng khác."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Hãy đảm bảo bạn tin tưởng ứng dụng này&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; sử dụng nội dung trên màn hình của bạn để xác định nội dung nào có thể được tự động điền."</string>
     <string name="device_theme" msgid="4571803018917608588">"Chủ đề thiết bị"</string>
     <string name="default_theme" msgid="7085644992078579076">"Mặc định"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Trình quản lý bộ nhớ: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 04f7f12..1005c8a 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"无"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"无"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 921e362..15316ea 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -318,7 +318,7 @@
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"休眠<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>后（<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>让屏幕保持解锁状态时除外）"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在锁定屏幕上显示机主信息"</string>
     <string name="owner_info_settings_title" msgid="5530285568897386122">"锁定屏幕消息"</string>
-    <string name="security_enable_widgets_title" msgid="2754833397070967846">"启用小部件"</string>
+    <string name="security_enable_widgets_title" msgid="2754833397070967846">"启用微件"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"已被管理员停用"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"无"</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>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帐号"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帐号"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"安全性与位置信息"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密与凭据"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"手机已加密"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"手机已加密"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"锁定屏幕偏好设置"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"隐私设置"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"已被管理员停用"</string>
     <string name="security_status_title" msgid="5848766673665944640">"安全状态"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指纹"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"将指纹用于以下用途："</string>
@@ -417,7 +416,7 @@
     <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">"没有锁屏PIN码或密码"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您需要先设置锁屏PIN码或密码才能开始加密。"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您需要先设置锁屏 PIN 码或密码，才能开始加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"要加密吗？"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要1小时或更长时间，在此期间，平板电脑会重新启动数次。"</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"加密操作无法撤消，如果您中断该过程，则会丢失数据。加密过程需要1小时或更长时间，在此期间，手机会重新启动数次。"</string>
@@ -464,7 +463,7 @@
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"无安全措施"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"图案"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"中等安全性"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN码"</string>
+    <string name="unlock_set_unlock_pin_title" msgid="5846029709462329515">"PIN 码"</string>
     <string name="unlock_set_unlock_pin_summary" msgid="907878650556383388">"中高等安全性"</string>
     <string name="unlock_set_unlock_password_title" msgid="8775603825675090937">"密码"</string>
     <string name="unlock_set_unlock_password_summary" msgid="8856220848940929546">"高安全性"</string>
@@ -479,7 +478,7 @@
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"无"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"滑动"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"图案"</string>
-    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN码"</string>
+    <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN 码"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"密码"</string>
     <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"设置了屏幕锁定后，您还可以在“设置”&gt;“安全”中设置指纹。"</string>
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"关闭屏幕锁定"</string>
@@ -675,7 +674,7 @@
     <string name="android_beam_off_summary" msgid="4663095428454779138">"关闭"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"无法使用，因为NFC已关闭"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="1810540319385192758">"开启此功能后，您可以将设备靠在一起，这样就能把应用内容传输到其他支持 NFC 功能的设备。例如，您可以传输网页、YouTube 视频、通讯录等内容。\n\n只需将两台设备靠在一起（一般是背靠背），然后点按屏幕，应用便会确定要传输哪些内容。"</string>
+    <string name="android_beam_explained" msgid="1810540319385192758">"开启此功能后，只需将本设备与另一台支持 NFC 的设备靠在一起，即可将应用内容传输过去。例如，您可以传输浏览器网页、YouTube 视频、联系人信息等等。\n\n您只需将两台设备靠在一起（通常是背靠背），然后点按屏幕确认，应用就会确定传输哪些内容。"</string>
     <string name="wifi_quick_toggle_title" msgid="8850161330437693895">"WLAN"</string>
     <string name="wifi_quick_toggle_summary" msgid="2696547080481267642">"打开WLAN"</string>
     <string name="wifi_settings" msgid="29722149822540994">"WLAN"</string>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"有可用的高品质公共网络时通知我"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"自动开启 WLAN"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"位于已保存的高品质网络（例如您的家庭网络）附近时自动重新开启 WLAN"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"无法使用，因为 WLAN 搜索功能已关闭"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"避开状况不佳的网络"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"仅在WLAN互联网连接状况良好时使用WLAN网络"</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"仅使用互联网连接情况良好的网络"</string>
@@ -728,7 +728,7 @@
     <string name="wifi_menu_forget" msgid="8736964302477327114">"取消保存网络"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改网络"</string>
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"写入NFC标签"</string>
-    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"要查看可用网络，请打开WLAN。"</string>
+    <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"要查看可用网络，请打开 WLAN。"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"正在搜索WLAN网络…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"您无权更改WLAN网络。"</string>
     <string name="wifi_more" msgid="3195296805089107950">"更多"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"配置 WLAN"</string>
     <string name="wifi_advanced_mac_address_title" msgid="6571335466330978393">"MAC地址"</string>
     <string name="wifi_advanced_ip_address_title" msgid="6215297094363164846">"IP 地址"</string>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子网掩码"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 地址"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"已保存的网络"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP 设置"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"此用户无法查看或修改 WLAN 网络高级设置"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"关闭"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"要控制手机在插入基座时和/或休眠状态下的行为，请开启屏保功能。"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"启用时间"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"当前的屏保"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"立即启动"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"设置"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"拿起设备时唤醒"</string>
-    <string name="doze_title" msgid="5389406335828323273">"收到的通知屏幕"</string>
+    <string name="doze_title" msgid="2259176504273878294">"主动显示"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知时唤醒屏幕"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"放大或缩小文字"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"系统"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"浏览<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="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_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_wizard_init_title" msgid="5085400514028585772">"设置您的<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"用作便携式存储设备"</string>
@@ -1431,7 +1428,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"确认 PIN 码"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"密码不匹配"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN码不匹配！"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"解锁方式选择"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"选择解锁方式"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"密码已设置"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已设置PIN码"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"图案已设置"</string>
@@ -1528,7 +1525,7 @@
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除数据"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"卸载更新"</string>
     <string name="auto_launch_enable_text" msgid="4275746249511874845">"您已选择默认使用此应用处理某些操作。"</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"您已选择允许该应用创建小部件并查看其数据。"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"您已选择允许该应用创建微件并查看其数据。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"没有默认操作。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除默认操作"</string>
     <string name="screen_compatibility_text" msgid="1616155457673106022">"此应用可能不是针对您的屏幕设计的。您可以在此处调整其显示尺寸/比例，让它适合您的屏幕。"</string>
@@ -1538,7 +1535,7 @@
     <string name="sort_order_alpha" msgid="1410278099123670628">"按名称排序"</string>
     <string name="sort_order_size" msgid="7024513286636502362">"按大小排序"</string>
     <string name="show_running_services" msgid="5736278767975544570">"显示当前运行的服务"</string>
-    <string name="show_background_processes" msgid="2009840211972293429">"显示缓存进程"</string>
+    <string name="show_background_processes" msgid="2009840211972293429">"显示已缓存的进程"</string>
     <string name="default_emergency_app" msgid="1951760659640369980">"紧急警报应用"</string>
     <string name="reset_app_preferences" msgid="1321050641018356925">"重置应用偏好设置"</string>
     <string name="reset_app_preferences_title" msgid="6093179367325336662">"要重置应用偏好设置吗？"</string>
@@ -1615,6 +1612,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"（从未使用）"</string>
@@ -1687,11 +1685,10 @@
     <string name="keyboard_assistance_category" msgid="5843634175231134014">"键盘辅助功能"</string>
     <string name="physical_keyboard_title" msgid="8285149877925752042">"实体键盘"</string>
     <string name="show_ime" msgid="2658582193437188227">"显示虚拟键盘"</string>
-    <string name="show_ime_summary" msgid="8164993045923240698">"连接到实体键盘时使其在屏幕上保持显示状态"</string>
+    <string name="show_ime_summary" msgid="8164993045923240698">"开启后，连接到实体键盘时，它会一直显示在屏幕上"</string>
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"键盘快捷键帮助程序"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"显示可用的快捷键"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"默认"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"鼠标/触控板"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"指针速度"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"游戏控制器"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"使用振动器"</string>
@@ -1742,7 +1739,7 @@
     <string name="widget_picker_title" msgid="9130684134213467557">"选择小部件"</string>
     <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="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>
@@ -1766,7 +1763,7 @@
     <string name="display_category_title" msgid="685461049938269166">"显示"</string>
     <string name="interaction_control_category_title" msgid="7836591031872839151">"互动控件"</string>
     <string name="user_installed_services_category_title" msgid="6426376488922158647">"已下载的服务"</string>
-    <string name="experimental_category_title" msgid="5272318666666893547">"实验性"</string>
+    <string name="experimental_category_title" msgid="5272318666666893547">"实验性功能"</string>
     <string name="talkback_title" msgid="7912059827205988080">"TalkBack"</string>
     <string name="talkback_summary" msgid="8331244650729024963">"屏幕阅读器主要适用于盲人和视力不佳的人士"</string>
     <string name="select_to_speak_summary" msgid="4282846695497544515">"点按屏幕上的内容即可让系统大声朗读出来"</string>
@@ -1776,14 +1773,14 @@
     <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"使用按钮进行放大"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"使用按钮/点按屏幕三次进行放大"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"在屏幕上放大"</string>
-    <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"点按三次即可缩放"</string>
-    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"点按按钮即可缩放"</string>
-    <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_short_summary" msgid="3411979839172752057">"点按三次即可放大"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"点按按钮即可放大"</string>
+    <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_shortcut_service_title" msgid="4779360749706905640">"快捷方式服务"</string>
-    <string name="accessibility_shortcut_service_on_lock_screen_title" msgid="5490636079625489534">"允许在锁定屏幕上使用"</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_toggle_high_text_contrast_preference_title" msgid="2567402942683463779">"高对比度文字"</string>
     <string name="accessibility_toggle_screen_magnification_auto_update_preference_title" msgid="7218498768415430963">"自动更新屏幕放大状态"</string>
@@ -1912,11 +1909,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"在您未使用应用时，应用可在后台运行"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"在您未使用应用时，应用的后台活动会受限"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"不允许应用在后台运行"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"充满电后的屏幕用电量"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"上次充满电后的屏幕用电量"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"屏幕耗电量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"移动网络扫描"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g>前"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"充满电（<xliff:g id="TIME">%1$s</xliff:g>前）后的应用用电量"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"充满电（<xliff:g id="TIME">^1</xliff:g>前）后的应用用电量"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"充满电后的屏幕使用时间"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"充满电后的设备用电量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔下电源后的电量消耗情况"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"相机"</string>
     <string name="power_wifi" msgid="1135085252964054957">"WLAN"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"蓝牙"</string>
-    <string name="power_cell" msgid="6596471490976003056">"移动网络待机"</string>
+    <string name="power_cell" msgid="3392999761958982492">"移动网络空闲状态"</string>
     <string name="power_phone" msgid="5392641106474567277">"语音通话"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板电脑待机"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手机待机"</string>
@@ -2007,10 +2004,10 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"耗电量显示的是大致用电量，并不包括所有耗电来源所消耗的电量。其他耗电量显示的是系统计算出的大致耗电量与实际观察到的耗电量之间的差异量。"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"多算了的用电量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g>毫安时"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"已使用 %1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"使用时间：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用电量占 <xliff:g id="PERCENT">%1$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_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_detail_foreground" msgid="3350401514602032183">"在前台运行时"</string>
@@ -2079,7 +2076,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"语音输入与输出设置"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"语音搜索"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android键盘"</string>
-    <string name="voice_category" msgid="1430370497125803904">"语音"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"语音输入设置"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"语音输入"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"语音输入服务"</string>
@@ -2145,7 +2141,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"凭据存储空间已清空。"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"系统无法清除凭据存储。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"凭证存储已启用。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您需要先设置锁屏PIN码或密码才能使用凭据存储。"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您需要先设置锁屏 PIN 码或密码，才能使用凭据存储。"</string>
     <string name="usage_access_title" msgid="332333405495457839">"有权查看使用情况的应用"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"紧急提示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"设置进行紧急呼救时的行为"</string>
@@ -2510,7 +2506,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"受限个人资料无法添加帐号"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"将<xliff:g id="USER_NAME">%1$s</xliff:g>从此设备中删除"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"锁定屏幕设置"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"从锁定屏幕添加用户"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"允许屏幕处于锁定状态时添加用户"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新用户"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新的个人资料"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"是否删除自己？"</string>
@@ -2519,9 +2515,9 @@
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"要移除工作资料吗？"</string>
     <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"您将丢失自己在这台平板电脑上的空间和数据，此操作无法撤消。"</string>
     <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"您将丢失自己在这部手机上的空间和数据，此操作无法撤消。"</string>
-    <string name="user_confirm_remove_message" msgid="1020629390993095037">"系统将会删除所有应用和数据。"</string>
+    <string name="user_confirm_remove_message" msgid="1020629390993095037">"该用户名下的所有应用和数据都将随之删除。"</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"如果继续，则此工作资料中的所有应用和数据都会被删除。"</string>
-    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"系统将会删除所有应用和数据。"</string>
+    <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"该用户名下的所有应用和数据都将随之删除。"</string>
     <string name="user_adding_new_user" msgid="1521674650874241407">"正在添加新用户…"</string>
     <string name="user_delete_user_description" msgid="3158592592118767056">"删除用户"</string>
     <string name="user_delete_button" msgid="5131259553799403201">"删除"</string>
@@ -2731,6 +2727,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"默认通知提示音"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"应用提供的提示音"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"默认通知提示音"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"默认闹钟提示音"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"有来电时响铃并振动"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"其他提示音"</string>
@@ -2753,11 +2751,11 @@
       <item quantity="one">已启用 1 个自动规则</item>
     </plurals>
     <string name="zen_mode_settings_title" msgid="842308776768942600">"“勿扰”偏好设置"</string>
-    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"仅允许优先通知以下内容"</string>
+    <string name="zen_mode_priority_settings_title" msgid="2623117023031824309">"仅允许指定的优先事项打扰"</string>
     <string name="zen_mode_automation_settings_title" msgid="4228995740594063774">"自动规则"</string>
     <string name="zen_mode_automation_suggestion_title" msgid="5105443455143476201">"设置“勿扰”规则"</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_important_interruptions" msgid="3903928008177972500">"仅限优先事项"</string>
     <string name="zen_mode_option_alarms" msgid="5785372117288803600">"仅限闹钟"</string>
     <string name="zen_mode_option_no_interruptions" msgid="8107126344850276878">"完全阻止"</string>
     <string name="zen_mode_summary_combination" msgid="8715563402849273459">"<xliff:g id="MODE">%1$s</xliff:g>：<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string>
@@ -2792,6 +2790,7 @@
     <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="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_blocked" msgid="7938180808339386300">"一律不显示通知"</string>
@@ -2799,10 +2798,10 @@
     <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_min_summary" msgid="8233873580287975662">"低：不发出提示音，也不在屏幕上弹出通知"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"中：不发出提示音"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"高：发出提示音"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"紧急：发出提示音并在屏幕上弹出通知"</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="6585849855452076626">"允许发出提示音"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"不发出提示音，不振动，也不在当前屏幕上短暂显示这些通知。"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知助手"</string>
@@ -2836,14 +2835,16 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"“勿扰”权限"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"没有任何已安装应用申请“勿扰”权限"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android 会阻止此应用的通知显示在此设备上"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android 会阻止这类通知显示在此设备上"</string>
     <string name="notification_channels" msgid="5346841743182627500">"类别"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
     <string name="no_channels" msgid="3077375508177744586">"此应用未发布任何通知"</string>
     <string name="app_settings_link" msgid="8894946007543660906">"应用中的其他设置"</string>
     <string name="app_notification_listing_summary_zero" msgid="6482582965081108108">"已开启所有应用的通知"</string>
     <plurals name="app_notification_listing_summary_others" formatted="false" msgid="5668835155965827890">
-      <item quantity="other">已关闭 <xliff:g id="COUNT_1">%d</xliff:g> 个应用的通知</item>
-      <item quantity="one">已关闭 <xliff:g id="COUNT_0">%d</xliff:g> 个应用的通知</item>
+      <item quantity="other">已屏蔽 <xliff:g id="COUNT_1">%d</xliff:g> 个应用的通知</item>
+      <item quantity="one">已屏蔽 <xliff:g id="COUNT_0">%d</xliff:g> 个应用的通知</item>
     </plurals>
     <plurals name="deleted_channels" formatted="false" msgid="8028574302599397935">
       <item quantity="other">已删除 <xliff:g id="COUNT_1">%d</xliff:g> 个类别</item>
@@ -2859,7 +2860,7 @@
     <string name="notification_badge_title" msgid="7166470350070693657">"在应用图标上显示标记"</string>
     <string name="notification_badge_summary" msgid="3944771498030335669">"在主屏幕应用上以状态标记的形式显示通知（如果支持的话）。"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"覆盖“勿扰”设置"</string>
-    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"当勿扰模式设为“仅限优先打扰”时，允许这类通知继续打扰"</string>
+    <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"当勿扰模式设为“仅限优先事项”时，允许继续接收这类通知"</string>
     <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"屏幕锁定时"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"屏蔽"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"优先"</string>
@@ -2969,18 +2970,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持当前方向"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"安全启动"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"继续"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"您可以要求在设备启动前输入 PIN 码，为此设备提供进一步的保护。在启动前，该设备将无法接听电话、接收短信或通知（包括闹钟提醒）。\n\n这有助于保护丢失或被盗设备上的数据。"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"您可以要求在设备启动前绘制解锁图案，为此设备提供进一步的保护。在启动前，该设备将无法接听电话、接收短信或通知（包括闹钟提醒）。\n\n这有助于保护丢失或被盗设备上的数据。"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"您可以要求在设备启动前输入密码，为此设备提供进一步的保护。在启动前，该设备将无法接听电话、接收短信或通知（包括闹钟提醒）。\n\n这有助于保护丢失或被盗设备上的数据。"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"除了使用指纹解锁设备外，您还可以设置设备在启动前要求用户输入 PIN 码，以进一步保护此设备。设备启动后，才可接听电话、接收消息或通知（包括闹钟）。\n\n这样便可在设备丢失或被盗后保护设备上的数据。"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"除了使用指纹解锁设备外，您还可以设置设备在启动前要求用户绘制解锁图案，以进一步保护此设备。设备启动后，才可接听电话、接收消息或通知（包括闹钟）。\n\n这样便可在设备丢失或被盗后保护设备上的数据。"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"除了使用指纹解锁设备外，您还可以设置设备在启动前要求用户输入密码，以进一步保护此设备。设备启动后，才可接听电话、接收消息或通知（包括闹钟）。\n\n这样便可在设备丢失或被盗后保护设备上的数据。"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"要求输入 PIN 码才能启动设备"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"要求绘制图案才能启动设备"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"要求输入密码才能启动设备"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"不用了"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"不用了"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"不用了"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"为了进一步保护此设备的安全，您可以将设备设为需要输入 PIN 码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入 PIN 码才能启动吗？"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"为了进一步保护此设备的安全，您可以将设备设为需要绘制解锁图案才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要绘制解锁图案才能启动吗？"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"为了进一步保护此设备的安全，您可以将设备设为需要输入密码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"为了进一步保护此设备的安全，除了使用指纹解锁设备之外，您还可以将设备设为需要输入 PIN 码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入 PIN 码才能启动吗？"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"为了进一步保护此设备的安全，除了使用指纹解锁设备之外，您还可以将设备设为需要绘制解锁图案才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要绘制解锁图案才能启动吗？"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"为了进一步保护此设备的安全，除了使用指纹解锁设备之外，您还可以将设备设为需要输入密码才能启动。在设备启动之前，无法接听电话、接收消息或通知（包括闹钟）。\n\n这样一来，即使设备丢失或被盗，其中的数据仍安全无虞。要将设备设为需要输入密码才能启动吗？"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"是"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"否"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"要求输入 PIN 码吗？"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"要求绘制图案吗？"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"要求输入密码吗？"</string>
@@ -3036,7 +3033,7 @@
     <string name="filter_personal_apps" msgid="3277727374174355971">"个人应用"</string>
     <string name="filter_work_apps" msgid="24519936790795574">"工作应用"</string>
     <string name="filter_notif_all_apps" msgid="2299049859443680242">"应用：全部"</string>
-    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"应用：已关闭"</string>
+    <string name="filter_notif_blocked_apps" msgid="3300375727887991342">"已屏蔽的应用"</string>
     <string name="filter_notif_urgent_channels" msgid="3972473613117159653">"类别：重要性 - 紧急"</string>
     <string name="filter_notif_low_channels" msgid="4128487387390004604">"类别：重要性 - 低"</string>
     <string name="filter_notif_blocked_channels" msgid="5880190882221644289">"类别：已关闭"</string>
@@ -3076,7 +3073,7 @@
     <string name="default_app" msgid="6864503001385843060">"（默认）"</string>
     <string name="system_app" msgid="9068313769550747372">"（系统）"</string>
     <string name="system_default_app" msgid="3091113402349739037">"（系统默认）"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"应用存储空间"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"应用所占存储空间"</string>
     <string name="usage_access" msgid="5479504953931038165">"使用情况访问权限"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"允许访问使用记录"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"应用使用偏好设置"</string>
@@ -3204,9 +3201,9 @@
     <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_trusted" msgid="6857780460845250885">"是"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"否"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"允许安装应用"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"允许"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"不允许"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"按电源按钮两次即可打开相机"</string>
@@ -3231,10 +3228,10 @@
     <string name="disconnected" msgid="4836600637485526329">"未连接"</string>
     <string name="data_usage_summary_format" msgid="7507047900192160585">"已使用 <xliff:g id="AMOUNT">%1$s</xliff:g> 的数据"</string>
     <plurals name="notification_summary" formatted="false" msgid="3941492005316143599">
-      <item quantity="other">已关闭 <xliff:g id="COUNT">%d</xliff:g> 个应用的通知</item>
-      <item quantity="one">已关闭 1 个应用的通知</item>
+      <item quantity="other">已屏蔽 <xliff:g id="COUNT">%d</xliff:g> 个应用的通知</item>
+      <item quantity="one">已屏蔽 1 个应用的通知</item>
     </plurals>
-    <string name="notification_summary_none" msgid="4586376436702610">"已开启所有应用的通知"</string>
+    <string name="notification_summary_none" msgid="4586376436702610">"目前设为接收所有应用的通知"</string>
     <string name="apps_summary" msgid="193158055537070092">"已安装 <xliff:g id="COUNT">%1$d</xliff:g> 个应用"</string>
     <string name="apps_summary_example" msgid="2118896966712746139">"已安装 24 个应用"</string>
     <string name="storage_summary" msgid="3801281635351732202">"已使用 <xliff:g id="PERCENTAGE">%1$s</xliff:g> - 还剩 <xliff:g id="FREE_SPACE">%2$s</xliff:g>"</string>
@@ -3392,7 +3389,8 @@
     <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_connected_summary" msgid="8733997010923307915">"已连接到"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快捷设置开发者图块"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"我们会随时为您提供帮助"</string>
@@ -3462,7 +3460,7 @@
     <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="2521630136233865893">"要快速查看通知，请在屏幕上点按两次。"</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="8696432220086951466">"要快速查看通知，请拿起您的手机。"</string>
@@ -3569,9 +3567,9 @@
     <string name="storage_other_apps" msgid="5524321740031718083">"其他应用"</string>
     <string name="storage_files" msgid="8581083146777364063">"文件"</string>
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"平板电脑存储空间"</string>
-    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手机存储空间"</string>
+    <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手机存储空间使用情况"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"使用量：<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"（总共 <xliff:g id="TOTAL">%1$s</xliff:g>）"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"清除应用"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"要移除这个免安装应用吗？"</string>
@@ -3581,7 +3579,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"（已为用户<xliff:g id="USER">%s</xliff:g>停用）"</string>
     <string name="autofill_app" msgid="7338387238377914374">"自动填充服务"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"自动, 填充, 自动填充, auto, fill, autofill"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"要将<xliff:g id="APP_NAME_0">%1$s</xliff:g>设为您的自动填充应用吗？<xliff:g id="APP_NAME_1">%1$s</xliff:g>将能够读取您的屏幕内容，并在其他应用中填充字段。"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;请确认这是您信任的应用&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;会根据您的屏幕内容判断可自动填充哪些内容。"</string>
     <string name="device_theme" msgid="4571803018917608588">"设备主题背景"</string>
     <string name="default_theme" msgid="7085644992078579076">"默认"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"存储空间管理器：<xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 1ce8f88..4cb0452 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"無"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"無"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index f47a515..04c6814 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -151,8 +151,8 @@
     <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"您要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎？"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"電話簿存取權要求"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g> 要求存取您的聯絡人和通話記錄。允許 <xliff:g id="DEVICE_NAME_1">%2$s</xliff:g> 存取這些資料嗎？"</string>
-    <string name="bluetooth_remember_choice" msgid="6919682671787049800">"不要再詢問"</string>
-    <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"不要再詢問"</string>
+    <string name="bluetooth_remember_choice" msgid="6919682671787049800">"不要再問我"</string>
+    <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"不要再問我"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"訊息存取權要求"</string>
     <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 想存取您的訊息，要授予 %2$s 存取權嗎？"</string>
     <string name="bluetooth_sap_request" msgid="2669762224045354417">"SIM 卡存取權要求"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帳戶"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"位置"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"安全性與位置"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密和憑證"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"手機已加密"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"手機已加密"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"螢幕鎖定偏好設定"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"私隱權"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"已由管理員停用"</string>
     <string name="security_status_title" msgid="5848766673665944640">"安全性狀態"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指紋"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"使用指紋"</string>
@@ -446,7 +445,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="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"為加強保安，請設定後備螢幕鎖定方式。"</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>
@@ -469,12 +468,12 @@
     <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="current_screen_lock" msgid="4104091715420072219">"目前的螢幕鎖定方式"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"指紋 + 上鎖圖形"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"指紋 + PIN"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"指紋 + 密碼"</string>
     <string name="fingerprint_unlock_skip_fingerprint" msgid="1441077909803666681">"不設定指紋並繼續"</string>
-    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"您可以使用指紋解鎖手機。基於保安理由，此選項需要設定備援螢幕鎖定方法。"</string>
+    <string name="fingerprint_unlock_title" msgid="2826226740306003991">"您可以使用指紋解鎖手機。為安全起見，此選項需要設定後備螢幕鎖定方式。"</string>
     <string name="unlock_set_unlock_disabled_summary" msgid="2051593894736282302">"已由管理員、加密政策或認證儲存空間停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"無"</string>
     <string name="unlock_set_unlock_mode_none" msgid="8467360084676871617">"快速滑動"</string>
@@ -692,6 +691,7 @@
     <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>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi‑Fi 掃瞄功能已關閉，因此無法使用"</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>
@@ -791,7 +791,7 @@
     <string name="wifi_hotspot_message" msgid="3673833421453455747">"您必須先為 <xliff:g id="APP_NAME">%1$s</xliff:g> 進行網上登入才能連線上網。"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"連線"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"此網絡並未連接互聯網，您仍要保持連線嗎？"</string>
-    <string name="no_internet_access_remember" msgid="4697314331614625075">"不要再詢問我是否使用此網絡"</string>
+    <string name="no_internet_access_remember" msgid="4697314331614625075">"不要再問我是否使用此網絡"</string>
     <string name="lost_internet_access_title" msgid="6228530645663584505">"Wi-Fi 並未連線至互聯網"</string>
     <string name="lost_internet_access_text" msgid="9029649339816197345">"Wi-Fi 連線情況欠佳時，您可以切換至流動網絡 (可能需要支付數據用量費用)。"</string>
     <string name="lost_internet_access_switch" msgid="2262459569601190039">"切換至流動網絡"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"設定 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網絡遮罩"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"網域名稱系統 (DNS)"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 位址"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"已儲存的網絡"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP 設定"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"這位使用者無法查看或變更 Wi-Fi 進階設定"</string>
@@ -897,7 +895,7 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"當開啟 Wi-Fi 通話時，您的手機可根據偏好設定及訊號強弱，選擇使用 Wi-Fi 網絡或流動網絡供應商的網絡安排來電轉接。開啟此功能前，請向您的流動網絡供應商查詢收費及其他詳情。"</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"當開啟 Wi-Fi 通話時，您的手機可根據偏好設定及訊號強弱，選擇使用 Wi-Fi 網絡或流動網絡供應商的網絡安排來電轉駁。開啟此功能前，請向您的流動網絡供應商查詢收費及其他詳情。"</string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
     <string name="emergency_address_summary" msgid="306028701568728126">"當您使用 Wi-Fi 致電 911 時，緊急服務使用的地址將會作為您的地點"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
@@ -964,7 +962,7 @@
     <string name="brightness_summary" msgid="838917350127550703">"調校螢幕亮度"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"自動調校亮度"</string>
     <string name="auto_brightness_summary" msgid="1799041158760605375">"按環境光線優化亮度"</string>
-    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"已關閉"</string>
+    <string name="auto_brightness_summary_off" msgid="2802336459335410626">"關閉"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"偏好的亮度為非常低"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"偏好的亮度為低"</string>
     <string name="auto_brightness_summary_default" msgid="7225666614394726845">"偏好的亮度為預設"</string>
@@ -991,11 +989,11 @@
     <string name="night_display_start_time_title" msgid="8918016772613689584">"開始時間"</string>
     <string name="night_display_end_time_title" msgid="8286061578083519350">"結束時間"</string>
     <string name="night_display_temperature_title" msgid="1435292789272017136">"濃度"</string>
-    <string name="night_display_summary_off" msgid="7009821232380000786">"已關閉。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_off" msgid="7009821232380000786">"關閉。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_off_auto_mode_never" msgid="2305501561697289620">"永遠不會自動開啟。"</string>
     <string name="night_display_summary_off_auto_mode_custom" msgid="1548073080728058384">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動開啟。"</string>
     <string name="night_display_summary_off_auto_mode_twilight" msgid="2737328390752018845">"將會在日落時自動開啟。"</string>
-    <string name="night_display_summary_on" msgid="6626224414971753417">"已開啟。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
+    <string name="night_display_summary_on" msgid="6626224414971753417">"開啟。<xliff:g id="ID_1">%1$s</xliff:g>"</string>
     <string name="night_display_summary_on_auto_mode_never" msgid="5217396859715040056">"永遠不會自動關閉。"</string>
     <string name="night_display_summary_on_auto_mode_custom" msgid="887702685252504739">"將會在<xliff:g id="ID_1">%1$s</xliff:g>自動關閉。"</string>
     <string name="night_display_summary_on_auto_mode_twilight" msgid="8574989770628425398">"將會在日出時自動關閉。"</string>
@@ -1017,19 +1015,18 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"如要控制手機在插座上和/或休眠時的操作，請開啟螢幕保護程式。"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"啟用時間"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"目前的螢幕保護程式"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"立即開始"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
-    <string name="doze_title" msgid="5389406335828323273">"收到的通知螢幕"</string>
+    <string name="doze_title" msgid="2259176504273878294">"環境顯示"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
     <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>
     <string name="sim_lock_settings_category" msgid="6242052161214271091">"SIM 卡鎖定"</string>
-    <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"已關閉"</string>
+    <string name="sim_lock_settings_summary_off" msgid="8028944267104896401">"關閉"</string>
     <string name="sim_lock_settings_summary_on" msgid="39103355956342985">"已鎖定"</string>
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡鎖定"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"鎖定 SIM 卡"</string>
@@ -1037,7 +1034,7 @@
     <string name="sim_lock_on" product="default" msgid="2503536505568814324">"需要 PIN 才能使用手機"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"需要 PIN 碼才能使用平板電腦"</string>
     <string name="sim_lock_off" product="default" msgid="258981978215428916">"需要 PIN 才能使用手機"</string>
-    <string name="sim_pin_change" msgid="6311414184279932368">"更改 SIM PIN"</string>
+    <string name="sim_pin_change" msgid="6311414184279932368">"變更 SIM 卡的 PIN"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM PIN"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"鎖定 SIM 卡"</string>
     <string name="sim_disable_sim_lock" msgid="7664729528754784824">"解除 SIM 卡鎖定"</string>
@@ -1204,7 +1201,7 @@
     <string name="storage_detail_system" msgid="4629506366064709687">"系統"</string>
     <string name="storage_detail_explore" msgid="7911344011431568294">"探索 <xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_detail_dialog_other" msgid="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_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_wizard_init_title" msgid="5085400514028585772">"設定您的<xliff:g id="NAME">^1</xliff:g>"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"作為可攜式儲存裝置使用"</string>
@@ -1316,7 +1313,7 @@
     <string name="master_clear_progress_title" msgid="5194793778701994634">"正在清除"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"請稍候…"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"設定留言信箱、來電轉接、來電待接和來電顯示"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"設定留言信箱、來電轉駁、來電等候和來電顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網絡共享"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式熱點"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網絡共享"</string>
@@ -1380,8 +1377,8 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"使用 GPS、Wi‑Fi、藍牙或流動網絡定位"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"使用 Wi‑Fi、藍牙或流動網絡定位"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 確定位置"</string>
-    <string name="location_scanning_screen_title" msgid="4408076862929611554">"正在掃瞄"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 定位"</string>
+    <string name="location_scanning_screen_title" msgid="4408076862929611554">"掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi 掃瞄"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"允許系統應用程式和服務隨時偵測 Wi-Fi 網絡，以提高位置資訊的準確度。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃瞄"</string>
@@ -1601,7 +1598,7 @@
     <string name="system_package" msgid="1352722848400644991">"無法在外部媒體上安裝系統更新。"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"無法在外部媒體上安裝裝置管理應用程式"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"您要強制停止嗎？"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"如果您強制停止應用程式，應用程式或會不能正常操作。"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"強制停止應用程式，可能會導致操作不正常。"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"無法移動應用程式。<xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"偏好的安裝位置"</string>
@@ -1616,6 +1613,7 @@
     <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="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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(從未使用)"</string>
@@ -1692,7 +1690,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"鍵盤快速鍵助手"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"顯示可用的快速鍵"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"預設"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"滑鼠/觸控板"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"游標速度"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"遊戲控制器"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"使用震動"</string>
@@ -1799,8 +1796,8 @@
     <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="accessibility_summary_state_enabled" msgid="8359913912320966304">"開啟"</string>
+    <string name="accessibility_summary_state_disabled" msgid="2241315620132005595">"關閉"</string>
     <string name="enable_quick_setting" msgid="2366999897816894536">"在「快速設定」中顯示"</string>
     <string name="daltonizer_type" msgid="1124178250809091080">"校準模式"</string>
     <plurals name="accessibilty_autoclick_preference_subtitle_extremely_short_delay" formatted="false" msgid="7340347830562315800">
@@ -1873,7 +1870,7 @@
     <string name="accessibility_service_default_description" msgid="1072730037861494125">"未提供說明。"</string>
     <string name="settings_button" msgid="3006713718908152930">"設定"</string>
     <string name="print_settings" msgid="4742428530112487843">"列印"</string>
-    <string name="print_settings_summary_no_service" msgid="6354322414246865875">"已關閉"</string>
+    <string name="print_settings_summary_no_service" msgid="6354322414246865875">"關閉"</string>
     <plurals name="print_settings_summary" formatted="false" msgid="6005468025646083029">
       <item quantity="other">已啟用 <xliff:g id="COUNT">%1$d</xliff:g> 項列印服務</item>
       <item quantity="one">已啟用 1 項列印服務</item>
@@ -1913,13 +1910,13 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"在不使用應用程式時，應用程式可在背景中執行"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"在不使用應用程式時，應用程式的背景活動會受限制"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"不允許應用程式在背景中執行"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"自上次完全充電後的螢幕使用情況"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"充滿電後的螢幕用量"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"流動網絡掃瞄"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g>前"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"自上次完全充電後的應用程式使用情況 (<xliff:g id="TIME">%1$s</xliff:g>前)"</string>
-    <string name="screen_usage_summary" msgid="6687403051423153550">"自上次完全充電後的螢幕開啟時間"</string>
-    <string name="device_usage_list_summary" msgid="5623036661468763251">"自上次完全充電後的裝置使用情況"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>前"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"充滿電後的應用程式用量 (<xliff:g id="TIME">^1</xliff:g>前)"</string>
+    <string name="screen_usage_summary" msgid="6687403051423153550">"充滿電後的螢幕開啟時間"</string>
+    <string name="device_usage_list_summary" msgid="5623036661468763251">"充滿電後的裝置用量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
     <string name="battery_since_reset" msgid="7464546661121187045">"重設後的電池使用狀況"</string>
     <string name="battery_stats_on_battery" msgid="4970762168505236033">"電池電力剩餘時間：<xliff:g id="TIME">%1$s</xliff:g>"</string>
@@ -1948,7 +1945,7 @@
     <string name="power_camera" msgid="4976286950934622605">"相機"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"藍牙"</string>
-    <string name="power_cell" msgid="6596471490976003056">"手機待命"</string>
+    <string name="power_cell" msgid="3392999761958982492">"流動網絡備用中"</string>
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板電腦閒置"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
@@ -2008,17 +2005,17 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"電池用量是估計的用電量，並非所有耗電來源均計算在內。其他用電量是指估計耗電量與實際電池用量的差額。"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"計算過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"已使用時間：%1$s"</string>
-    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g> 的電池用量佔 <xliff:g id="PERCENT">%1$s</xliff:g>"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
+    <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$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_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_detail_foreground" msgid="3350401514602032183">"在前景中執行時"</string>
     <string name="battery_detail_background" msgid="1929644393553768999">"在背景中執行時"</string>
     <string name="battery_detail_power_usage" msgid="6485766868610469101">"電池用量"</string>
     <string name="battery_detail_power_percentage" msgid="8064814503316094497">"應用程式總電池用量的 <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
-    <string name="battery_detail_info_title" msgid="8227822131405620369">"自上次完全充電後"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"上次充滿電後"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"管理電池用量"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"估計剩餘時間"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"剩餘充電時間"</string>
@@ -2080,7 +2077,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"語音輸入與輸出裝置設定"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"語音搜尋"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android 鍵盤"</string>
-    <string name="voice_category" msgid="1430370497125803904">"語音"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"語音輸入設定"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"語音輸入"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"語音輸入服務"</string>
@@ -2502,7 +2498,7 @@
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"限制存取的個人檔案"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"新增使用者？"</string>
     <string name="user_add_user_message_long" msgid="8562152293752222985">"您可以建立額外的使用者，與他人分享這部裝置。每位使用者都有各自的個人空間，可使用自己的應用程式和桌布等自訂。此外，他們可以調整影響所有使用者的裝置設定 (例如 Wi-Fi 設定)。\n\n新增的使用者需要自行設定個人空間。\n\n任何使用者都可以為其他所有使用者更新應用程式。"</string>
-    <string name="user_add_user_message_short" msgid="1511354412249044381">"新增使用者後，該新使用者需要設定個人空間。\n\n任何使用者都可以為其他所有使用者更新應用程式。"</string>
+    <string name="user_add_user_message_short" msgid="1511354412249044381">"新增的使用者需要自行設定個人空間。\n\n任何使用者都可以為其他所有使用者更新應用程式。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"立即設定使用者？"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"請確定對方現在可以使用裝置設定自己的空間"</string>
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"立即設定個人檔案？"</string>
@@ -2513,7 +2509,7 @@
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"限制存取的個人檔案無法新增帳戶"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"將 <xliff:g id="USER_NAME">%1$s</xliff:g> 從這部裝置中刪除"</string>
     <string name="user_lockscreen_settings" msgid="4965661345247084878">"上鎖畫面設定"</string>
-    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"在螢幕鎖定中加入使用者"</string>
+    <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"螢幕鎖定時新增使用者"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新使用者"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新個人檔案"</string>
     <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"您要刪除自己嗎？"</string>
@@ -2533,12 +2529,12 @@
     <string name="user_exit_guest_confirm_title" msgid="3405527634738147409">"移除訪客？"</string>
     <string name="user_exit_guest_confirm_message" msgid="2194459201944413257">"這個工作階段中的所有應用程式和資料都會被刪除。"</string>
     <string name="user_exit_guest_dialog_remove" msgid="6351370829952745350">"移除"</string>
-    <string name="user_enable_calling" msgid="5128605672081602348">"開啟手機通話"</string>
-    <string name="user_enable_calling_sms" msgid="9172507088023097063">"開啟手機通話和短訊"</string>
+    <string name="user_enable_calling" msgid="5128605672081602348">"開啟通話功能"</string>
+    <string name="user_enable_calling_sms" msgid="9172507088023097063">"開啟通話和短訊功能"</string>
     <string name="user_remove_user" msgid="6490483480937295389">"移除使用者"</string>
-    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"要開啟手機通話嗎？"</string>
+    <string name="user_enable_calling_confirm_title" msgid="4315789475268695378">"開啟通話功能？"</string>
     <string name="user_enable_calling_confirm_message" msgid="8061594235219352787">"通話記錄將與這位使用者分享。"</string>
-    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"開啟手機通話和短訊？"</string>
+    <string name="user_enable_calling_and_sms_confirm_title" msgid="7243308401401932681">"開啟通話和短訊功能？"</string>
     <string name="user_enable_calling_and_sms_confirm_message" msgid="4025082715546544967">"通話和短訊記錄都會與這位使用者分享。"</string>
     <string name="emergency_info_title" msgid="208607506217060337">"緊急資料"</string>
     <string name="emergency_info_summary" msgid="5062945162967838521">"<xliff:g id="USER_NAME">%1$s</xliff:g>的相關資訊和聯絡資料"</string>
@@ -2734,6 +2730,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"預設通知音效"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"應用程式提供的音效"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"預設通知音效"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"預設鬧鐘音效"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"來電時同時震動"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
@@ -2783,7 +2781,7 @@
     <string name="advanced_section_header" msgid="8833934850242546903">"進階"</string>
     <string name="profile_section_header" msgid="2320848161066912001">"工作通知"</string>
     <string name="notification_pulse_title" msgid="1905382958860387030">"閃燈"</string>
-    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"畫面上鎖時"</string>
+    <string name="lock_screen_notifications_title" msgid="6173076173408887213">"螢幕鎖定畫面上"</string>
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏敏感通知內容"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"完全不顯示通知"</string>
@@ -2795,6 +2793,7 @@
     <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="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_blocked" msgid="7938180808339386300">"永不顯示通知"</string>
@@ -2802,10 +2801,10 @@
     <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_min_summary" msgid="8233873580287975662">"低：不發出音效或顯示通知"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"中：不發出音效"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"高：發出音效"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"緊急：發出音效並在螢幕上彈出通知"</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="6585849855452076626">"允許發出音效"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"禁止這些通知發出音效、震動或不時於目前螢幕上出現。"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知小幫手"</string>
@@ -2839,6 +2838,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"[請勿騷擾] 存取"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"沒有已安裝的應用程式要求 [請勿騷擾] 存取。"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android 已禁止這個應用程式在此裝置上顯示通知"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android 已禁止在此裝置上顯示這個類別的通知"</string>
     <string name="notification_channels" msgid="5346841743182627500">"類別"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
     <string name="no_channels" msgid="3077375508177744586">"此應用程式未發佈任何通知"</string>
@@ -2853,8 +2854,8 @@
       <item quantity="one">已刪除 <xliff:g id="COUNT_0">%d</xliff:g> 個類別</item>
     </plurals>
     <string name="notification_badges" msgid="4468378071033143539">"通知標誌"</string>
-    <string name="notification_toggle_on" msgid="650145396718191048">"已開啟"</string>
-    <string name="notification_toggle_off" msgid="2142010737190671762">"已關閉"</string>
+    <string name="notification_toggle_on" msgid="650145396718191048">"開啟"</string>
+    <string name="notification_toggle_off" msgid="2142010737190671762">"關閉"</string>
     <string name="app_notification_block_title" msgid="4069351066849087649">"全部封鎖"</string>
     <string name="app_notification_block_summary" msgid="4744020456943215352">"永不顯示這些通知"</string>
     <string name="notification_content_block_title" msgid="5854232570963006360">"顯示通知"</string>
@@ -2863,7 +2864,7 @@
     <string name="notification_badge_summary" msgid="3944771498030335669">"在 Home 應用程式以狀態標籤形式顯示通知 (如支援)。"</string>
     <string name="app_notification_override_dnd_title" msgid="7867458246395884830">"取代「請勿騷擾」"</string>
     <string name="app_notification_override_dnd_summary" msgid="3516007157020189746">"當「請勿騷擾」設定為「僅限優先」時，允許顯示這些通知"</string>
-    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"畫面上鎖時"</string>
+    <string name="app_notification_visibility_override_title" msgid="2187232730902430718">"螢幕鎖定畫面上"</string>
     <string name="app_notification_row_banned" msgid="5983655258784814773">"已封鎖"</string>
     <string name="app_notification_row_priority" msgid="7723839972982746568">"重要"</string>
     <string name="app_notification_row_sensitive" msgid="1809610030432329940">"敏感"</string>
@@ -2913,9 +2914,9 @@
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
     <string name="zen_mode_all_messages" msgid="6449223378976743208">"所有訊息"</string>
     <string name="zen_mode_selected_messages" msgid="8245990149599142281">"已選訊息"</string>
-    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"來自任何人"</string>
-    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"只限來自聯絡人"</string>
-    <string name="zen_mode_from_starred" msgid="2678345811950997027">"只限來自已加星號的聯絡人"</string>
+    <string name="zen_mode_from_anyone" msgid="2638322015361252161">"任何人"</string>
+    <string name="zen_mode_from_contacts" msgid="2232335406106711637">"只限聯絡人"</string>
+    <string name="zen_mode_from_starred" msgid="2678345811950997027">"只限已加星號的聯絡人"</string>
     <string name="zen_mode_from_none" msgid="8219706639954614136">"無"</string>
     <string name="zen_mode_alarms" msgid="2165302777886552926">"鬧鐘"</string>
     <string name="zen_mode_reminders" msgid="5458502056440485730">"提醒"</string>
@@ -2943,9 +2944,9 @@
     <string name="zen_mode_summary_alarms_only_by_time" msgid="7465525754879341907">"響 <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>前改為只允許鬧鐘"</string>
     <string name="zen_mode_summary_always" msgid="6172985102689237703">"變更為永遠允許干擾"</string>
     <string name="zen_mode_screen_on" msgid="7712038508173845101">"螢幕開啟時封鎖"</string>
-    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"防止已透過「請勿騷擾」模式設為靜音的通知在螢幕上出現或彈出"</string>
+    <string name="zen_mode_screen_on_summary" msgid="6444425984146305149">"防止「請勿騷擾」設為靜音的通知在螢幕上出現或彈出"</string>
     <string name="zen_mode_screen_off" msgid="5026854939192419879">"螢幕關閉時封鎖"</string>
-    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"防止已透過「請勿騷擾」模式設為靜音的通知開啟螢幕或令通知燈閃爍"</string>
+    <string name="zen_mode_screen_off_summary" msgid="6490932947651798094">"防止「請勿騷擾」設為靜音的通知開啟螢幕或通知閃燈"</string>
     <string name="zen_mode_screen_off_summary_no_led" msgid="3758698381956461866">"防止已啟用「請勿騷擾」的通知開啟螢幕"</string>
     <string name="zen_mode_all_visual_interruptions" msgid="2851308980832487411">"關閉"</string>
     <string name="zen_mode_screen_on_visual_interruptions" msgid="7373348148129140528">"螢幕開啟時"</string>
@@ -2957,7 +2958,7 @@
     <string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"關閉"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"螢幕固定"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"開啟這項設定時，您可以使用螢幕固定功能讓目前的畫面持續顯示，直到取消固定為止。\n\n如何使用螢幕固定功能：\n\n1. 確認已開啟螢幕固定功能。\n\n2. 開啟要固定的畫面。\n\n3. 輕按 [概覽]。\n\n4. 向上快速滑動並輕按圖釘圖示。"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"開啟這項設定後，您可以使用螢幕固定功能持續顯示目前的畫面，直到取消固定為止。\n\n如何使用螢幕固定功能：\n\n1. 確定已開啟螢幕固定功能。\n\n2. 開啟要固定的畫面。\n\n3. 輕按 [概覽]。\n\n4. 向上快速滑動並輕按圖釘圖示。"</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"取消固定時必須提供解鎖圖形"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
@@ -2972,18 +2973,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"安全啟動"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"繼續"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"您可以在裝置啟動前要求輸入 PIN，以進一步保障這部裝置的安全。裝置在啟動前，將無法接收來電、短訊或通知，包括鬧鐘。\n\n在裝置遺失或被盜時，這個設定有助保障資料安全。"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"您可以在裝置啟動前要求輸入解鎖圖案，以進一步保障這部裝置的安全。裝置在啟動前，將無法接收來電、短訊或通知，包括鬧鐘。\n\n在裝置遺失或被盜時，這個設定有助保障資料安全。"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"您可以在裝置啟動前要求輸入密碼，以進一步保障這部裝置的安全。裝置在啟動前，將無法接收來電、短訊或通知，包括鬧鐘。\n\n在裝置遺失或被盜時，這個設定有助保障資料安全。"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"除了使用指紋解鎖裝置外，您亦可設定在啟動前要求輸入 PIN，進一步保障此裝置安全。在裝置啟動前，裝置無法接收來電、訊息或通知，包括鬧鐘。\n\n這有助保障遺失或被盜裝置的資料安全。"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"除了使用指紋解鎖裝置外，您亦可設定在啟動前要求繪畫圖案，進一步保障此裝置安全。在裝置啟動前，裝置無法接收來電、訊息或通知，包括鬧鐘。\n\n這有助保障遺失或被盜裝置的資料安全。"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"除了使用指紋解鎖裝置外，您亦可設定在啟動前要求輸入密碼，進一步保障此裝置安全。在裝置啟動前，裝置無法接收來電、訊息或通知，包括鬧鐘。\n\n這有助保障遺失或被盜裝置的資料安全。"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"需要輸入 PIN 才能啟動裝置"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"啟動裝置前必須輸入解鎖圖形"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"需要輸入密碼才能啟動裝置"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"不用了，謝謝"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"不用了，謝謝"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"不用了，謝謝"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"為加強保護此裝置，您可以在裝置啟動前要求輸入 PIN 碼。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求輸入 PIN 碼嗎？"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"為加強保護此裝置，您可以在裝置啟動前要求畫出上鎖圖案。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求畫出上鎖圖案嗎？"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"為加強保護此裝置，您可以在裝置啟動前要求輸入密碼。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求輸入密碼嗎？"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"為加強保護此裝置，除了使用指紋解鎖裝置外，您亦可以在裝置啟動前要求輸入 PIN 碼。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求輸入 PIN 碼嗎？"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"為加強保護此裝置，除了使用指紋解鎖裝置外，您亦可以在裝置啟動前要求畫出上鎖圖案。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求畫出上鎖圖案嗎？"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"為加強保護此裝置，除了使用指紋解鎖裝置外，您亦可以在裝置啟動前要求輸入密碼。裝置啟動前，您將無法接收來電、訊息或通知 (包括鬧鐘)。\n\n這有助保護遺失或被盜裝置上的資料。要在啟動裝置時要求輸入密碼嗎？"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"是"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"否"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"要求輸入 PIN 嗎？"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"要求輸入解鎖圖案嗎？"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"要求輸入密碼嗎？"</string>
@@ -3079,7 +3076,7 @@
     <string name="default_app" msgid="6864503001385843060">"(預設)"</string>
     <string name="system_app" msgid="9068313769550747372">"(系統)"</string>
     <string name="system_default_app" msgid="3091113402349739037">"(系統預設)"</string>
-    <string name="apps_storage" msgid="4353308027210435513">"應用程式儲存"</string>
+    <string name="apps_storage" msgid="4353308027210435513">"應用程式儲存空間"</string>
     <string name="usage_access" msgid="5479504953931038165">"使用記錄存取權"</string>
     <string name="permit_usage_access" msgid="4012876269445832300">"允許使用記錄存取權"</string>
     <string name="app_usage_preference" msgid="7065701732733134991">"應用程式使用喜好"</string>
@@ -3096,7 +3093,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g> / <xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"電池優化"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"電量警示"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"用量警示"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"顯示所有應用程式"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"隱藏其他應用程式"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"尚未優化"</string>
@@ -3106,9 +3103,9 @@
     <string name="high_power_desc" msgid="6283926163708585760">"不使用電池優化，可能會加速耗電。"</string>
     <string name="high_power_prompt_title" msgid="6358673688590282655">"允許應用程式一律在背景中執行嗎？"</string>
     <string name="high_power_prompt_body" msgid="1031422980602565049">"允許「<xliff:g id="APP_NAME">%1$s</xliff:g>」一律在背景中執行可能會縮短電池壽命。\n\n您日後可以前往「設定」&gt;「應用程式與通知」中變更這項設定。"</string>
-    <string name="battery_summary" msgid="8044042095190688654">"自上次完全充電後已使用 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
-    <string name="battery_power_management" msgid="5571519699679107523">"電源管理"</string>
-    <string name="no_battery_summary" msgid="3528036835462846814">"自上次完全充電後，沒有消耗電量"</string>
+    <string name="battery_summary" msgid="8044042095190688654">"上次充滿電後使用了 <xliff:g id="PERCENTAGE">%1$s</xliff:g>"</string>
+    <string name="battery_power_management" msgid="5571519699679107523">"電量管理"</string>
+    <string name="no_battery_summary" msgid="3528036835462846814">"上次充滿電後沒有耗電"</string>
     <string name="app_notification_preferences" msgid="1599319335092722613">"應用程式設定"</string>
     <string name="system_ui_settings" msgid="579824306467081123">"顯示系統使用者介面調諧器"</string>
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
@@ -3207,9 +3204,9 @@
     <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_trusted" msgid="6857780460845250885">"是"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"否"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"允許安裝應用程式"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"允許"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"不允許"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"連按電源按鈕兩次以啟動相機"</string>
@@ -3324,7 +3321,7 @@
       <item quantity="one">「數據節省模式」開啟時，允許 1 個應用程式使用無限制數據</item>
     </plurals>
     <string name="data_saver_title" msgid="398458827917495765">"數據節省程式"</string>
-    <string name="unrestricted_data_saver" msgid="7019858887510062789">"無限制數據存取"</string>
+    <string name="unrestricted_data_saver" msgid="7019858887510062789">"數據用量不限"</string>
     <string name="restrict_background_blacklisted" msgid="3995443391711013068">"背景數據已關閉"</string>
     <string name="data_saver_on" msgid="6774217590237934709">"開啟"</string>
     <string name="data_saver_off" msgid="6892309031162738794">"關閉"</string>
@@ -3338,7 +3335,7 @@
     <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>
+    <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>
@@ -3395,7 +3392,8 @@
     <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_connected_summary" msgid="8733997010923307915">"已連線至"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"快速設定開發人員圖塊"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"我們樂意為您提供協助"</string>
@@ -3414,7 +3412,7 @@
     <string name="support_escalation_by_phone" msgid="4843223043487058711">"電話"</string>
     <string name="support_escalation_by_chat" msgid="977019859110763749">"即時通訊"</string>
     <string name="support_tips_and_tricks_title" msgid="4153466795695447828">"探索提示和技巧"</string>
-    <string name="support_help_feedback_title" msgid="693440287222186718">"搜尋說明和傳送意見反映"</string>
+    <string name="support_help_feedback_title" msgid="693440287222186718">"搜尋說明和傳送意見"</string>
     <string name="support_sign_in_required_title" msgid="1367187789121480440">"聯絡支援團隊"</string>
     <string name="support_sign_in_button_text" msgid="3054769428620671241">"登入"</string>
     <string name="support_sign_in_required_help" msgid="5200654782405538114">"無法登入嗎？"</string>
@@ -3584,7 +3582,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(已為使用者 (<xliff:g id="USER">%s</xliff:g>) 停用)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"自動填入服務"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"自動, 填入, 自動填入"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"要將「<xliff:g id="APP_NAME_0">%1$s</xliff:g>」設定為自動填入應用程式嗎？「<xliff:g id="APP_NAME_1">%1$s</xliff:g>」能夠讀取您的螢幕內容，並在其他應用程式上填入欄位。"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;請確定您信任此應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; 應用程式會根據您畫面上的內容判斷可自動填入的資料。"</string>
     <string name="device_theme" msgid="4571803018917608588">"裝置主題"</string>
     <string name="default_theme" msgid="7085644992078579076">"預設"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index 7276b23..7d52a49 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"MSCHAPV2"</item>
     <item msgid="5302613883318643629">"GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"無"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"無"</item>
     <item msgid="6189918678874123056">"PAP"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index ea8b912..cd03025 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -25,11 +25,11 @@
     <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="other">您只需完成剩餘的 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
-      <item quantity="one">您只需完成剩餘的 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
+      <item quantity="other">你只需完成剩餘的 <xliff:g id="STEP_COUNT_1">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
+      <item quantity="one">你只需完成剩餘的 <xliff:g id="STEP_COUNT_0">%1$d</xliff:g> 個步驟，即可成為開發人員。</item>
     </plurals>
-    <string name="show_dev_on" msgid="1110711554982716293">"您現在已成為開發人員！"</string>
-    <string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
+    <string name="show_dev_on" msgid="1110711554982716293">"你現在已成為開發人員！"</string>
+    <string name="show_dev_already" msgid="2151632240145446227">"不需要了，你已經是開發人員。"</string>
     <string name="header_category_wireless_networks" msgid="5110914332313954940">"無線與網路"</string>
     <string name="header_category_connections" msgid="6471513040815680662">"連線方式"</string>
     <string name="header_category_device" msgid="4544026001618307754">"裝置"</string>
@@ -107,8 +107,8 @@
     <string name="bluetooth_rename_device" msgid="4352483834491958740">"重新命名這個裝置"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"重新命名"</string>
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"中斷連線？"</string>
-    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束您與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
-    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"您沒有變更藍牙設定的權限。"</string>
+    <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"這樣會結束你與下列裝置的連線：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
+    <string name="bluetooth_empty_list_user_restricted" msgid="603521233563983689">"你沒有變更藍牙設定的權限。"</string>
     <string name="bluetooth_is_visible_message" msgid="6222396240776971862">"藍牙設定開啟時，附近的裝置可偵測到「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
     <string name="bluetooth_is_disconnect_question" msgid="5334933802445256306">"要中斷與「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」的連線嗎？"</string>
     <string name="bluetooth_broadcasting" msgid="16583128958125247">"廣播"</string>
@@ -148,15 +148,15 @@
     <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>
-    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"您要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎？"</string>
+    <string name="bluetooth_connection_dialog_text" msgid="8455427559949998023">"你要連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」嗎？"</string>
     <string name="bluetooth_phonebook_request" msgid="3951420080540915279">"電話簿存取權要求"</string>
     <string name="bluetooth_pb_acceptance_dialog_text" msgid="8930347091018455505">"「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」要求存取你的聯絡人和通話紀錄。要將存取權授予「<xliff:g id="DEVICE_NAME_1">%2$s</xliff:g>」嗎？"</string>
     <string name="bluetooth_remember_choice" msgid="6919682671787049800">"不要再詢問"</string>
     <string name="bluetooth_pb_remember_choice" msgid="3622898084442402071">"不要再詢問"</string>
     <string name="bluetooth_map_request" msgid="4595727689513143902">"訊息存取權要求"</string>
-    <string name="bluetooth_map_acceptance_dialog_text" msgid="8712508202081143737">"%1$s 要求存取您的訊息。要將存取權授予 %2$s 嗎？"</string>
+    <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_sap_acceptance_dialog_text" msgid="4414253873553608690">"「<xliff:g id="DEVICE_NAME_0">%1$s</xliff:g>」想要存取你的 SIM 卡。如果授權該裝置存取 SIM 卡，你裝置的數據連線功能在藍牙連線期間將暫時停用。將存取權授予「<xliff:g id="DEVICE_NAME_1">%2$s?</xliff:g>」"</string>
     <string name="date_and_time" msgid="9062980487860757694">"日期和時間"</string>
     <string name="choose_timezone" msgid="1362834506479536274">"選擇時區"</string>
     <!-- no translation found for intent_sender_data_label (6332324780477289261) -->
@@ -175,11 +175,11 @@
     <string name="proxy_hostname_label" msgid="8490171412999373362">"Proxy 主機名稱"</string>
     <string name="proxy_error" msgid="8926675299638611451">"注意"</string>
     <string name="proxy_error_dismiss" msgid="4993171795485460060">"確定"</string>
-    <string name="proxy_error_invalid_host" msgid="6865850167802455230">"您所輸入的主機名稱無效。"</string>
-    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"您所輸入的排除清單格式有誤，請輸入以英文逗點分隔的排除網域清單。"</string>
-    <string name="proxy_error_empty_port" msgid="5539106187558215246">"您必須填寫通訊埠欄位。"</string>
+    <string name="proxy_error_invalid_host" msgid="6865850167802455230">"你所輸入的主機名稱無效。"</string>
+    <string name="proxy_error_invalid_exclusion_list" msgid="678527645450894773">"你所輸入的排除清單格式有誤，請輸入以英文逗點分隔的排除網域清單。"</string>
+    <string name="proxy_error_empty_port" msgid="5539106187558215246">"你必須填寫通訊埠欄位。"</string>
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"若主機欄位空白，連接埠欄位也須空白。"</string>
-    <string name="proxy_error_invalid_port" msgid="5988270202074492710">"您所輸入的通訊埠無效。"</string>
+    <string name="proxy_error_invalid_port" msgid="5988270202074492710">"你所輸入的通訊埠無效。"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定。"</string>
     <string name="proxy_url_title" msgid="7185282894936042359">"PAC 網址： "</string>
     <string name="radio_info_signal_location_label" msgid="3242990404410530456">"行動網路位置資訊 (已不適用)："</string>
@@ -283,11 +283,11 @@
     <string name="roaming" msgid="3596055926335478572">"漫遊服務"</string>
     <string name="roaming_enable" msgid="3737380951525303961">"漫遊時連線到數據傳輸服務"</string>
     <string name="roaming_disable" msgid="1295279574370898378">"漫遊時連線到數據傳輸服務"</string>
-    <string name="roaming_reenable_message" msgid="9141007271031717369">"由於您不在主要網路蓋涵範圍，且已關閉漫遊服務，資料連線已中斷。"</string>
+    <string name="roaming_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" 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_reenable_title" msgid="6068100976707316772">"允許漫遊服務？"</string>
     <string name="networks" msgid="6333316876545927039">"選取電信業者"</string>
     <string name="sum_carrier_select" msgid="3616956422251879163">"選擇網路業者"</string>
@@ -317,7 +317,7 @@
     <string name="lock_immediately_summary_with_exception" msgid="9119632173886172690">"休眠後立即鎖定 (<xliff:g id="TRUST_AGENT_NAME">%1$s</xliff:g> 讓螢幕保持解鎖狀態時除外)"</string>
     <string name="lock_after_timeout_summary_with_exception" msgid="5579064842797188409">"休眠<xliff:g id="TIMEOUT_STRING">%1$s</xliff:g>後 (由「<xliff:g id="TRUST_AGENT_NAME">%2$s</xliff:g>」維持解鎖狀態時除外)"</string>
     <string name="show_owner_info_on_lockscreen_label" msgid="5074906168357568434">"在鎖定畫面上顯示擁有者資訊"</string>
-    <string name="owner_info_settings_title" msgid="5530285568897386122">"鎖定畫面訊息"</string>
+    <string name="owner_info_settings_title" msgid="5530285568897386122">"鎖定螢幕訊息"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="6392489775303464905">"已由管理員停用"</string>
     <string name="owner_info_settings_summary" msgid="7472393443779227052">"無"</string>
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"帳戶"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"定位"</string>
     <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"安全性與位置"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"加密和憑證"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"電話已加密"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"電話已加密"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"螢幕鎖定偏好設定"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"隱私權"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"已由管理員停用"</string>
     <string name="security_status_title" msgid="5848766673665944640">"安全性狀態"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <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="fingerprint_manage_category_title" msgid="8293801041700001681">"管理指紋"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"指紋辨識用途："</string>
@@ -355,19 +354,19 @@
     <string name="security_settings_fingerprint_preference_summary_none" msgid="1507739327565151923"></string>
     <string name="security_settings_fingerprint_enroll_introduction_title" msgid="3201556857492526098">"使用指紋解鎖"</string>
     <string name="security_settings_fingerprint_enroll_introduction_title_unlock_disabled" msgid="7066417934622827305">"使用指紋"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"只要輕觸指紋感應器，即可將手機解鎖、授權購物交易或登入應用程式。您在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：使用複雜的圖形或 PIN 碼會比感應指紋來得安全。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message" msgid="3508870672887336095">"只要輕觸指紋感應器，即可將手機解鎖、授權購物交易或登入應用程式。你在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：使用複雜的圖形或 PIN 碼會比感應指紋來得安全。"</string>
     <string name="security_settings_fingerprint_enroll_introduction_message_unlock_disabled" msgid="4193477159493347679">"輕觸指紋感應器即可授權購物交易或登入應用程式。你在裝置上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：你無法使用指紋為這個裝置解鎖。詳情請洽貴機構的管理員。"</string>
-    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"只要輕觸指紋感應器，即可將手機解鎖、授權購物交易或登入應用程式。您在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\n\n注意：使用複雜的圖形或 PIN 碼會比感應指紋來得安全。"</string>
+    <string name="security_settings_fingerprint_enroll_introduction_message_setup" msgid="3635924459027832861">"只要輕觸指紋感應器，即可將手機解鎖、授權購物交易或登入應用程式。你在手機上新增的任何指紋都能用來進行前述操作，因此請慎選要加入的指紋。\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>
     <string name="security_settings_fingerprint_enroll_introduction_continue_setup" msgid="8386444182056861429">"新增指紋"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"系統不會啟用裝置保護功能。萬一這台平板電腦遺失或遭竊，或是當中資料遭到清空，您將無法防止他人使用這台平板電腦。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"系統不會啟用裝置保護功能。萬一這個裝置遺失或遭竊，或是當中資料遭到清空，您將無法防止他人使用這個裝置。"</string>
-    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"系統不會啟用裝置保護功能。萬一這支手機遺失或遭竊，或是當中資料遭到清空，您將無法防止他人使用這支手機。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"系統不會啟用裝置保護功能。萬一這台平板電腦遺失或遭竊，您將無法防止他人使用這台平板電腦。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"系統不會啟用裝置保護功能。萬一這個裝置遺失或遭竊，您將無法防止他人使用這個裝置。"</string>
-    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"系統不會啟用裝置保護功能。萬一這支手機遺失或遭竊，您將無法防止他人使用這支手機。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="tablet" msgid="7234486440384881699">"系統不會啟用裝置保護功能。萬一這台平板電腦遺失或遭竊，或是當中資料遭到清空，你將無法防止他人使用這台平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="device" msgid="3519190003101280912">"系統不會啟用裝置保護功能。萬一這個裝置遺失或遭竊，或是當中資料遭到清空，你將無法防止他人使用這個裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text_frp" product="default" msgid="417315011140961">"系統不會啟用裝置保護功能。萬一這支手機遺失或遭竊，或是當中資料遭到清空，你將無法防止他人使用這支手機。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="tablet" msgid="8783499872534165700">"系統不會啟用裝置保護功能。萬一這台平板電腦遺失或遭竊，你將無法防止他人使用這台平板電腦。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="device" msgid="3120512940873907578">"系統不會啟用裝置保護功能。萬一這個裝置遺失或遭竊，你將無法防止他人使用這個裝置。"</string>
+    <string name="lock_screen_intro_skip_dialog_text" product="default" msgid="3589945558504439395">"系統不會啟用裝置保護功能。萬一這支手機遺失或遭竊，你將無法防止他人使用這支手機。"</string>
     <string name="skip_anyway_button_label" msgid="2323522873558834513">"略過"</string>
     <string name="go_back_button_label" msgid="4745265266186209467">"返回"</string>
     <string name="security_settings_fingerprint_enroll_find_sensor_title" msgid="5877265753699187149">"找出感應器"</string>
@@ -377,15 +376,15 @@
     <string name="security_settings_fingerprint_enroll_dialog_ok" msgid="4150384963879569750">"確定"</string>
     <string name="security_settings_fingerprint_enroll_dialog_delete" msgid="4114615413240707936">"刪除"</string>
     <string name="security_settings_fingerprint_enroll_start_title" msgid="951888937749663602">"開始註冊"</string>
-    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將您的手指放在感應器上，感到震動即可移開"</string>
+    <string name="security_settings_fingerprint_enroll_start_message" msgid="3909929328942564524">"將你的手指放在感應器上，感到震動即可移開"</string>
     <string name="security_settings_fingerprint_enroll_repeat_title" msgid="8556556992897619044">"繼續輕觸"</string>
-    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"稍微移動您的手指以新增完整的指紋"</string>
+    <string name="security_settings_fingerprint_enroll_repeat_message" msgid="4232813847507193627">"稍微移動你的手指以新增完整的指紋"</string>
     <string name="security_settings_fingerprint_enroll_finish_title" msgid="4798692662828257300">"指紋新增成功！"</string>
-    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示，就表示您可以使用指紋來驗證身分或授權進行購物交易。"</string>
+    <string name="security_settings_fingerprint_enroll_finish_message" msgid="835496875787664316">"只要看到這個圖示，就表示你可以使用指紋來驗證身分或授權進行購物交易。"</string>
     <string name="setup_fingerprint_enroll_finish_message" msgid="7234264291957984004">"輕觸指紋感應器即可將裝置喚醒及解鎖。"</string>
-    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"當畫面顯示這個圖示時，您也可以授權購物交易或登入應用程式。"</string>
+    <string name="setup_fingerprint_enroll_finish_message_secondary" msgid="7104778933406207968">"當畫面顯示這個圖示時，你也可以授權購物交易或登入應用程式。"</string>
     <string name="setup_fingerprint_enroll_enrolling_skip_title" msgid="6808422329107426923">"要略過指紋設定程序嗎？"</string>
-    <string name="setup_fingerprint_enroll_enrolling_skip_message" msgid="274849306857859783">"您已選擇使用指紋做為其中一種手機解鎖方式。如果現在略過這項程序，您必須在稍後完成設定。設定程序只需要一分鐘左右。"</string>
+    <string name="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>
@@ -395,10 +394,10 @@
     <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>
+    <string name="security_settings_fingerprint_enroll_disclaimer" msgid="2624905914239271751">"除了將手機解鎖，你也可以使用指紋授權購物交易及存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
     <string name="security_settings_fingerprint_enroll_disclaimer_lockscreen_disabled" msgid="7846871823167357942">" 螢幕鎖定選項已停用。如要瞭解詳情，請與你的機構管理員聯絡。"<annotation id="admin_details">"詳細資訊"</annotation>\n\n"你依然可以使用指紋來授權購物交易及存取應用程式。"<annotation id="url">"瞭解詳情"</annotation></string>
     <string name="security_settings_fingerprint_enroll_lift_touch_again" msgid="1888772560642539718">"移開手指，然後再次輕觸感應器"</string>
-    <string name="fingerprint_add_max" msgid="1020927549936895822">"您最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
+    <string name="fingerprint_add_max" msgid="1020927549936895822">"你最多可以新增 <xliff:g id="COUNT">%d</xliff:g> 個指紋"</string>
     <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>
@@ -410,17 +409,17 @@
     <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">"您可以對自己的帳戶、設定、下載的應用程式及其資料、媒體和其他檔案進行加密。加密平板電腦後，如果您設定了螢幕鎖定 (即圖案、PIN 或密碼)，那麼您必須在每次開機時解鎖螢幕，才能將平板電腦解密。除此之外，唯一的解密方法是將平板電腦恢復原廠設定，但這會清除您所有的資料。\n\n加密過程至少需要1個小時的時間。開始執行加密程序前，您必須先將電池充飽，並讓平板電腦在加密過程中全程連接電源。如果中斷程序，您將遺失部分或所有資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"您可以對自己的帳戶、設定、下載的應用程式及其資料、媒體和其他檔案進行加密。加密手機後，如果您設定了螢幕鎖定 (即圖案、PIN 或密碼)，那麼您必須在每次開機時解鎖螢幕，才能將手機解密。除此之外，唯一的解密方法是將手機恢復原廠設定，但這會清除您所有的資料。\n\n加密過程至少需要1個小時的時間。開始執行加密程序前，您必須先將電池充飽，並讓手機在加密過程中全程連接電源。如果中斷程序，您將遺失部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="503014594435731275">"你可以對自己的帳戶、設定、下載的應用程式及其資料、媒體和其他檔案進行加密。加密平板電腦後，如果你設定了螢幕鎖定 (即圖案、PIN 或密碼)，那麼你必須在每次開機時解鎖螢幕，才能將平板電腦解密。除此之外，唯一的解密方法是將平板電腦恢復原廠設定，但這會清除你所有的資料。\n\n加密過程至少需要1個小時的時間。開始執行加密程序前，你必須先將電池充飽，並讓平板電腦在加密過程中全程連接電源。如果中斷程序，你將遺失部分或所有資料。"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"你可以對自己的帳戶、設定、下載的應用程式及其資料、媒體和其他檔案進行加密。加密手機後，如果你設定了螢幕鎖定 (即圖案、PIN 或密碼)，那麼你必須在每次開機時解鎖螢幕，才能將手機解密。除此之外，唯一的解密方法是將手機恢復原廠設定，但這會清除你所有的資料。\n\n加密過程至少需要1個小時的時間。開始執行加密程序前，你必須先將電池充飽，並讓手機在加密過程中全程連接電源。如果中斷程序，你將遺失部分或所有資料。"</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">"沒有鎖定螢幕的 PIN 或密碼"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"您必須先設定鎖定螢幕的 PIN 或密碼，才能開始加密。"</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"你必須先設定鎖定螢幕的 PIN 或密碼，才能開始加密。"</string>
     <string name="crypt_keeper_confirm_title" msgid="5100339496381875522">"加密？"</string>
-    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"您無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的平板電腦會在過程中重新啟動數次。"</string>
-    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"您無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，您的手機會在過程中重新啟動數次。"</string>
+    <string name="crypt_keeper_final_desc" product="tablet" msgid="517662068757620756">"你無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，你的平板電腦會在過程中重新啟動數次。"</string>
+    <string name="crypt_keeper_final_desc" product="default" msgid="287503113671320916">"你無法取消加密操作，如果過程中斷，資料將會遺失。加密過程可能需要 1 個小時以上的時間，你的手機會在過程中重新啟動數次。"</string>
     <string name="crypt_keeper_setup_title" msgid="1783951453124244969">"加密中"</string>
     <string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"平板電腦正在進行加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
     <string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在對手機加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
@@ -428,36 +427,36 @@
     <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"手機加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
     <string name="crypt_keeper_force_power_cycle" product="tablet" msgid="556504311511212648">"如要將平板電腦解除鎖定，請關閉平板電腦後再開機。"</string>
     <string name="crypt_keeper_force_power_cycle" product="default" msgid="1794353635603020327">"如要將手機解除鎖定，請關閉手機後再開機。"</string>
-    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"警告：解鎖嘗試次數還剩 <xliff:g id="COUNT">^1</xliff:g> 次！如果持續失敗，您的裝置將會遭到清除。"</string>
+    <string name="crypt_keeper_warn_wipe" msgid="2738374897337991667">"警告：解鎖嘗試次數還剩 <xliff:g id="COUNT">^1</xliff:g> 次！如果持續失敗，你的裝置將會遭到清除。"</string>
     <string name="crypt_keeper_enter_password" msgid="2223340178473871064">"輸入密碼"</string>
     <string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
-    <string name="crypt_keeper_failed_summary" product="tablet" msgid="8219375738445017266">"加密過程中斷，無法完成，因此您再也不能存取平板電腦上的資料。\n\n如要恢復使用平板電腦，請先將平板電腦重設回原廠設定。完成重設後，您可以在設定平板電腦時，將先前備份至「Google 帳戶」的資料全部還原。"</string>
-    <string name="crypt_keeper_failed_summary" product="default" msgid="3270131542549577953">"加密過程中斷，無法完成，因此您再也不能存取手機上的資料。\n\n如要恢復使用手機，請先將手機重設回原廠設定。完成重設後，您可以在設定手機時，將先前備份至「Google 帳戶」的資料全部還原。"</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>
     <string name="crypt_keeper_data_corrupt_title" msgid="8759119849089795751">"解密失敗"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"您所輸入的密碼正確，但您的資料已毀損。\n\n如要繼續使用平板電腦，請將該裝置重設為原廠設定。重設完成後，當您對平板電腦進行設定時，可以將備份在個人 Google 帳戶中的資料全部還原。"</string>
-    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"您所輸入的密碼正確，但您的資料已毀損。\n\n如要繼續使用手機，請將該裝置重設為原廠設定。重設完成後，當您對手機進行設定時，可以將備份在個人 Google 帳戶中的資料全部還原。"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="tablet" msgid="840107296925798402">"你所輸入的密碼正確，但你的資料已毀損。\n\n如要繼續使用平板電腦，請將該裝置重設為原廠設定。重設完成後，當你對平板電腦進行設定時，可以將備份在個人 Google 帳戶中的資料全部還原。"</string>
+    <string name="crypt_keeper_data_corrupt_summary" product="default" msgid="8843311420059663824">"你所輸入的密碼正確，但你的資料已毀損。\n\n如要繼續使用手機，請將該裝置重設為原廠設定。重設完成後，當你對手機進行設定時，可以將備份在個人 Google 帳戶中的資料全部還原。"</string>
     <string name="crypt_keeper_switch_input_method" msgid="4168332125223483198">"切換輸入法"</string>
     <string name="suggested_lock_settings_title" msgid="8971630898700461034">"設定螢幕鎖定"</string>
-    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"保護您的裝置"</string>
+    <string name="suggested_lock_settings_summary" msgid="8778462376012231110">"保護你的裝置"</string>
     <string name="suggested_fingerprint_lock_settings_title" msgid="3655973509619012084">"使用指紋"</string>
     <string name="suggested_fingerprint_lock_settings_summary" msgid="2149569133725273864">"以指紋解鎖"</string>
     <string name="lock_settings_picker_title" msgid="1095755849152582712">"選擇螢幕鎖定方式"</string>
     <string name="lock_settings_picker_title_profile" msgid="8822511284992306796">"選擇 Work 鎖定方式"</string>
-    <string name="setup_lock_settings_picker_title" product="tablet" msgid="90329443364067215">"保護您的平板電腦"</string>
-    <string name="setup_lock_settings_picker_title" product="device" msgid="2399952075134938929">"保護您的裝置"</string>
-    <string name="setup_lock_settings_picker_title" product="default" msgid="1572244299605153324">"保護您的手機"</string>
+    <string name="setup_lock_settings_picker_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="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這台平板電腦。請選擇您要使用的螢幕鎖定方式。"</string>
-    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這個裝置。請選擇您要使用的螢幕鎖定方式。"</string>
-    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可防止他人在未獲您授權的情況下使用這支手機。請選擇您要使用的螢幕鎖定方式。"</string>
-    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"選擇您的備用螢幕鎖定方法"</string>
+    <string name="setup_lock_settings_picker_message" product="tablet" msgid="8919671129189936210">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這台平板電腦。請選擇你要使用的螢幕鎖定方式。"</string>
+    <string name="setup_lock_settings_picker_message" product="device" msgid="3787276514406353777">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這個裝置。請選擇你要使用的螢幕鎖定方式。"</string>
+    <string name="setup_lock_settings_picker_message" product="default" msgid="3692856437543730446">"只要啟用裝置保護功能，即可防止他人在未獲你授權的情況下使用這支手機。請選擇你要使用的螢幕鎖定方式。"</string>
+    <string name="lock_settings_picker_fingerprint_message" msgid="4755230324778371292">"選擇你的備用螢幕鎖定方法"</string>
     <string name="unlock_set_unlock_launch_picker_title" msgid="2084576942666016993">"螢幕鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_summary_lock_immediately" msgid="5967714169972542586">"<xliff:g id="UNLOCK_METHOD">%1$s</xliff:g> / 休眠後立即啟動"</string>
     <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">"Work 設定檔鎖定"</string>
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"變更鎖定畫面"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"變更或停用圖案、PIN 或密碼安全性"</string>
-    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"選擇您要鎖定螢幕的方式"</string>
+    <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"選擇你要鎖定螢幕的方式"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"無"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="5679243878975864640">"滑動"</string>
@@ -469,7 +468,7 @@
     <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="current_screen_lock" msgid="4104091715420072219">"目前的螢幕鎖定方式"</string>
     <string name="fingerprint_unlock_set_unlock_pattern" msgid="4939057588092120368">"指紋 + 解鎖圖案"</string>
     <string name="fingerprint_unlock_set_unlock_pin" msgid="8010746824051056986">"指紋 + PIN 碼"</string>
     <string name="fingerprint_unlock_set_unlock_password" msgid="7351131075806338634">"指紋 + 密碼"</string>
@@ -481,52 +480,52 @@
     <string name="unlock_set_unlock_mode_pattern" msgid="7837270780919299289">"圖案"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="3541326261341386690">"PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="1203938057264146610">"密碼"</string>
-    <string name="unlock_setup_wizard_fingerprint_details" msgid="7893457665921363009">"設定螢幕鎖定之後，您還可以前往 [設定] &gt; [安全性] 設定指紋。"</string>
+    <string name="unlock_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" msgid="8869767290771023461">"如果移除你的解鎖圖案，裝置保護功能將無法運作。"</string>
+    <string name="unlock_disable_frp_warning_content_pattern_fingerprint" msgid="8212242533942400457">"如果移除你的解鎖圖案，裝置保護功能將無法運作。<xliff:g id="EMPTY_LINE">
 
-</xliff:g>您儲存的指紋會一併從這部裝置中移除，因此您將無法使用指紋解鎖手機、授權購物交易或登入應用程式。"</string>
-    <string name="unlock_disable_frp_warning_content_pin" msgid="586996206210265131">"如果移除您的 PIN 碼，裝置保護功能將無法運作。"</string>
-    <string name="unlock_disable_frp_warning_content_pin_fingerprint" msgid="875669051899437197">"如果移除您的 PIN 碼，裝置保護功能將無法運作。<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">
 
-</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">
+</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">
 
-</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">
+</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">
 
-</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">
+</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">
 
-</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">
+</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">
 
-</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">
+</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">
 
-</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">
+</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">
 
-</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>
     <string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
-    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"請再試一次。您目前已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
+    <string name="lock_profile_wipe_attempts" msgid="1216193652369039672">"請再試一次。你目前已嘗試 <xliff:g id="CURRENT_ATTEMPTS">%1$d</xliff:g> 次，最多可試 <xliff:g id="TOTAL_ATTEMPTS">%2$d</xliff:g> 次。"</string>
     <string name="lock_profile_wipe_warning_title" msgid="2961600792367265036">"最後一次機會"</string>
-    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"如果您這次畫出的 Work 解鎖圖案錯誤，您的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"如果您這次輸入的 Work PIN 碼錯誤，您的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果您這次輸入的 Work 密碼錯誤，您的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
-    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"輸入錯誤次數過多。您的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
+    <string name="lock_profile_wipe_warning_content_pattern" msgid="8978031996247660921">"如果你這次畫出的 Work 解鎖圖案錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
+    <string name="lock_profile_wipe_warning_content_pin" msgid="7697973618542377880">"如果你這次輸入的 Work PIN 碼錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
+    <string name="lock_profile_wipe_warning_content_password" msgid="450695588340509349">"如果你這次輸入的 Work 密碼錯誤，你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
+    <string name="lock_profile_wipe_content" msgid="2150455386921347628">"輸入錯誤次數過多。你的 Work 設定檔和相關資料將會從這個裝置中移除。"</string>
     <string name="lock_profile_wipe_dismiss" msgid="5118293266264141442">"關閉"</string>
     <string name="lockpassword_password_too_short" msgid="2726090378672764986">"必須包含至少 <xliff:g id="COUNT">%d</xliff:g> 個字元"</string>
     <string name="lockpassword_pin_too_short" msgid="3638188874397727648">"PIN 碼至少要有 <xliff:g id="COUNT">%d</xliff:g> 位數字"</string>
@@ -573,8 +572,8 @@
     <string name="manage_device_admin" msgid="537804979483211453">"裝置管理員應用程式"</string>
     <string name="number_of_device_admins_none" msgid="7185056721919496069">"沒有使用中的應用程式"</string>
     <plurals name="number_of_device_admins" formatted="false" msgid="3361891840111523393">
-      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 個有效的應用程式</item>
-      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 個有效的應用程式</item>
+      <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> 個使用中的應用程式</item>
+      <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> 個使用中的應用程式</item>
     </plurals>
     <string name="manage_trust_agents" msgid="4629279457536987768">"信任的代理程式"</string>
     <string name="disabled_because_no_backup_security" msgid="6877660253409580377">"如要使用，請先設定螢幕鎖定"</string>
@@ -594,12 +593,12 @@
     <string name="bluetooth_enable_alphanumeric_pin" msgid="7222713483058171357">"PIN 碼含有字母或符號"</string>
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"通常為 0000 或 1234"</string>
     <string name="bluetooth_pin_values_hint_16_digits" msgid="7849359451584101077">"必須是 16 位數的數字"</string>
-    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"您可能也必須在另一個裝置上輸入這個 PIN。"</string>
-    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"您可能也必須在另一個裝置上輸入這個密碼金鑰。"</string>
+    <string name="bluetooth_enter_pin_other_device" msgid="4637977124526813470">"你可能也必須在另一個裝置上輸入這個 PIN。"</string>
+    <string name="bluetooth_enter_passkey_other_device" msgid="2798719004030279602">"你可能也必須在另一個裝置上輸入這個密碼金鑰。"</string>
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"如要與下列裝置配對：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;請確認該裝置是否顯示下列密碼金鑰：&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"來自：&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;要與這個裝置配對嗎？"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"如要與 <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> 配對，請輸入：<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>，然後按下 [返回] 或 [輸入]。"</string>
-    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"允許「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」存取您的聯絡人和通話紀錄"</string>
+    <string name="bluetooth_pairing_shares_phonebook" msgid="2277931851483023208">"允許「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」存取你的聯絡人和通話紀錄"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_connecting_error_message" msgid="1397388344342081090">"無法連線至「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」。"</string>
     <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"掃描裝置"</string>
@@ -613,8 +612,8 @@
     <string name="bluetooth_preference_paired_dialog_contacts_option" msgid="7747163316331917594">"通訊錄和通話紀錄"</string>
     <string name="bluetooth_pairing_dialog_title" msgid="1417255032435317301">"要與這個裝置配對嗎？"</string>
     <string name="bluetooth_pairing_dialog_sharing_phonebook_title" msgid="7664141669886358618">"要共用電話簿嗎？"</string>
-    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」要求存取您的通訊錄和通話紀錄。"</string>
-    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」提出藍牙配對要求。一旦配對連線成功，該裝置將可以存取您的通訊錄和通話紀錄。"</string>
+    <string name="bluetooth_pairing_dialog_contants_request" msgid="5531109163573611348">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」要求存取你的通訊錄和通話紀錄。"</string>
+    <string name="bluetooth_pairing_dialog_paring_request" msgid="8451248193517851958">"「<xliff:g id="DEVICE_NAME">%1$s</xliff:g>」提出藍牙配對要求。一旦配對連線成功，該裝置將可以存取你的通訊錄和通話紀錄。"</string>
     <string name="bluetooth_preference_paired_devices" msgid="1970524193086791964">"配對裝置"</string>
     <string name="bluetooth_preference_found_devices" msgid="1647983835063249680">"可用的裝置"</string>
     <string name="bluetooth_preference_no_found_devices" msgid="7594339669961811591">"找不到可用裝置"</string>
@@ -626,8 +625,8 @@
     <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="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_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_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>
@@ -692,13 +691,14 @@
     <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 網路範圍內 (例如家用網路) 時自動重新開啟 Wi‑Fi"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Wi-Fi 掃描已關閉，因此無法使用"</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="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" 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">"如要提升定位精確度，請前往<xliff:g id="LINK_BEGIN_0">LINK_BEGIN</xliff:g>掃描設定<xliff:g id="LINK_END_1">LINK_END</xliff:g>開啟 Wi-Fi 掃描功能。"</string>
     <string name="wifi_scan_notify_remember_choice" msgid="7104867814641144485">"不要再顯示"</string>
     <string name="wifi_setting_sleep_policy_title" msgid="5149574280392680092">"休眠狀態仍保持 Wi-Fi 連線"</string>
@@ -730,7 +730,7 @@
     <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"寫入 NFC 標記"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"如要查看可用的網路，請開啟 Wi-Fi。"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"正在搜尋 Wi-Fi 網路…"</string>
-    <string name="wifi_empty_list_user_restricted" msgid="7322372065475939129">"您沒有變更 Wi-Fi 網路的權限。"</string>
+    <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>
@@ -778,17 +778,17 @@
     <string name="wifi_use_system_certs" msgid="5270879895056893783">"使用系統憑證"</string>
     <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_do_not_validate_eap_server_warning" msgid="1787190245542586660">"你未指定任何憑證，因此無法為你設定私人連線。"</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>
-    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"輸入您的網路密碼"</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_wps_nfc_enter_password" msgid="2288214226916117159">"輸入你的網路密碼"</string>
+    <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。\n\n你要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
     <string name="wifi_scan_always_turnoff_message" msgid="5538901671131941043">"如要關閉這項功能，請在溢位選單中選取 [進階]。"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
     <string name="wifi_scan_always_confirm_deny" msgid="4463982053823520710">"拒絕"</string>
     <string name="wifi_hotspot_title" msgid="7726205804813286950">"註冊並連線？"</string>
-    <string name="wifi_hotspot_message" msgid="3673833421453455747">"您必須先為 <xliff:g id="APP_NAME">%1$s</xliff:g> 進行線上註冊才能連線上網。"</string>
+    <string name="wifi_hotspot_message" msgid="3673833421453455747">"你必須先為 <xliff:g id="APP_NAME">%1$s</xliff:g> 進行線上註冊才能連線上網。"</string>
     <string name="wifi_hotspot_connect" msgid="5065506390164939225">"連線"</string>
     <string name="no_internet_access_text" msgid="7133561752896706392">"這個網路沒有網際網路連線。要繼續保持連線嗎？"</string>
     <string name="no_internet_access_remember" msgid="4697314331614625075">"不要再詢問我是否使用這個網路"</string>
@@ -806,18 +806,16 @@
     <string name="wifi_cancel" msgid="6763568902542968964">"取消"</string>
     <string name="wifi_saved_access_points_titlebar" msgid="2996149477240134064">"已儲存的網路"</string>
     <plurals name="wifi_saved_access_points_summary" formatted="false" msgid="6094679048871529675">
-      <item quantity="other"> 個網路</item>
+      <item quantity="other">%d 個網路</item>
       <item quantity="one">1 個網路</item>
     </plurals>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"進階 Wi-Fi"</string>
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"設定 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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"子網路遮罩"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"IPv6 位址"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"已儲存的網路"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"IP 設定"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"這位使用者無法使用 Wi‑Fi 網路進階設定"</string>
@@ -842,10 +840,10 @@
     <string name="wifi_p2p_failed_connect_message" msgid="8491862096448192157">"無法連線。"</string>
     <string name="wifi_p2p_failed_rename_message" msgid="2562182284946936380">"無法重新命名裝置。"</string>
     <string name="wifi_p2p_disconnect_title" msgid="3216846049677448420">"中斷連線？"</string>
-    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"如果您中斷連線，即會結束您與「<xliff:g id="PEER_NAME">%1$s</xliff:g>」的連線。"</string>
-    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果您中斷連線，即會結束您與「<xliff:g id="PEER_NAME">%1$s</xliff:g>」和其他 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 個裝置的連線。"</string>
+    <string name="wifi_p2p_disconnect_message" msgid="8227342771610125771">"如果你中斷連線，即會結束你與「<xliff:g id="PEER_NAME">%1$s</xliff:g>」的連線。"</string>
+    <string name="wifi_p2p_disconnect_multiple_message" msgid="3283805371034883105">"如果你中斷連線，即會結束你與「<xliff:g id="PEER_NAME">%1$s</xliff:g>」和其他 <xliff:g id="PEER_COUNT">%2$s</xliff:g> 個裝置的連線。"</string>
     <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_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>
@@ -897,9 +895,9 @@
     <item msgid="2339246858001475047">"2"</item>
     <item msgid="6200207341126893791">"1"</item>
   </string-array>
-    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"開啟 Wi-Fi 通話功能之後，您的手機可依據您的偏好設定，透過 Wi-Fi 網路或您的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與您的電信業者詢問費用與其他細節。"</string>
+    <string name="wifi_calling_off_explanation" msgid="2597566001655908391">"開啟 Wi-Fi 通話功能之後，你的手機可依據你的偏好設定，透過 Wi-Fi 網路或你的行動通訊網路通話 (選擇訊號較強者)。開啟這項功能前，請先與你的電信業者詢問費用與其他細節。"</string>
     <string name="emergency_address_title" msgid="3571902448699714454">"更新緊急地址"</string>
-    <string name="emergency_address_summary" msgid="306028701568728126">"如果您使用 Wi-Fi 撥打 119，緊急服務會判定您位在這個地址"</string>
+    <string name="emergency_address_summary" msgid="306028701568728126">"如果你使用 Wi-Fi 撥打 119，緊急服務會判定你位在這個地址"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
@@ -938,8 +936,8 @@
     <string name="dock_audio_summary_none" product="default" msgid="289909253741048784">"手機未固定至座架"</string>
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"隨附的座架設定"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"找不到座架"</string>
-    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"您必須先將平板電腦安置於座架上，才能設定座架音效。"</string>
-    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"您必須先將手機安置於座架上，才能設定座架音效。"</string>
+    <string name="dock_not_found_text" product="tablet" msgid="8405432495282299143">"你必須先將平板電腦安置於座架上，才能設定座架音效。"</string>
+    <string name="dock_not_found_text" product="default" msgid="1460497923342627801">"你必須先將手機安置於座架上，才能設定座架音效。"</string>
     <string name="dock_sounds_enable_title" msgid="885839627097024110">"座架插入音效"</string>
     <string name="dock_sounds_enable_summary_on" product="tablet" msgid="838102386448981339">"將平板電腦置入座架或移出座架時播放音效"</string>
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"手機插入底座或離開底座時播放音效"</string>
@@ -963,7 +961,7 @@
     <string name="brightness_title" msgid="5746272622112982836">"亮度"</string>
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
     <string name="auto_brightness_title" msgid="6341042882350279391">"自動調整亮度"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"根據環境光源調整最佳亮度"</string>
+    <string name="auto_brightness_summary" msgid="1799041158760605375">"根據環境光源調整亮度"</string>
     <string name="auto_brightness_summary_off" msgid="2802336459335410626">"關閉"</string>
     <string name="auto_brightness_summary_very_low" msgid="6483976609035853764">"偏好的亮度設為「非常低」"</string>
     <string name="auto_brightness_summary_low" msgid="5609877905833960427">"偏好的亮度設為「低」"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"關閉"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"如要控制手機安置於座架上和/或休眠時的設定，請開啟螢幕保護程式。"</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"啟用時間"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"目前的螢幕保護程式"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"立即開啟"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"設定"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"舉起即可喚醒"</string>
-    <string name="doze_title" msgid="5389406335828323273">"收到的通知畫面"</string>
+    <string name="doze_title" msgid="2259176504273878294">"環境顯示"</string>
     <string name="doze_summary" msgid="3846219936142814032">"收到通知時喚醒螢幕"</string>
     <string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"縮小或放大文字"</string>
@@ -1034,9 +1031,9 @@
     <string name="sim_lock_settings_title" msgid="9018585580955414596">"SIM 卡鎖定"</string>
     <string name="sim_pin_toggle" msgid="1742123478029451888">"鎖定 SIM 卡"</string>
     <string name="sim_lock_on" product="tablet" msgid="5058355081270397764">"需要 PIN 才能使用平板電腦"</string>
-    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"需要輸入 PIN 才可使用電話"</string>
+    <string name="sim_lock_on" product="default" msgid="2503536505568814324">"需要輸入 PIN 碼才可使用電話"</string>
     <string name="sim_lock_off" product="tablet" msgid="2813800553917012356">"需要 PIN 才能使用平板電腦"</string>
-    <string name="sim_lock_off" product="default" msgid="258981978215428916">"需要輸入 PIN 才可使用電話"</string>
+    <string name="sim_lock_off" product="default" msgid="258981978215428916">"需要輸入 PIN 碼才可使用電話"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"變更 SIM 卡 PIN 碼"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"SIM 卡 PIN 碼"</string>
     <string name="sim_enable_sim_lock" msgid="4517742794997166918">"鎖定 SIM 卡"</string>
@@ -1058,10 +1055,10 @@
     <string name="sim_change_data_message" msgid="5854582807996717811">"要將用於行動數據連線的 SIM 卡從「<xliff:g id="OLD_SIM">%2$s</xliff:g>」改為「<xliff:g id="NEW_SIM">%1$s</xliff:g>」嗎？"</string>
     <string name="sim_preferred_title" msgid="5567909634636045268">"更新慣用的 SIM 卡？"</string>
     <string name="sim_preferred_message" msgid="8466930554330635780">"「<xliff:g id="NEW_SIM">%1$s</xliff:g>」是裝置中唯一的 SIM 卡。要使用這張 SIM 卡連線到行動網路、進行通話及收發簡訊嗎？"</string>
-    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM 卡的 PIN 碼輸入錯誤，您現在必須請電信業者為裝置解鎖。"</string>
+    <string name="wrong_pin_code_pukked" msgid="4003655226832658066">"SIM 卡的 PIN 碼輸入錯誤，你現在必須請電信業者為裝置解鎖。"</string>
     <plurals name="wrong_pin_code" formatted="false" msgid="1582398808893048097">
-      <item quantity="other">SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER_1">%d</xliff:g> 次。</item>
-      <item quantity="one">SIM 卡的 PIN 碼輸入錯誤，您還可以再試 <xliff:g id="NUMBER_0">%d</xliff:g> 次。如果仍然失敗，就必須請電信業者為裝置解鎖。</item>
+      <item quantity="other">SIM 卡的 PIN 碼輸入錯誤，你還可以再試 <xliff:g id="NUMBER_1">%d</xliff:g> 次。</item>
+      <item quantity="one">SIM 卡的 PIN 碼輸入錯誤，你還可以再試 <xliff:g id="NUMBER_0">%d</xliff:g> 次。如果仍然失敗，就必須請電信業者為裝置解鎖。</item>
     </plurals>
     <string name="pin_failed" msgid="1848423634948587645">"SIM 卡 PIN 碼解鎖失敗！"</string>
     <string name="device_info_settings" product="tablet" msgid="1119755927536987178">"平板電腦狀態"</string>
@@ -1139,10 +1136,10 @@
     <string name="memory_clear_cache_title" msgid="5423840272171286191">"清除快取資料？"</string>
     <string name="memory_clear_cache_message" msgid="4550262490807415948">"這會清除所有應用程式的快取資料。"</string>
     <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"MTP 或 PTP 功能已啟用"</string>
-    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"您要將 USB 儲存裝置退出？"</string>
-    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"您要將 SD 卡退出？"</string>
-    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果您將 USB 儲存裝置退出，則某些正在使用中的應用程式會停止運作，而且可能無法使用，直到重新插入 USB 儲存裝置之後才會恢復正常。"</string>
-    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"如果您將 SD 卡退出，則某些正在使用中的應用程式會停止運作，而且可能無法使用，直到重新插入 SD 卡之後才會恢復正常。"</string>
+    <string name="dlg_confirm_unmount_title" product="nosdcard" msgid="3077285629197874055">"你要將 USB 儲存裝置退出？"</string>
+    <string name="dlg_confirm_unmount_title" product="default" msgid="3634502237262534381">"你要將 SD 卡退出？"</string>
+    <string name="dlg_confirm_unmount_text" product="nosdcard" msgid="4322636662873269018">"如果你將 USB 儲存裝置退出，則某些正在使用中的應用程式會停止運作，而且可能無法使用，直到重新插入 USB 儲存裝置之後才會恢復正常。"</string>
+    <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"如果你將 SD 卡退出，則某些正在使用中的應用程式會停止運作，而且可能無法使用，直到重新插入 SD 卡之後才會恢復正常。"</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_text" product="nosdcard" msgid="9191518889746166147">"無法將 USB 儲存裝置退出，請稍後再試。"</string>
@@ -1168,9 +1165,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 檔案傳輸」來傳輸媒體檔案 (下載網址：www.android.com/filetransfer)"</string>
+    <string name="usb_mtp_summary" msgid="4617321473211391236">"讓你用 Windows 或 Mac 上的「Android 檔案傳輸」來傳輸媒體檔案 (下載網址：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 的應用程式透過 USB 連接埠與電腦上的 MIDI 軟體搭配運作。"</string>
     <string name="storage_other_users" msgid="808708845102611856">"其他使用者"</string>
@@ -1187,12 +1184,12 @@
     <string name="storage_format_success" msgid="3023144070597190555">"已將「<xliff:g id="NAME">%1$s</xliff:g>」格式化"</string>
     <string name="storage_format_failure" msgid="6032640952779735766">"無法將「<xliff:g id="NAME">%1$s</xliff:g>」格式化"</string>
     <string name="storage_rename_title" msgid="8242663969839491485">"重新命名儲存空間"</string>
-    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"此「<xliff:g id="NAME_0">^1</xliff:g>」已安全退出，但是仍可使用。\n\n如要使用此「<xliff:g id="NAME_1">^1</xliff:g>」，您必須先進行掛接。"</string>
-    <string name="storage_dialog_unmountable" msgid="3732209361668282254">"此「<xliff:g id="NAME_0">^1</xliff:g>」已毀損。\n\n如要使用此「<xliff:g id="NAME_1">^1</xliff:g>」，您必須先進行設定。"</string>
-    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"這台裝置不支援此「<xliff:g id="NAME_0">^1</xliff:g>」。\n\n如要在這台裝置上使用此「<xliff:g id="NAME_1">^1</xliff:g>」，您必須先進行設定。"</string>
-    <string name="storage_internal_format_details" msgid="4018647158382548820">"經過格式化後，您即可在其他裝置中使用此「<xliff:g id="NAME_0">^1</xliff:g>」。\n\n此「<xliff:g id="NAME_1">^1</xliff:g>」中的所有資料都將清除，建議您先備份資料。\n\n"<b>"備份相片和其他媒體"</b>" \n將您的媒體檔案移到這台裝置上的替代儲存空間，或使用 USB 傳輸線將資料傳輸到電腦。\n\n"<b>"備份應用程式"</b>" \n儲存在此「<xliff:g id="NAME_6">^1</xliff:g>」的所有應用程式都將解除安裝，相關資料也會一併刪除。如要保留，請將這些應用程式移到這台裝置上的替代儲存空間。"</string>
-    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"當您退出這個 <xliff:g id="NAME_0">^1</xliff:g>時，儲存在其中的應用程式將停止運作，而儲存在其中的媒體檔案也無法繼續提供使用，直到重新插入裝置為止。"</b>\n\n"這個 <xliff:g id="NAME_1">^1</xliff:g>的設定格式僅適用於這台裝置，無法搭配其他裝置使用。"</string>
-    <string name="storage_internal_forget_details" msgid="9028875424669047327">"如要使用這個 <xliff:g id="NAME">^1</xliff:g>中的應用程式、相片或資料，請重新插入。\n\n如果裝置無法使用，您也可以清除這個儲存空間。\n\n假使您選擇清除，裝置中的所有資料將遭到永久刪除，無法復原。\n\n雖然您稍後可以重新安裝應用程式，但這個裝置中儲存的資料會全數遺失。"</string>
+    <string name="storage_dialog_unmounted" msgid="6403320870103261477">"此「<xliff:g id="NAME_0">^1</xliff:g>」已安全退出，但是仍可使用。\n\n如要使用此「<xliff:g id="NAME_1">^1</xliff:g>」，你必須先進行掛接。"</string>
+    <string name="storage_dialog_unmountable" msgid="3732209361668282254">"此「<xliff:g id="NAME_0">^1</xliff:g>」已毀損。\n\n如要使用此「<xliff:g id="NAME_1">^1</xliff:g>」，你必須先進行設定。"</string>
+    <string name="storage_dialog_unsupported" msgid="4503128224360482228">"這台裝置不支援此「<xliff:g id="NAME_0">^1</xliff:g>」。\n\n如要在這台裝置上使用此「<xliff:g id="NAME_1">^1</xliff:g>」，你必須先進行設定。"</string>
+    <string name="storage_internal_format_details" msgid="4018647158382548820">"經過格式化後，你即可在其他裝置中使用此「<xliff:g id="NAME_0">^1</xliff:g>」。\n\n此「<xliff:g id="NAME_1">^1</xliff:g>」中的所有資料都將清除，建議你先備份資料。\n\n"<b>"備份相片和其他媒體"</b>" \n將你的媒體檔案移到這台裝置上的替代儲存空間，或使用 USB 傳輸線將資料傳輸到電腦。\n\n"<b>"備份應用程式"</b>" \n儲存在此「<xliff:g id="NAME_6">^1</xliff:g>」的所有應用程式都將解除安裝，相關資料也會一併刪除。如要保留，請將這些應用程式移到這台裝置上的替代儲存空間。"</string>
+    <string name="storage_internal_unmount_details" msgid="3582802571684490057"><b>"當你退出這個 <xliff:g id="NAME_0">^1</xliff:g>時，儲存在其中的應用程式將停止運作，而儲存在其中的媒體檔案也無法繼續提供使用，直到重新插入裝置為止。"</b>\n\n"這個 <xliff:g id="NAME_1">^1</xliff:g>的設定格式僅適用於這台裝置，無法搭配其他裝置使用。"</string>
+    <string name="storage_internal_forget_details" msgid="9028875424669047327">"如要使用這個 <xliff:g id="NAME">^1</xliff:g>中的應用程式、相片或資料，請重新插入。\n\n如果裝置無法使用，你也可以清除這個儲存空間。\n\n假使你選擇清除，裝置中的所有資料將遭到永久刪除，無法復原。\n\n雖然你稍後可以重新安裝應用程式，但這個裝置中儲存的資料會全數遺失。"</string>
     <string name="storage_internal_forget_confirm_title" msgid="1370847944388479245">"要清除「<xliff:g id="NAME">^1</xliff:g>」嗎？"</string>
     <string name="storage_internal_forget_confirm" msgid="1148446041396902905">"儲存在此「<xliff:g id="NAME">^1</xliff:g>」的所有應用程式、相片和資料將遭到永久刪除。"</string>
     <string name="storage_detail_apps" msgid="6141154016753507490">"應用程式"</string>
@@ -1206,20 +1203,20 @@
     <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_wizard_init_title" msgid="5085400514028585772">"設定您的「<xliff:g id="NAME">^1</xliff:g>」"</string>
+    <string name="storage_wizard_init_title" msgid="5085400514028585772">"設定你的「<xliff:g id="NAME">^1</xliff:g>」"</string>
     <string name="storage_wizard_init_external_title" msgid="4867326438945303598">"使用可攜式儲存空間"</string>
     <string name="storage_wizard_init_external_summary" msgid="7476105886344565074">"可用於在裝置之間移動相片和其他媒體。"</string>
     <string name="storage_wizard_init_internal_title" msgid="9100613534261408519">"做為內部儲存空間使用"</string>
     <string name="storage_wizard_init_internal_summary" msgid="6240417501036216410">"僅可用於儲存這台裝置上的任何項目，包括應用程式和相片。使用前必須先經過格式化，以免與其他裝置通用。"</string>
     <string name="storage_wizard_format_confirm_title" msgid="2814021794538252546">"格式化為內部儲存空間"</string>
-    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"「<xliff:g id="NAME_0">^1</xliff:g>」必須經過格式化，確保安全無虞。\n\n格式化後，此「<xliff:g id="NAME_1">^1</xliff:g>」僅能在這台裝置運作。\n\n"<b>"格式化作業會清除目前儲存在「<xliff:g id="NAME_2">^1</xliff:g>」的所有資料。"</b>"為避免資料遺失，建議您先進行備份。"</string>
+    <string name="storage_wizard_format_confirm_body" msgid="4401758710076806509">"「<xliff:g id="NAME_0">^1</xliff:g>」必須經過格式化，確保安全無虞。\n\n格式化後，此「<xliff:g id="NAME_1">^1</xliff:g>」僅能在這台裝置運作。\n\n"<b>"格式化作業會清除目前儲存在「<xliff:g id="NAME_2">^1</xliff:g>」的所有資料。"</b>"為避免資料遺失，建議你先進行備份。"</string>
     <string name="storage_wizard_format_confirm_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_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_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>
+    <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>
     <string name="storage_wizard_migrate_now" msgid="4523444323744239143">"立即移動"</string>
     <string name="storage_wizard_migrate_later" msgid="3173482328116026253">"稍後移動"</string>
     <string name="storage_wizard_migrate_confirm_title" msgid="8564833529613286965">"立即移動資料"</string>
@@ -1228,14 +1225,14 @@
     <string name="storage_wizard_migrate_progress_title" msgid="1665479429044202868">"移動資料…"</string>
     <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_external_body" msgid="2879508114260597474">"你的「<xliff:g id="NAME">^1</xliff:g>」已就緒，可用於儲存相片和其他媒體。"</string>
     <string name="storage_wizard_ready_internal_body" msgid="122532674037860197">"新的「<xliff:g id="NAME">^1</xliff:g>」運作中。\n\n如要將相片、檔案和應用程式資料移動到這台裝置上，請前往 [設定] &gt; [儲存空間]。"</string>
     <string name="storage_wizard_move_confirm_title" msgid="292782012677890250">"移動「<xliff:g id="APP">^1</xliff:g>」"</string>
-    <string name="storage_wizard_move_confirm_body" msgid="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_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>
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"請勿在執行移動作業時移除「<xliff:g id="NAME">^1</xliff:g>」。\n\n移動作業完成後，這台裝置上的「<xliff:g id="APP">^2</xliff:g>」應用程式才可供使用。"</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"取消移動"</string>
-    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"這個 <xliff:g id="NAME_0">^1</xliff:g>的速度緩慢。\n\n您可以繼續使用，但應用程式移動到這個位置後可能無法流暢執行，資料移轉作業也會耗費大量時間。\n\n建議您改用速度更快的 <xliff:g id="NAME_1">^1</xliff:g>來提升效能。"</string>
+    <string name="storage_wizard_slow_body" msgid="8010127667184768025">"這個 <xliff:g id="NAME_0">^1</xliff:g>的速度緩慢。\n\n你可以繼續使用，但應用程式移動到這個位置後可能無法流暢執行，資料移轉作業也會耗費大量時間。\n\n建議你改用速度更快的 <xliff:g id="NAME_1">^1</xliff:g>來提升效能。"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"電池電量"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APN"</string>
@@ -1283,9 +1280,9 @@
     <string name="reset_network_title" msgid="4557113742173895074">"重設網路設定"</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>
+    <string name="reset_network_final_desc" msgid="6388371121099245116">"你要重設所有網路設定嗎？這個動作無法復原！"</string>
     <string name="reset_network_final_button_text" msgid="1797434793741744635">"重設設定"</string>
-    <string name="reset_network_confirm_title" msgid="1759888886976962773">"您要重設嗎？"</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>
@@ -1294,9 +1291,9 @@
       <item quantity="one">系統將重設 1 個帳戶</item>
     </plurals>
     <string name="master_clear_summary" msgid="6902443944660426951">"內部儲存空間與所有資料都將重設"</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>
+    <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>
     <string name="master_clear_other_users_present" product="default" msgid="5161423070702470742">\n\n"這個裝置上還有其他使用者。\n"</string>
     <string name="master_clear_desc_also_erases_external" msgid="1903185203791274237"><li>"音樂"</li>\n<li>"相片"</li>\n<li>"其他使用者資料"</li></string>
     <string name="master_clear_desc_erase_external_storage" product="nosdcard" msgid="7744115866662613411">\n\n"如要一併清除音樂、圖片及其他用戶資料，則需清除 "<b>"USB 儲存裝置"</b>"資料。"</string>
@@ -1307,10 +1304,10 @@
     <string name="erase_external_storage_description" product="default" msgid="1737638779582964966">"清除 SD 卡中的所有資料，例如音樂或相片。"</string>
     <string name="master_clear_button_text" product="tablet" msgid="3130786116528304116">"重設平板電腦"</string>
     <string name="master_clear_button_text" product="default" msgid="7550632653343157971">"重設手機"</string>
-    <string name="master_clear_final_desc" msgid="7318683914280403086">"您要清除所有個人資訊和已下載的應用程式嗎？這個動作無法復原！"</string>
+    <string name="master_clear_final_desc" msgid="7318683914280403086">"你要清除所有個人資訊和已下載的應用程式嗎？這個動作無法復原！"</string>
     <string name="master_clear_final_button_text" msgid="5390908019019242910">"全部清除"</string>
     <string name="master_clear_failed" msgid="2503230016394586353">"無法使用 System Clear 服務，因此未執行任何重設。"</string>
-    <string name="master_clear_confirm_title" msgid="7572642091599403668">"您要重設嗎？"</string>
+    <string name="master_clear_confirm_title" msgid="7572642091599403668">"你要重設嗎？"</string>
     <string name="master_clear_not_available" msgid="1000370707967468909">"這位使用者無法將裝置恢復原廠設定"</string>
     <string name="master_clear_progress_title" msgid="5194793778701994634">"清除中"</string>
     <string name="master_clear_progress_text" msgid="6559096229480527510">"請稍候…"</string>
@@ -1352,13 +1349,13 @@
     <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>
     <string name="network_scorer_change_active_dialog_title" msgid="3776301550387574975">"變更 Wi‑Fi Assistant？"</string>
-    <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"改以「<xliff:g id="NEW_APP">%1$s</xliff:g>」取代「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」管理您的網路連線？"</string>
-    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」管理您的網路連線？"</string>
+    <string name="network_scorer_change_active_dialog_text" msgid="8035173880322990715">"改以「<xliff:g id="NEW_APP">%1$s</xliff:g>」取代「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」管理你的網路連線？"</string>
+    <string name="network_scorer_change_active_no_previous_dialog_text" msgid="7444620909047611601">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」管理你的網路連線？"</string>
     <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"未知的 SIM 卡電信業者"</string>
     <string name="mobile_no_provisioning_url" msgid="9053814051811634125">"「<xliff:g id="OPERATOR">%1$s</xliff:g>」沒有任何已知的佈建網站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
@@ -1379,25 +1376,25 @@
     <string name="location_mode_screen_title" msgid="4528716772270246542">"定位模式"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"使用 GPS、Wi-Fi、藍牙或行動網路判斷所在位置"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"使用 Wi-Fi、藍牙或行動網路判斷所在位置"</string>
-    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 判斷您的所在位置"</string>
+    <string name="location_mode_sensors_only_description" msgid="788127681455735699">"使用 GPS 判斷你的所在位置"</string>
     <string name="location_scanning_screen_title" msgid="4408076862929611554">"掃描"</string>
     <string name="location_scanning_wifi_always_scanning_title" msgid="6216705505621183645">"Wi-Fi 掃描"</string>
     <string name="location_scanning_wifi_always_scanning_description" msgid="8036382029606868081">"允許系統應用程式和服務隨時偵測 Wi‑Fi 網路，以提升定位精確度。"</string>
     <string name="location_scanning_bluetooth_always_scanning_title" msgid="5444989508204520019">"藍牙掃描"</string>
     <string name="location_scanning_bluetooth_always_scanning_description" msgid="8602726521250591852">"允許系統應用程式和服務隨時偵測藍牙裝置，以提升定位精確度。"</string>
     <string name="location_network_based" msgid="9134175479520582215">"Wi-Fi 和行動網路位置"</string>
-    <string name="location_neighborhood_level" msgid="5141318121229984788">"允許應用程式使用 Google 的定位服務加速判斷您的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
+    <string name="location_neighborhood_level" msgid="5141318121229984788">"允許應用程式使用 Google 的定位服務加速判斷你的約略位置。系統會收集匿名的位置資料並傳送給 Google。"</string>
     <string name="location_neighborhood_level_wifi" msgid="4234820941954812210">"根據 Wi-Fi 判定位置"</string>
     <string name="location_gps" msgid="8392461023569708478">"GPS 衛星定位"</string>
-    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"允許應用程式使用平板電腦的 GPS 找出您的精確位置"</string>
-    <string name="location_street_level" product="default" msgid="4617445745492014203">"允許應用程式使用手機的 GPS 找出您的精確位置"</string>
+    <string name="location_street_level" product="tablet" msgid="1669562198260860802">"允許應用程式使用平板電腦的 GPS 找出你的精確位置"</string>
+    <string name="location_street_level" product="default" msgid="4617445745492014203">"允許應用程式使用手機的 GPS 找出你的精確位置"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"使用輔助 GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"使用伺服器輔助 GPS (取消勾選即可降低網路使用量)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"使用伺服器輔助 GPS (取消勾選即可提升 GPS 效能)"</string>
     <string name="use_location_title" msgid="5206937465504979977">"位置資訊與 Google 搜尋"</string>
-    <string name="use_location_summary" msgid="3978805802386162520">"允許 Google 使用您的位置資訊來改善搜尋結果和其他服務"</string>
+    <string name="use_location_summary" msgid="3978805802386162520">"允許 Google 使用你的位置資訊來改善搜尋結果和其他服務"</string>
     <string name="location_access_title" msgid="7064108942964081243">"存取我的位置資訊"</string>
-    <string name="location_access_summary" msgid="69031404093194341">"允許獲得您許可的應用程式使用您的位置資訊"</string>
+    <string name="location_access_summary" msgid="69031404093194341">"允許獲得你許可的應用程式使用你的位置資訊"</string>
     <string name="location_sources_heading" msgid="1278732419851088319">"位置資訊來源"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"關於平板電腦"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"關於手機"</string>
@@ -1421,32 +1418,32 @@
     <string name="settings_license_activity_loading" msgid="3337535809093591740">"載入中…"</string>
     <string name="settings_safetylegal_title" msgid="1289483965535937431">"安全資訊"</string>
     <string name="settings_safetylegal_activity_title" msgid="6901214628496951727">"安全資訊"</string>
-    <string name="settings_safetylegal_activity_unreachable" msgid="250674109915859456">"您沒有數據連線，如要立即查看這項資訊，請使用任何已連上網際網路的電腦前往 %s。"</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_pattern_header" msgid="6949761069941694050">"選擇圖案"</string>
     <string name="lockpassword_choose_your_pin_header" msgid="7598849519816138302">"選擇 PIN 碼"</string>
     <string name="lockpassword_confirm_your_password_header" msgid="6308478184889846633">"確認密碼"</string>
     <string name="lockpassword_confirm_your_pattern_header" msgid="7543433733032330821">"確認圖案"</string>
-    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"確認您的 PIN 碼"</string>
+    <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"確認你的 PIN 碼"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="5140892109439191415">"密碼不符"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="7226244811505606217">"PIN 碼不符"</string>
     <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"選擇解鎖方式"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"已設定密碼"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"已設定 PIN"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"已設定圖案"</string>
-    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"請畫出您的裝置解鎖圖案以繼續作業"</string>
+    <string name="lockpassword_confirm_your_pattern_generic" msgid="2920960858283879113">"請畫出你的裝置解鎖圖案以繼續作業"</string>
     <string name="lockpassword_confirm_your_pin_generic" msgid="4062335874438910487">"輸入裝置 PIN 碼即可繼續"</string>
-    <string name="lockpassword_confirm_your_password_generic" msgid="3976394862548354966">"請輸入您的裝置密碼以繼續作業"</string>
-    <string name="lockpassword_confirm_your_pattern_generic_profile" msgid="4435638308193361861">"請畫出您的 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_confirm_your_password_generic" msgid="3976394862548354966">"請輸入你的裝置密碼以繼續作業"</string>
+    <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_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_invalid_pin" msgid="15588049067548470">"PIN 碼錯誤"</string>
     <string name="lockpassword_invalid_password" msgid="4038507398784975200">"密碼錯誤"</string>
     <string name="lockpattern_need_to_unlock_wrong" msgid="1745247595356012176">"圖案錯誤"</string>
@@ -1459,7 +1456,7 @@
     <string name="lockpattern_recording_incorrect_too_short" msgid="1348234155120957561">"圖案至少需連接 <xliff:g id="NUMBER">%d</xliff:g> 點，請再試一次。"</string>
     <string name="lockpattern_pattern_entered_header" msgid="4316818983675591604">"圖案已記錄"</string>
     <string name="lockpattern_need_to_confirm" msgid="8054853451639221265">"請再次畫出圖案，以確認圖案無誤"</string>
-    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"您的新解鎖圖案"</string>
+    <string name="lockpattern_pattern_confirmed_header" msgid="8455614172231880211">"你的新解鎖圖案"</string>
     <string name="lockpattern_confirm_button_text" msgid="1128204343957002841">"確認"</string>
     <string name="lockpattern_restart_button_text" msgid="3337574403350953926">"重畫"</string>
     <string name="lockpattern_retry_button_text" msgid="3480423193273588166">"清除"</string>
@@ -1476,14 +1473,14 @@
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"變更解鎖圖案"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"如何畫出解鎖圖案"</string>
     <string name="lockpattern_too_many_failed_confirmation_attempts" msgid="6909161623701848863">"錯誤次數過多，請於 <xliff:g id="NUMBER">%d</xliff:g> 秒後再試。"</string>
-    <string name="activity_not_found" msgid="5551664692991605325">"您未在手機上安裝應用程式。"</string>
+    <string name="activity_not_found" msgid="5551664692991605325">"你未在手機上安裝應用程式。"</string>
     <string name="lock_settings_profile_title" msgid="2121876391814535295">"Work 設定檔安全性"</string>
     <string name="lock_settings_profile_screen_lock_title" msgid="3334747927367115256">"Work 設定檔螢幕鎖定"</string>
     <string name="lock_settings_profile_unification_title" msgid="4973102698492659123">"使用同一種鎖定方式"</string>
     <string name="lock_settings_profile_unification_summary" msgid="7178299172998641303">"讓 Work 設定檔和裝置螢幕使用同一種鎖定方式"</string>
     <string name="lock_settings_profile_unification_dialog_title" msgid="4824620230229285301">"要使用同一種鎖定方式嗎？"</string>
     <string name="lock_settings_profile_unification_dialog_body" msgid="7128305504872026659">"你的裝置將使用 Work 設定檔螢幕鎖定，Work 政策會套用到這兩種鎖定方式。"</string>
-    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"您的 Work 設定檔鎖定不符合貴機構的安全性標準。您可以設定讓裝置螢幕與 Work 設定檔採用相同的鎖定方式，但是必須遵守所有相關的 Work 鎖定政策。"</string>
+    <string name="lock_settings_profile_unification_dialog_uncompliant_body" msgid="3221303098797469900">"你的 Work 設定檔鎖定不符合貴機構的安全性標準。你可以設定讓裝置螢幕與 Work 設定檔採用相同的鎖定方式，但是必須遵守所有相關的 Work 鎖定政策。"</string>
     <string name="lock_settings_profile_unification_dialog_confirm" msgid="8249970828159656518">"使用同一種鎖定方式"</string>
     <string name="lock_settings_profile_unification_dialog_uncompliant_confirm" msgid="5943758576756482777">"使用同一種鎖定方式"</string>
     <string name="lock_settings_profile_unified_summary" msgid="9008819078132993492">"與裝置的螢幕鎖定一致"</string>
@@ -1527,11 +1524,11 @@
     <string name="enable_text" msgid="9217362512327828987">"啟用"</string>
     <string name="clear_user_data_text" msgid="5597622864770098388">"清除資料"</string>
     <string name="app_factory_reset" msgid="6635744722502563022">"解除安裝更新"</string>
-    <string name="auto_launch_enable_text" msgid="4275746249511874845">"您已預設在某些操作下啟動這個應用程式。"</string>
-    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"您已選擇允許這個應用程式建立小工具並存取其資料。"</string>
+    <string name="auto_launch_enable_text" msgid="4275746249511874845">"你已預設在某些操作下啟動這個應用程式。"</string>
+    <string name="always_allow_bind_appwidgets_text" msgid="566822577792032925">"你已選擇允許這個應用程式建立小工具並存取其資料。"</string>
     <string name="auto_launch_disable_text" msgid="7800385822185540166">"沒有預設值。"</string>
     <string name="clear_activities" msgid="7408923511535174430">"清除預設值"</string>
-    <string name="screen_compatibility_text" msgid="1616155457673106022">"這個應用程式可能與您的螢幕不相容；您可以在這裡進行設定，將應用程式調整成與您的螢幕相容。"</string>
+    <string name="screen_compatibility_text" msgid="1616155457673106022">"這個應用程式可能與你的螢幕不相容；你可以在這裡進行設定，將應用程式調整成與你的螢幕相容。"</string>
     <string name="ask_compatibility" msgid="7225195569089607846">"啓動時詢問"</string>
     <string name="enable_compatibility" msgid="5806819252068617811">"應用程式比例"</string>
     <string name="unknown" msgid="1592123443519355854">"不明"</string>
@@ -1542,7 +1539,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>
@@ -1562,7 +1559,7 @@
     <string name="sd_card_storage" product="nosdcard" msgid="2673203150465132465">"USB 儲存裝置"</string>
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"SD 卡儲存裝置"</string>
     <string name="recompute_size" msgid="7722567982831691718">"重新計算大小…"</string>
-    <string name="clear_data_dlg_title" msgid="5605258400134511197">"您要刪除應用程式資料嗎？"</string>
+    <string name="clear_data_dlg_title" msgid="5605258400134511197">"你要刪除應用程式資料嗎？"</string>
     <string name="clear_data_dlg_text" msgid="3951297329833822490">"系統會永久刪除這個應用程式的所有資料，包含所有檔案、設定、帳戶、資料庫等。"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"確定"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"取消"</string>
@@ -1571,10 +1568,10 @@
     <string name="clear_data_failed" msgid="7214074331627422248">"無法清除應用程式資料。"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"清除資料"</string>
     <string name="clear_failed_dlg_text" msgid="5464475937929941008">"無法清除應用程式的資料。"</string>
-    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"這個應用程式可存取您平板電腦中的下列項目："</string>
-    <string name="security_settings_desc" product="default" msgid="61749028818785244">"這個應用程式可存取您手機上的下列項目："</string>
-    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"這個應用程式可存取您平板電腦上的下列內容。為了增進效能及降低記憶體用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> 可獲得其中的部分權限，因為這個應用程式與 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> 在同一程序中執行。"</string>
-    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"這個應用程式可存取您手機上的下列內容。為了增進效能及降低記憶體用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> 可獲得其中的部分權限，因為這個應用程式與 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> 在同一程序中執行。"</string>
+    <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"這個應用程式可存取你平板電腦中的下列項目："</string>
+    <string name="security_settings_desc" product="default" msgid="61749028818785244">"這個應用程式可存取你手機上的下列項目："</string>
+    <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"這個應用程式可存取你平板電腦上的下列內容。為了增進效能及降低記憶體用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> 可獲得其中的部分權限，因為這個應用程式與 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> 在同一程序中執行。"</string>
+    <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"這個應用程式可存取你手機上的下列內容。為了增進效能及降低記憶體用量，<xliff:g id="BASE_APP_NAME">%1$s</xliff:g> 可獲得其中的部分權限，因為這個應用程式與 <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g> 在同一程序中執行。"</string>
     <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>和<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_two_unrelated_items" msgid="1873827777191260824">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>、<xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
     <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g>和<xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
@@ -1584,7 +1581,7 @@
     <string name="security_settings_premium_sms_desc" msgid="8734171334263713717">"傳送付費簡訊"</string>
     <string name="computing_size" msgid="1599186977475211186">"計算中…"</string>
     <string name="invalid_size_value" msgid="1582744272718752951">"無法計算套件大小。"</string>
-    <string name="empty_list_msg" msgid="3552095537348807772">"您並未安裝任何第三方應用程式。"</string>
+    <string name="empty_list_msg" msgid="3552095537348807772">"你並未安裝任何第三方應用程式。"</string>
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移動"</string>
     <string name="move_app_to_internal" product="tablet" msgid="2299714147283854957">"移至平板電腦"</string>
@@ -1599,22 +1596,23 @@
     <string name="invalid_location" msgid="4354595459063675191">"安裝位置無效。"</string>
     <string name="system_package" msgid="1352722848400644991">"無法在外部媒體上安裝系統更新。"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"無法在外部媒體上安裝裝置管理員"</string>
-    <string name="force_stop_dlg_title" msgid="977530651470711366">"您要強制停止嗎？"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"如果您強制停止應用程式，應用程式可能無法正常運作。"</string>
+    <string name="force_stop_dlg_title" msgid="977530651470711366">"你要強制停止嗎？"</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"如果你強制停止應用程式，應用程式可能無法正常運作。"</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"無法移動應用程式。原因：<xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"偏好的安裝位置"</string>
     <string name="app_install_location_summary" msgid="5155453752692959098">"變更偏好的新應用程式安裝位置"</string>
-    <string name="app_disable_dlg_title" msgid="3916469657537695436">"您要停用內建應用程式嗎？"</string>
+    <string name="app_disable_dlg_title" msgid="3916469657537695436">"你要停用內建應用程式嗎？"</string>
     <string name="app_disable_dlg_positive" msgid="7375627244201714263">"停用應用程式"</string>
     <string name="app_disable_dlg_text" msgid="5632072173181990531">"如果你停用這個應用程式，Android 和其他應用程式可能無法正常運作。"</string>
     <string name="app_special_disable_dlg_title" msgid="2690148680327142674">"刪除資料並停用應用程式？"</string>
     <string name="app_special_disable_dlg_text" msgid="5832078825810635913">"如果你停用這個應用程式，Android 和其他應用程式可能無法正常運作，你的資料也會遭到刪除。"</string>
     <string name="app_disable_notifications_dlg_title" msgid="7669264654851761857">"關閉通知？"</string>
-    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果您關閉這個應用程式的通知，可能會錯失重要的警示與更新。"</string>
+    <string name="app_disable_notifications_dlg_text" msgid="5088484670924769845">"如果你關閉這個應用程式的通知，可能會錯失重要的警示與更新。"</string>
     <string name="app_install_details_group_title" msgid="7084623031296083574">"商店"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"應用程式詳細資料"</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>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(從未使用)"</string>
@@ -1660,8 +1658,8 @@
     <string name="process_service_in_use_description" msgid="8993335064403217080">"服務 <xliff:g id="COMP_NAME">%1$s</xliff:g> 正在使用中。"</string>
     <string name="process_provider_in_use_description" msgid="5586603325677678940">"供應商 <xliff:g id="COMP_NAME">%1$s</xliff:g> 正在使用中。"</string>
     <string name="runningservicedetails_stop_dlg_title" msgid="4253292537154337233">"停止系統服務？"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"如果您停用這項服務，您的平板電腦上的某些功能可能無法正常運作，待您重新開機後才會恢復正常。"</string>
-    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果您停用這項服務，您的手機上的某些功能可能無法正常運作，待您重新開機後才會恢復正常。"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="tablet" msgid="3371302398335665793">"如果你停用這項服務，你的平板電腦上的某些功能可能無法正常運作，待你重新開機後才會恢復正常。"</string>
+    <string name="runningservicedetails_stop_dlg_text" product="default" msgid="3920243762189484756">"如果你停用這項服務，你的手機上的某些功能可能無法正常運作，待你重新開機後才會恢復正常。"</string>
     <string name="language_settings" msgid="8758655933029560944">"語言與輸入設定"</string>
     <string name="language_keyboard_settings_title" msgid="3709159207482544398">"語言與輸入設定"</string>
     <string name="input_assistance" msgid="7577795275222555487">"輸入輔助"</string>
@@ -1677,7 +1675,7 @@
     <string name="auto_punctuate_summary" msgid="4372126865670574837">"按空白鍵兩次可插入「.」"</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>
@@ -1691,7 +1689,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"鍵盤快速鍵協助工具"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"顯示可用的快速鍵"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"預設"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"滑鼠/觸控板"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"游標速度"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"遊戲控制器"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"使用震動"</string>
@@ -1760,7 +1757,7 @@
     <string name="accessibility_settings_title" msgid="2130492524656204459">"協助工具設定"</string>
     <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_description" msgid="5679491180156408260">"你可以根據個人需求自訂這個裝置，而你日後可以前往 [設定] 變更這些協助工具功能。"</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>
@@ -1772,19 +1769,19 @@
     <string name="select_to_speak_summary" msgid="4282846695497544515">"輕觸畫面上的項目即可聽取項目內容"</string>
     <string name="accessibility_captioning_title" msgid="7589266662024836291">"字幕"</string>
     <string name="accessibility_screen_magnification_title" msgid="6001128808776506021">"放大"</string>
-    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"輕按三下以放大"</string>
-    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"輕觸按鈕以放大"</string>
+    <string name="accessibility_screen_magnification_gestures_title" msgid="3719929521571489913">"輕觸螢幕三下進行放大"</string>
+    <string name="accessibility_screen_magnification_navbar_title" msgid="7141753038957538230">"輕觸按鈕來放大螢幕"</string>
     <string name="accessibility_screen_magnification_state_navbar_gesture" msgid="2760906043221923793">"輕觸三下按鈕以放大"</string>
     <string name="accessibility_preference_magnification_summary" msgid="5867883657521404509">"放大畫面內容"</string>
     <string name="accessibility_screen_magnification_short_summary" msgid="3411979839172752057">"輕觸三下即可縮放畫面"</string>
-    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"輕觸按鈕以進行縮放"</string>
+    <string name="accessibility_screen_magnification_navbar_short_summary" msgid="3693116360267980492">"輕觸按鈕即可縮放"</string>
     <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_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="6488524140219209763">"啟用快速鍵功能之後，同時按下音量調高和調低鍵 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>
@@ -1857,14 +1854,14 @@
     <string name="color_magenta" msgid="5059212823607815549">"洋紅色"</string>
     <string name="enable_service_title" msgid="3061307612673835592">"使用「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="capabilities_list_title" msgid="86713361724771971">"「<xliff:g id="SERVICE">%1$s</xliff:g>」需要執行下列動作："</string>
-    <string name="touch_filtered_warning" msgid="8644034725268915030">"權限要求遭到其他應用程式畫面遮掩，因此「設定」無法驗證您的回應。"</string>
-    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果您開啟 <xliff:g id="SERVICE">%1$s</xliff:g>，您的裝置將無法使用螢幕鎖定加強資料加密。"</string>
-    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"您已開啟協助工具服務，因此您的裝置無法使用螢幕鎖定加強資料加密。"</string>
-    <string name="enable_service_pattern_reason" msgid="777577618063306751">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此您必須畫出解鎖圖案。"</string>
-    <string name="enable_service_pin_reason" msgid="7882035264853248228">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此您必須輸入 PIN。"</string>
-    <string name="enable_service_password_reason" msgid="1224075277603097951">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此您必須輸入密碼。"</string>
-    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"記錄您的操作行為"</string>
-    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"在您與應用程式互動時接收通知。"</string>
+    <string name="touch_filtered_warning" msgid="8644034725268915030">"權限要求遭到其他應用程式畫面遮掩，因此「設定」無法驗證你的回應。"</string>
+    <string name="enable_service_encryption_warning" msgid="3064686622453974606">"如果你開啟 <xliff:g id="SERVICE">%1$s</xliff:g>，你的裝置將無法使用螢幕鎖定加強資料加密。"</string>
+    <string name="secure_lock_encryption_warning" msgid="460911459695077779">"你已開啟協助工具服務，因此你的裝置無法使用螢幕鎖定加強資料加密。"</string>
+    <string name="enable_service_pattern_reason" msgid="777577618063306751">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此你必須畫出解鎖圖案。"</string>
+    <string name="enable_service_pin_reason" msgid="7882035264853248228">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此你必須輸入 PIN。"</string>
+    <string name="enable_service_password_reason" msgid="1224075277603097951">"開啟 <xliff:g id="SERVICE">%1$s</xliff:g> 將影響資料加密，因此你必須輸入密碼。"</string>
+    <string name="capability_title_receiveAccessibilityEvents" msgid="1869032063969970755">"記錄你的操作行為"</string>
+    <string name="capability_desc_receiveAccessibilityEvents" msgid="6640333613848713883">"在你與應用程式互動時接收通知。"</string>
     <string name="disable_service_title" msgid="3624005212728512896">"停止「<xliff:g id="SERVICE">%1$s</xliff:g>」？"</string>
     <string name="disable_service_message" msgid="2247101878627941561">"輕觸 [確定] 會讓 <xliff:g id="SERVICE">%1$s</xliff:g> 停止運作。"</string>
     <string name="accessibility_no_services_installed" msgid="7200948194639038807">"未安裝任何服務"</string>
@@ -1912,11 +1909,11 @@
     <string name="background_activity_summary_on" msgid="649282072540085599">"應用程式不使用時可在背景執行"</string>
     <string name="background_activity_summary_off" msgid="7666330699090632040">"應用程式的背景活動會在不使用時受限"</string>
     <string name="background_activity_summary_disabled" msgid="3710669050484599847">"應用程式無法在背景執行"</string>
-    <string name="device_screen_usage" msgid="3386088035570409683">"充飽後的螢幕用量"</string>
+    <string name="device_screen_usage" msgid="3386088035570409683">"上次完全充飽電後的螢幕用電量"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"螢幕耗電量"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"行動網路掃描作業"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g>之前"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"充飽後的應用程式用量 (<xliff:g id="TIME">%1$s</xliff:g>之前)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g>之前"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"充飽電 (<xliff:g id="TIME">^1</xliff:g>之前) 後的應用程式用電量"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"充飽後的螢幕點亮時間"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"充飽後的裝置用量"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"拔除插頭後的電池使用狀況"</string>
@@ -1947,7 +1944,7 @@
     <string name="power_camera" msgid="4976286950934622605">"相機"</string>
     <string name="power_wifi" msgid="1135085252964054957">"Wi‑Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"藍牙"</string>
-    <string name="power_cell" msgid="6596471490976003056">"手機待機"</string>
+    <string name="power_cell" msgid="3392999761958982492">"行動網路待命中"</string>
     <string name="power_phone" msgid="5392641106474567277">"語音通話"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"平板電腦閒置"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"手機閒置"</string>
@@ -2007,17 +2004,17 @@
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"電池用量是約略的電源用量，可能不包含部分耗電來源。估算的約略電源用量與實際監測到的耗電量之間的差距即為其他電源用量。"</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"估計過高的用電量"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"使用時間：%1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"使用時間：<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="APP">%2$s</xliff:g>用量佔 <xliff:g id="PERCENT">%1$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_last_full_charge" msgid="7151251641099019361">"上次完全充飽電"</string>
     <string name="battery_footer_summary" msgid="4701358808575132647">"電池的剩餘使用時間為約略值，且會因使用情形而有所變動"</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>
-    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"總應用程式用量的 <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
-    <string name="battery_detail_info_title" msgid="8227822131405620369">"充飽後的用量"</string>
+    <string name="battery_detail_power_percentage" msgid="8064814503316094497">"應用程式總用電量的 <xliff:g id="PERCENT">%1$s</xliff:g> (<xliff:g id="POWER">%2$d</xliff:g> mAh)"</string>
+    <string name="battery_detail_info_title" msgid="8227822131405620369">"自上次充飽電後"</string>
     <string name="battery_detail_manage_title" msgid="9094314252105828014">"管理電池用量"</string>
     <string name="estimated_time_left" msgid="7514194472683370877">"預估剩餘時間"</string>
     <string name="estimated_charging_time_left" msgid="5614442409326164691">"充飽所需時間"</string>
@@ -2079,13 +2076,12 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"語音輸入與輸出裝置設定"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"語音搜尋"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Android 鍵盤"</string>
-    <string name="voice_category" msgid="1430370497125803904">"語音"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"語音輸入設定"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"語音輸入"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"語音輸入服務"</string>
     <string name="voice_interactor_preference_summary" msgid="1801414022026937190">"全語音啟動字詞與互動服務"</string>
     <string name="voice_recognizer_preference_summary" msgid="669880813593690527">"簡易語音轉文字"</string>
-    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"這項語音輸入服務由 <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> 應用程式提供，可隨時監控語音輸入，而且會替您管理所有支援語音功能的應用程式。要啟用這項服務嗎？"</string>
+    <string name="voice_interaction_security_warning" msgid="6378608263983737325">"這項語音輸入服務由 <xliff:g id="VOICE_INPUT_SERVICE_APP_NAME">%s</xliff:g> 應用程式提供，可隨時監控語音輸入，而且會替你管理所有支援語音功能的應用程式。要啟用這項服務嗎？"</string>
     <string name="tts_engine_preference_title" msgid="1578826947311494239">"偏好的引擎"</string>
     <string name="tts_engine_settings_title" msgid="6886964122861384818">"引擎設定"</string>
     <string name="tts_sliders_title" msgid="992059150784095263">"語音速率和音調"</string>
@@ -2141,16 +2137,16 @@
     <string name="credentials_unlock" msgid="385427939577366499"></string>
     <string name="credentials_unlock_hint" msgid="2301301378040499348">"輸入認證儲存空間的密碼。"</string>
     <string name="credentials_old_password" msgid="7553393815538684028">"目前的密碼："</string>
-    <string name="credentials_reset_hint" msgid="6297256880896133631">"您要移除所有內容嗎？"</string>
+    <string name="credentials_reset_hint" msgid="6297256880896133631">"你要移除所有內容嗎？"</string>
     <string name="credentials_password_too_short" msgid="7502749986405522663">"密碼最少必須包含 8 個字元。"</string>
     <string name="credentials_wrong_password" msgid="2541932597104054807">"密碼不正確。"</string>
-    <string name="credentials_reset_warning" msgid="5320653011511797600">"密碼不正確。您還有 1 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>
-    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"密碼不正確。您還有 <xliff:g id="NUMBER">%1$d</xliff:g> 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>
+    <string name="credentials_reset_warning" msgid="5320653011511797600">"密碼不正確。你還有 1 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>
+    <string name="credentials_reset_warning_plural" msgid="6514085665301095279">"密碼不正確。你還有 <xliff:g id="NUMBER">%1$d</xliff:g> 次輸入密碼的機會，如果輸入錯誤，憑證儲存空間將遭到清除。"</string>
     <string name="credentials_erased" msgid="2907836028586342969">"憑證儲存空間已清除。"</string>
     <string name="credentials_not_erased" msgid="7685932772284216097">"無法清除認證儲存空間。"</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"已啟用認證儲存空間。"</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"您必須先設定螢幕鎖定 PIN 或密碼，才能使用憑證儲存空間。"</string>
-    <string name="usage_access_title" msgid="332333405495457839">"可存取使用情形資料的應用程式"</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6757119179588664966">"你必須先設定螢幕鎖定 PIN 或密碼，才能使用憑證儲存空間。"</string>
+    <string name="usage_access_title" msgid="332333405495457839">"有權查看使用情況的應用程式"</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"緊急警示音"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"設定撥打緊急電話時的運作方式"</string>
     <string name="privacy_settings_title" msgid="2978878794187459190">"備份"</string>
@@ -2165,7 +2161,7 @@
     <string name="backup_inactive_title" msgid="685838037986644604">"備份服務未啟用"</string>
     <string name="backup_configure_account_default_summary" msgid="2436933224764745553">"目前沒有帳戶正在儲存備份資料"</string>
     <string name="backup_erase_dialog_title" msgid="1027640829482174106"></string>
-    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"要停止備份您的 Wi-Fi 密碼、書籤、其他設定以及應用程式資料，並清除 Google 伺服器上儲存的所有複本嗎？"</string>
+    <string name="backup_erase_dialog_message" msgid="5221011285568343155">"要停止備份你的 Wi-Fi 密碼、書籤、其他設定以及應用程式資料，並清除 Google 伺服器上儲存的所有複本嗎？"</string>
     <string name="fullbackup_erase_dialog_message" msgid="694766389396659626">"要停止備份裝置資料 (例如 Wi-Fi 密碼和通話紀錄) 以及應用程式資料 (例如應用程式所儲存的設定和檔案)，並清除遠端伺服器中的所有備份內容嗎？"</string>
     <string name="fullbackup_data_summary" msgid="960850365007767734">"在遠端自動備份裝置資料 (例如 Wi-Fi 密碼和通話紀錄) 以及應用程式資料 (例如應用程式所儲存的設定和檔案)。\n\n啟用自動備份功能後，系統會定期將裝置和應用程式資料儲存到遠端。應用程式資料泛指應用程式依據開發人員設定所儲存的任何資料，包括聯絡人、訊息和相片等可能具敏感性的資料。"</string>
     <string name="device_admin_settings_title" msgid="4960761799560705902">"裝置管理員設定"</string>
@@ -2235,7 +2231,7 @@
     <string name="remove_managed_profile_label" msgid="3856519337797285325">"移除工作設定檔"</string>
     <string name="background_data" msgid="5779592891375473817">"背景資料"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"應用程式隨時可以同步處理、傳送和接收資料"</string>
-    <string name="background_data_dialog_title" msgid="6059217698124786537">"您要停用背景資料嗎？"</string>
+    <string name="background_data_dialog_title" msgid="6059217698124786537">"你要停用背景資料嗎？"</string>
     <string name="background_data_dialog_message" msgid="6981661606680941633">"停用背景資料可延長電池使用時間，並減少資料的傳輸量。但某些應用程式可能仍會使用背景資料連線。"</string>
     <string name="sync_automatically" msgid="1682730255435062059">"自動同步處理應用程式的資料"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"已開啟同步處理功能"</string>
@@ -2252,7 +2248,7 @@
     <string name="sync_gmail" msgid="714886122098006477">"Gmail"</string>
     <string name="sync_calendar" msgid="9056527206714733735">"日曆"</string>
     <string name="sync_contacts" msgid="9174914394377828043">"聯絡人"</string>
-    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"歡迎使用 Google Sync！"</font>\n"這是 Google 所提供的資料同步處理工具，可讓您隨時隨地存取通訊錄、約會等多種資料。"</string>
+    <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"歡迎使用 Google Sync！"</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>
@@ -2271,8 +2267,8 @@
     <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_pin" msgid="5305333588093263790">"如要啟動 Android，請輸入您的 PIN"</string>
+    <string name="enter_password" msgid="8035706727471334122">"如要啟動 Android，請輸入你的密碼"</string>
+    <string name="enter_pin" msgid="5305333588093263790">"如要啟動 Android，請輸入你的 PIN"</string>
     <string name="enter_pattern" msgid="4187435713036808566">"如要啟動 Android，請畫出解鎖圖案"</string>
     <string name="cryptkeeper_wrong_pattern" msgid="8423835922362956999">"圖案錯誤"</string>
     <string name="cryptkeeper_wrong_password" msgid="5200857195368904047">"密碼錯誤"</string>
@@ -2335,15 +2331,15 @@
     <string name="data_usage_app_settings" msgid="2279171379771253165">"應用程式設定"</string>
     <string name="data_usage_app_restrict_background" msgid="7359227831562303223">"背景資料"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="5853552187570622572">"允許在背景使用行動數據"</string>
-    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"您必須設定行動數據限制，才能限制這個應用程式的背景資料。"</string>
+    <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"你必須設定行動數據限制，才能限制這個應用程式的背景資料。"</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"限制背景資料？"</string>
-    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"如果採用這項功能，當只有行動網路可供使用時，需要背景數據傳輸的應用程式可能會停止運作。\n\n您可以在應用程式的設定選單中，找出更多適當的數據用量的選項。"</string>
+    <string name="data_usage_app_restrict_dialog" msgid="1466689968707308512">"如果採用這項功能，當只有行動網路可供使用時，需要背景數據傳輸的應用程式可能會停止運作。\n\n你可以在應用程式的設定選單中，找出更多適當的數據用量的選項。"</string>
     <string name="data_usage_restrict_denied_dialog" msgid="55012417305745608">"你必須先設定行動數據用量上限，才能限制背景資料。"</string>
     <string name="data_usage_auto_sync_on_dialog_title" msgid="2438617846762244389">"開啟資料自動同步功能？"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"您在網路上對帳戶進行的所有變更都會自動複製到您的平板電腦。\n\n有些帳戶還可以自動將您在平板電腦上進行的所有變更複製到網路上，Google 帳戶即是按照這種方式運作。"</string>
-    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"您在網路上對帳戶進行的所有變更都會自動複製到您的手機。\n\n有些帳戶還可以自動將您在手機上進行的所有變更複製到網路上，Google 帳戶即是按照這種方式運作。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="tablet" msgid="8581983093524041669">"你在網路上對帳戶進行的所有變更都會自動複製到你的平板電腦。\n\n有些帳戶還可以自動將你在平板電腦上進行的所有變更複製到網路上，Google 帳戶即是按照這種方式運作。"</string>
+    <string name="data_usage_auto_sync_on_dialog" product="default" msgid="8651376294887142858">"你在網路上對帳戶進行的所有變更都會自動複製到你的手機。\n\n有些帳戶還可以自動將你在手機上進行的所有變更複製到網路上，Google 帳戶即是按照這種方式運作。"</string>
     <string name="data_usage_auto_sync_off_dialog_title" msgid="9013139130490125793">"關閉資料自動同步功能？"</string>
-    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"這樣可以節省數據用量和電池用量，但您必須手動同步處理每個帳戶才能收集最新資訊。此外，系統進行更新時不會通知您。"</string>
+    <string name="data_usage_auto_sync_off_dialog" msgid="4025938250775413864">"這樣可以節省數據用量和電池用量，但你必須手動同步處理每個帳戶才能收集最新資訊。此外，系統進行更新時不會通知你。"</string>
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"用量週期重設日期"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"每月固定日期："</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"儲存設定"</string>
@@ -2362,10 +2358,10 @@
     <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"已移除的應用程式和使用者"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"已接收 <xliff:g id="RECEIVED">%1$s</xliff:g>，已傳送 <xliff:g id="SENT">%2$s</xliff:g>"</string>
     <string name="data_usage_total_during_range" msgid="4091294280619255237">"<xliff:g id="RANGE">%2$s</xliff:g>：已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。"</string>
-    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的電信業者對於數據用量的計算方式可能會有所不同。"</string>
-    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。您的電信業者對於數據用量的計算方式可能會有所不同。"</string>
+    <string name="data_usage_total_during_range_mobile" product="tablet" msgid="1925687342154538972">"<xliff:g id="RANGE">%2$s</xliff:g>：根據平板電腦計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。你的電信業者對於數據用量的計算方式可能會有所不同。"</string>
+    <string name="data_usage_total_during_range_mobile" product="default" msgid="5063981061103812900">"<xliff:g id="RANGE">%2$s</xliff:g>：根據手機計算，已使用約 <xliff:g id="TOTAL">%1$s</xliff:g>。你的電信業者對於數據用量的計算方式可能會有所不同。"</string>
     <string name="data_usage_metered_title" msgid="7383175371006596441">"網路限制"</string>
-    <string name="data_usage_metered_body" msgid="7655851702771342507">"計量付費網路在背景資料受限時等同行動網路。使用這類網路下載大量資料前，應用程式可能會顯示警告訊息。"</string>
+    <string name="data_usage_metered_body" msgid="7655851702771342507">"當背景數據流量受到限制時，系統會將按流量計費的網路視為行動網路。使用這類網路下載大量資料前，應用程式可能會顯示警告訊息。"</string>
     <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>
@@ -2454,7 +2450,7 @@
     <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="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>
@@ -2470,14 +2466,14 @@
       <item quantity="one">設為信任的憑證或移除憑證</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message_device_owner" formatted="false" msgid="1489335297837656666">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已在您的裝置上安裝多個憑證授權單位憑證，這些憑證將能監控您的裝置網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這些憑證，請與您的管理員聯絡。</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已在您的裝置上安裝憑證授權單位憑證，該憑證將能監控您的裝置網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這個憑證，請與您的管理員聯絡。</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已在你的裝置上安裝多個憑證授權單位憑證，這些憑證將能監控你的裝置網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這些憑證，請與你的管理員聯絡。</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已在你的裝置上安裝憑證授權單位憑證，該憑證將能監控你的裝置網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這個憑證，請與你的管理員聯絡。</item>
     </plurals>
     <plurals name="ssl_ca_cert_info_message" formatted="false" msgid="30645643499556573">
-      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已為您的 Work 設定檔安裝多個憑證授權單位憑證，這些憑證將能監控您的 Work 網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這些憑證，請與您的管理員聯絡。</item>
-      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已為您的 Work 設定檔安裝憑證授權單位憑證，該憑證將能監控您的 Work 網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這個憑證，請與您的管理員聯絡。</item>
+      <item quantity="other"><xliff:g id="MANAGING_DOMAIN_1">%s</xliff:g> 已為你的 Work 設定檔安裝多個憑證授權單位憑證，這些憑證將能監控你的 Work 網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這些憑證，請與你的管理員聯絡。</item>
+      <item quantity="one"><xliff:g id="MANAGING_DOMAIN_0">%s</xliff:g> 已為你的 Work 設定檔安裝憑證授權單位憑證，該憑證將能監控你的 Work 網路活動，包括電子郵件、應用程式和安全的網站。\n\n如要進一步瞭解這個憑證，請與你的管理員聯絡。</item>
     </plurals>
-    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三方可以監控您的網路活動，包括您使用電子郵件、應用程式和加密網站的情況。\n\n這是因為您的裝置上安裝了信任的憑證。"</string>
+    <string name="ssl_ca_cert_warning_message" msgid="8216218659139190498">"第三方可以監控你的網路活動，包括你使用電子郵件、應用程式和加密網站的情況。\n\n這是因為你的裝置上安裝了信任的憑證。"</string>
     <plurals name="ssl_ca_cert_settings_button" formatted="false" msgid="2426799352517325228">
       <item quantity="other">查看憑證</item>
       <item quantity="one">查看憑證</item>
@@ -2487,22 +2483,22 @@
     <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"新增使用者或個人資料"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"新增使用者"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"設有限制的個人資料"</string>
-    <string name="user_need_lock_message" msgid="5879715064416886811">"如要建立設有限制的個人資料，您必須先設定螢幕鎖定來保護您的應用程式和個人資料。"</string>
+    <string name="user_need_lock_message" msgid="5879715064416886811">"如要建立設有限制的個人資料，你必須先設定螢幕鎖定來保護你的應用程式和個人資料。"</string>
     <string name="user_set_lock_button" msgid="8311219392856626841">"設定鎖定"</string>
     <string name="user_summary_not_set_up" msgid="8778205026866794909">"尚未設定"</string>
     <string name="user_summary_restricted_not_set_up" msgid="1628116001964325544">"尚未建立 - 設有限制的個人資料"</string>
     <string name="user_summary_managed_profile_not_set_up" msgid="1659125858619760573">"尚未設定 - 工作設定檔"</string>
     <string name="user_admin" msgid="993402590002400782">"管理員"</string>
-    <string name="user_you" msgid="1639158809315025986">"您 (<xliff:g id="NAME">%s</xliff:g>)"</string>
+    <string name="user_you" msgid="1639158809315025986">"你 (<xliff:g id="NAME">%s</xliff:g>)"</string>
     <string name="user_nickname" msgid="5148818000228994488">"暱稱"</string>
     <string name="user_add_user_type_title" msgid="2146438670792322349">"新增"</string>
-    <string name="user_add_max_count" msgid="5405885348463433157">"您最多可新增 <xliff:g id="USER_COUNT">%1$d</xliff:g> 位使用者"</string>
+    <string name="user_add_max_count" msgid="5405885348463433157">"你最多可新增 <xliff:g id="USER_COUNT">%1$d</xliff:g> 位使用者"</string>
     <string name="user_add_user_item_summary" msgid="4702776187132008661">"使用者擁有個人專屬的應用程式和內容"</string>
-    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"您可以限制他人透過您的帳戶存取應用程式和內容"</string>
+    <string name="user_add_profile_item_summary" msgid="5931663986889138941">"你可以限制他人透過你的帳戶存取應用程式和內容"</string>
     <string name="user_add_user_item_title" msgid="8212199632466198969">"使用者"</string>
     <string name="user_add_profile_item_title" msgid="8353515490730363621">"設有限制的個人資料"</string>
     <string name="user_add_user_title" msgid="2108112641783146007">"新增使用者？"</string>
-    <string name="user_add_user_message_long" msgid="8562152293752222985">"您可以建立其他使用者，藉此與他人共用這個裝置。每位使用者都有自己的專屬空間，並可使用應用程式、桌布等項目自訂這個個人空間。此外，使用者也可以調整 Wi‑Fi 這類會影響所有人的裝置設定。\n\n新增的使用者需要自行設定個人空間。\n\n任何使用者皆可為所有其他使用者更新應用程式。"</string>
+    <string name="user_add_user_message_long" msgid="8562152293752222985">"你可以建立其他使用者，藉此與他人共用這個裝置。每位使用者都有自己的專屬空間，並可使用應用程式、桌布等項目自訂這個個人空間。此外，使用者也可以調整 Wi‑Fi 這類會影響所有人的裝置設定。\n\n新增的使用者需要自行設定個人空間。\n\n任何使用者皆可為所有其他使用者更新應用程式。"</string>
     <string name="user_add_user_message_short" msgid="1511354412249044381">"新增的使用者需要自行設定個人空間。\n\n任何使用者皆可為其他所有使用者更新應用程式。"</string>
     <string name="user_setup_dialog_title" msgid="1765794166801864563">"立即設定使用者？"</string>
     <string name="user_setup_dialog_message" msgid="1004068621380867148">"請確保對方可以使用裝置並設定自己的空間"</string>
@@ -2517,12 +2513,12 @@
     <string name="user_add_on_lockscreen_menu" msgid="9072312646546364619">"在螢幕鎖定畫面中新增使用者"</string>
     <string name="user_new_user_name" msgid="369856859816028856">"新使用者"</string>
     <string name="user_new_profile_name" msgid="2632088404952119900">"新的個人資料"</string>
-    <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"您要刪除自己嗎？"</string>
+    <string name="user_confirm_remove_self_title" msgid="8432050170899479556">"你要刪除自己嗎？"</string>
     <string name="user_confirm_remove_title" msgid="1163721647646152032">"移除這位使用者？"</string>
     <string name="user_profile_confirm_remove_title" msgid="5573161550669867342">"移除這個設定檔？"</string>
     <string name="work_profile_confirm_remove_title" msgid="2017323555783522213">"移除工作設定檔？"</string>
-    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"您在這台平板電腦上的可用空間和資料將會消失，這個動作無法復原。"</string>
-    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"您在這支手機上的可用空間和資料將會消失，這個動作無法復原。"</string>
+    <string name="user_confirm_remove_self_message" product="tablet" msgid="2391372805233812410">"你在這台平板電腦上的可用空間和資料將會消失，這個動作無法復原。"</string>
+    <string name="user_confirm_remove_self_message" product="default" msgid="7943645442479360048">"你在這支手機上的可用空間和資料將會消失，這個動作無法復原。"</string>
     <string name="user_confirm_remove_message" msgid="1020629390993095037">"所有應用程式和資料都會遭到刪除。"</string>
     <string name="work_profile_confirm_remove_message" msgid="323856589749078140">"如果繼續執行，這個設定檔中的所有應用程式和資料都將遭到刪除。"</string>
     <string name="user_profile_confirm_remove_message" msgid="7373754145959298522">"所有應用程式和資料都會遭到刪除。"</string>
@@ -2558,12 +2554,12 @@
     <string name="nfc_payment_use_default" msgid="3234730182120288495">"使用預設應用程式"</string>
     <string name="nfc_payment_favor_default" msgid="5743781166099608372">"一律採用"</string>
     <string name="nfc_payment_favor_open" msgid="1923314062109977944">"但其他付款應用程式開啟時除外"</string>
-    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"選取付款應用程式，透過感應付款終端機付款："</string>
+    <string name="nfc_payment_pay_with" msgid="7524904024378144072">"透過感應付款終端機付款時使用以下應用程式："</string>
     <string name="nfc_how_it_works_title" msgid="1984068457698797207">"在終端機付款"</string>
     <string name="nfc_how_it_works_content" msgid="4749007806393224934">"設定付款應用程式，然後將手機背面靠近感應任何標有免碰觸符號的終端機即可。"</string>
     <string name="nfc_how_it_works_got_it" msgid="259653300203217402">"知道了"</string>
     <string name="nfc_more_title" msgid="815910943655133280">"更多…"</string>
-    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設為您的偏好設定？"</string>
+    <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設為你的偏好設定？"</string>
     <string name="nfc_payment_set_default" msgid="8532426406310833489">"要一律採用「<xliff:g id="APP">%1$s</xliff:g>」進行感應付款嗎？"</string>
     <string name="nfc_payment_set_default_instead_of" msgid="6993301165940432743">"要一律採用「<xliff:g id="APP_0">%1$s</xliff:g>」(而非「<xliff:g id="APP_1">%2$s</xliff:g>」) 進行感應付款嗎？"</string>
     <string name="restriction_settings_title" msgid="4233515503765879736">"限制"</string>
@@ -2582,7 +2578,7 @@
     <string name="amber_alerts_summary" msgid="4312984614037904489">"接收兒童擄拐案件相關公告"</string>
     <string name="repeat_title" msgid="6473587828597786996">"重複播放"</string>
     <string name="call_manager_enable_title" msgid="7718226115535784017">"啟用通話管理工具"</string>
-    <string name="call_manager_enable_summary" msgid="8458447798019519240">"允許這項服務管理您的通話方式。"</string>
+    <string name="call_manager_enable_summary" msgid="8458447798019519240">"允許這項服務管理你的通話方式。"</string>
     <string name="call_manager_title" msgid="4479949569744516457">"通話管理工具"</string>
     <!-- no translation found for call_manager_summary (5918261959486952674) -->
     <skip />
@@ -2598,8 +2594,8 @@
     <string name="user_rename" msgid="8523499513614655279">"重新命名"</string>
     <string name="app_restrictions_custom_label" msgid="6160672982086584261">"設定應用程式限制"</string>
     <string name="user_restrictions_controlled_by" msgid="3164078767438313899">"受到「<xliff:g id="APP">%1$s</xliff:g>」控制"</string>
-    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"這個應用程式可存取您的帳戶"</string>
-    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"這個應用程式可以存取您帳戶 (受到 <xliff:g id="APP">%1$s</xliff:g> 控制)。"</string>
+    <string name="app_sees_restricted_accounts" msgid="7503264525057246240">"這個應用程式可存取你的帳戶"</string>
+    <string name="app_sees_restricted_accounts_and_controlled_by" msgid="6968697624437267294">"這個應用程式可以存取你帳戶 (受到 <xliff:g id="APP">%1$s</xliff:g> 控制)。"</string>
     <string name="restriction_wifi_config_title" msgid="8889556384136994814">"Wi‑Fi 與行動網路"</string>
     <string name="restriction_wifi_config_summary" msgid="70888791513065244">"允許修改 Wi‑Fi 與行動網路設定"</string>
     <string name="restriction_bluetooth_config_title" msgid="8871681580962503671">"藍牙"</string>
@@ -2609,7 +2605,7 @@
     <string name="restriction_nfc_enable_summary" product="tablet" msgid="3891097373396149915">"允許平板電腦與其他裝置接觸時交換資料"</string>
     <string name="restriction_nfc_enable_summary" product="default" msgid="825331120501418592">"允許手機與其他裝置接觸時交換資料"</string>
     <string name="restriction_location_enable_title" msgid="5020268888245775164">"位置"</string>
-    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"允許應用程式使用您的位置資訊"</string>
+    <string name="restriction_location_enable_summary" msgid="3489765572281788755">"允許應用程式使用你的位置資訊"</string>
     <string name="wizard_back" msgid="5567007959434765743">"返回"</string>
     <string name="wizard_next" msgid="3606212602795100640">"下一步"</string>
     <string name="wizard_finish" msgid="3286109692700083252">"完成"</string>
@@ -2647,7 +2643,7 @@
     <string name="sim_other_call_settings" msgid="8247802316114482477">"其他通話設定"</string>
     <string name="preferred_network_offload_title" msgid="1605829724169550275">"首選網路卸載"</string>
     <string name="preferred_network_offload_header" msgid="2321173571529106767">"停用網路名稱廣播"</string>
-    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"停用網路名稱廣播以防第三方取得您的網路資訊。"</string>
+    <string name="preferred_network_offload_footer" msgid="5857279426054744020">"停用網路名稱廣播以防第三方取得你的網路資訊。"</string>
     <string name="preferred_network_offload_popup" msgid="2252915199889604600">"停用網路名稱廣播將無法自動連線到隱藏的網路。"</string>
     <string name="sim_signal_strength" msgid="9144010043784767984">"<xliff:g id="DBM">%1$d</xliff:g> dBm <xliff:g id="ASU">%2$d</xliff:g> asu"</string>
     <string name="sim_notification_title" msgid="6272913297433198340">"SIM 卡已變更。"</string>
@@ -2735,6 +2731,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"預設通知音效"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"應用程式提供的音效"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"預設通知音效"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"預設鬧鐘音效"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"來電時同時震動"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
@@ -2788,14 +2786,15 @@
     <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
     <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏機密通知內容"</string>
     <string name="lock_screen_notifications_summary_disable" msgid="859628910427886715">"完全不顯示通知"</string>
-    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"當裝置鎖定時，您要如何顯示通知？"</string>
+    <string name="lock_screen_notifications_interstitial_message" msgid="6164532459432182244">"當裝置鎖定時，你要如何顯示通知？"</string>
     <string name="lock_screen_notifications_interstitial_title" msgid="1416589393106326972">"通知"</string>
     <string name="lock_screen_notifications_summary_show_profile" msgid="835870815661120772">"顯示所有 Work 通知內容"</string>
     <string name="lock_screen_notifications_summary_hide_profile" msgid="256116258285695645">"隱藏敏感的 Work 通知內容"</string>
     <string name="lock_screen_notifications_summary_disable_profile" msgid="4080720698960233358">"一律不顯示 Work 通知"</string>
-    <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"當裝置鎖定時，您要如何顯示個人資料通知？"</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="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_blocked" msgid="7938180808339386300">"一律不顯示通知"</string>
@@ -2803,10 +2802,10 @@
     <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_min_summary" msgid="8233873580287975662">"低：不發出音效或顯示通知"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"中：不發出音效"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"高：發出音效"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"緊急：發出音效並在畫面上彈出通知"</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="6585849855452076626">"開啟音效"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"不要發出音效、震動，也不要在目前畫面上短暫顯示這類通知。"</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"通知小幫手"</string>
@@ -2818,14 +2817,14 @@
     </plurals>
     <string name="no_notification_listeners" msgid="3487091564454192821">"最近沒有已安裝的應用程式要求「通知」存取權。"</string>
     <string name="notification_listener_security_warning_title" msgid="5522924135145843279">"要允許 <xliff:g id="SERVICE">%1$s</xliff:g> 的通知存取權嗎？"</string>
-    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」將能讀取所有通知，包括聯絡人姓名以及您收到的訊息文字等個人資訊，而且還能關閉通知或觸發通知當中的動作按鈕。\n\n此外，該應用程式將能關閉或開啟「零打擾」模式，以及變更相關設定。"</string>
-    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"如果您停用「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」的通知存取權，「零打擾」模式的存取權可能也會一併遭到停用。"</string>
+    <string name="notification_listener_security_warning_summary" msgid="119203147791040151">"「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」將能讀取所有通知，包括聯絡人姓名以及你收到的訊息文字等個人資訊，而且還能關閉通知或觸發通知當中的動作按鈕。\n\n此外，該應用程式將能關閉或開啟「零打擾」模式，以及變更相關設定。"</string>
+    <string name="notification_listener_disable_warning_summary" msgid="6738915379642948000">"如果你停用「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」的通知存取權，「零打擾」模式的存取權可能也會一併遭到停用。"</string>
     <string name="notification_listener_disable_warning_confirm" msgid="8333442186428083057">"關閉"</string>
     <string name="notification_listener_disable_warning_cancel" msgid="8586417377104211584">"取消"</string>
     <string name="vr_listeners_title" msgid="1318901577754715777">"VR 小幫手服務"</string>
     <string name="no_vr_listeners" msgid="2689382881717507390">"沒有任何已安裝的應用程式要求透過 VR 小幫手服務來執行。"</string>
     <string name="vr_listener_security_warning_title" msgid="8309673749124927122">"要允許 <xliff:g id="SERVICE">%1$s</xliff:g> 存取 VR 服務嗎？"</string>
-    <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"您必須透過虛擬實境模式使用應用程式，才能執行「<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>」。"</string>
+    <string name="vr_listener_security_warning_summary" msgid="6931541068825094653">"你必須透過虛擬實境模式使用應用程式，才能執行「<xliff:g id="VR_LISTENER_NAME">%1$s</xliff:g>」。"</string>
     <string name="display_vr_pref_title" msgid="8104485269504335481">"當裝置處於 VR 模式時"</string>
     <string name="display_vr_pref_low_persistence" msgid="5707494209944718537">"減少模糊 (建議)"</string>
     <string name="display_vr_pref_off" msgid="2190091757123260989">"減少閃爍"</string>
@@ -2840,6 +2839,8 @@
     <string name="manage_zen_access_title" msgid="2611116122628520522">"零打擾存取權"</string>
     <string name="zen_access_empty_text" msgid="8772967285742259540">"最近沒有已安裝的應用程式要求「零打擾」存取權"</string>
     <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"Android 已設定封鎖，不讓這個應用程式的通知顯示在這個裝置上"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"Android 已設定封鎖，不讓這個類別的通知顯示在這個裝置上"</string>
     <string name="notification_channels" msgid="5346841743182627500">"類別"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"其他"</string>
     <string name="no_channels" msgid="3077375508177744586">"這個應用程式未發佈任何通知"</string>
@@ -2953,12 +2954,12 @@
     <string name="zen_mode_screen_off_visual_interruptions" msgid="4850792880144382633">"螢幕關閉時"</string>
     <string name="zen_mode_no_visual_interruptions" msgid="8742776003822778472">"螢幕開啟或關閉時"</string>
     <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <string name="device_feedback" msgid="3238056036766293294">"傳送您對這個裝置的意見回饋"</string>
+    <string name="device_feedback" msgid="3238056036766293294">"傳送你對這個裝置的意見回饋"</string>
     <string name="restr_pin_enter_admin_pin" msgid="1085834515677448072">"輸入管理員 PIN 碼"</string>
     <string name="switch_on_text" msgid="1124106706920572386">"開啟"</string>
     <string name="switch_off_text" msgid="1139356348100829659">"關閉"</string>
     <string name="screen_pinning_title" msgid="2292573232264116542">"螢幕固定"</string>
-    <string name="screen_pinning_description" msgid="3360904523688769289">"這項設定開啟時，您可以使用螢幕固定功能讓目前的畫面保持顯示狀態，直到取消固定為止。\n\n如何使用螢幕固定功能：\n\n1. 確實開啟螢幕固定功能。\n\n2. 開啟您要固定的畫面。\n\n3. 輕觸「總覽」按鈕。\n\n4. 向上滑動，然後輕觸圖釘圖示。"</string>
+    <string name="screen_pinning_description" msgid="3360904523688769289">"這項設定開啟時，你可以使用螢幕固定功能讓目前的畫面保持顯示狀態，直到取消固定為止。\n\n如何使用螢幕固定功能：\n\n1. 確實開啟螢幕固定功能。\n\n2. 開啟你要固定的畫面。\n\n3. 輕觸「總覽」按鈕。\n\n4. 向上滑動，然後輕觸圖釘圖示。"</string>
     <string name="screen_pinning_unlock_pattern" msgid="8282268570060313339">"取消固定時必須畫出解鎖圖案"</string>
     <string name="screen_pinning_unlock_pin" msgid="8757588350454795286">"取消固定時必須輸入 PIN 碼"</string>
     <string name="screen_pinning_unlock_password" msgid="2514079566873826434">"取消固定時必須輸入密碼"</string>
@@ -2973,25 +2974,21 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"保持目前方向"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"安全啟動"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"繼續"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"如果要進一步保護裝置，您可以將裝置設為需要輸入 PIN 才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。"</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"如果要進一步保護裝置，您可以將裝置設為需要畫出解鎖圖案才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。"</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"如果要進一步保護裝置，您可以將裝置設為需要輸入密碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。"</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"除了啟用裝置的指紋解鎖功能，您還可以設定裝置在啟動前要求使用者輸入 PIN 碼，為裝置增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，萬一裝置遺失或遭竊，裝置上的資料仍會受到保護。"</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"除了啟用裝置的指紋解鎖功能，您還可以設定裝置在啟動前要求使用者輸入解鎖圖案，為裝置增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，萬一裝置遺失或遭竊，裝置上的資料仍會受到保護。"</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"除了啟用裝置的指紋解鎖功能，您還可以設定裝置在啟動前要求使用者輸入密碼，為裝置增添多一道防護。裝置必須成功啟動才能接聽電話及接收訊息或通知 (包括鬧鐘)。\n\n這樣一來，萬一裝置遺失或遭竊，裝置上的資料仍會受到保護。"</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"需要輸入 PIN 碼才能啟動裝置"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"需要畫出解鎖圖案才能啟動裝置"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"需要輸入密碼才能啟動裝置"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"不用了，謝謝"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"不用了，謝謝"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"不用了，謝謝"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"如要進一步保護裝置，你可以將裝置設為需要輸入 PIN 碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入 PIN 碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"如要進一步保護裝置，你可以將裝置設為需要畫出解鎖圖案才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要畫出解鎖圖案才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"如要進一步保護裝置，你可以將裝置設為需要輸入密碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"除了使用指紋來解鎖裝置之外，你也可以將裝置設為需要輸入 PIN 碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)，進一步保護裝置。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入 PIN 碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"除了使用指紋來解鎖裝置之外，你也可以將裝置設為需要畫出解鎖圖案才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)，進一步保護裝置。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要畫出解鎖圖案才能啟動嗎？"</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"除了使用指紋解鎖裝置之外，你也可以將裝置設為需要輸入密碼才能啟動，等裝置啟動後方可接收來電、訊息或通知 (包括警告)，進一步保護裝置。\n\n這樣一來，即使裝置遺失或遭竊，其中的資料仍安全無虞。要將裝置設為需要輸入密碼才能啟動嗎？"</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"是"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"否"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"需要輸入 PIN？"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"需要畫出解鎖圖案？"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"需要輸入密碼？"</string>
-    <string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"輸入您的 PIN 啟動裝置後，您將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
-    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"畫出解鎖圖案啟動裝置後，您將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
-    <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="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"輸入你的 PIN 啟動裝置後，你將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
+    <string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"畫出解鎖圖案啟動裝置後，你將無法使用 <xliff:g id="SERVICE">%1$s</xliff:g> 等各項協助工具服務。"</string>
+    <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>
     <string name="slot_number" msgid="3762676044904653577">"(插槽 <xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>
@@ -3067,9 +3064,9 @@
     <string name="fingerprint_not_recognized" msgid="1739529686957438119">"無法識別"</string>
     <string name="default_apps_title" msgid="1660450272764331490">"預設"</string>
     <string name="default_for_work" msgid="9152194239366247932">"Work 預設值"</string>
-    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"小幫手與語音輸入"</string>
+    <string name="assist_and_voice_input_title" msgid="1733165754793221197">"小幫手和語音輸入"</string>
     <string name="default_assist_title" msgid="8868488975409247921">"小幫手應用程式"</string>
-    <string name="assistant_security_warning_title" msgid="8673079231955467177">"要將「<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>」設為您的小幫手嗎？"</string>
+    <string name="assistant_security_warning_title" msgid="8673079231955467177">"要將「<xliff:g id="ASSISTANT_APP_NAME">%s</xliff:g>」設為你的小幫手嗎？"</string>
     <string name="assistant_security_warning" msgid="8498726261327239136">"小幫手將可讀取系統目前使用中的應用程式相關資訊，包括裝置畫面上顯示的資訊及應用程式內提供存取的資訊。"</string>
     <string name="assistant_security_warning_agree" msgid="7710290206928033908">"同意"</string>
     <string name="assistant_security_warning_disagree" msgid="877419950830205913">"不同意"</string>
@@ -3084,7 +3081,7 @@
     <string name="usage_access" msgid="5479504953931038165">"使用紀錄存取權"</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="usage_access_description" msgid="1352111094596416795">"具有使用紀錄存取權的應用程式可以追蹤你使用的其他應用程式與頻率，以及你的電信業者、語言設定和其他詳細資料。"</string>
     <string name="memory_settings_title" msgid="7490541005204254222">"記憶體"</string>
     <string name="memory_details_title" msgid="8542565326053693320">"記憶體詳細資料"</string>
     <string name="always_running" msgid="6042448320077429656">"一律執行 (<xliff:g id="PERCENTAGE">%s</xliff:g>)"</string>
@@ -3097,7 +3094,7 @@
     <string name="memory_use_running_format" msgid="4172488041800743760">"<xliff:g id="MEMORY">%1$s</xliff:g>/<xliff:g id="RUNNING">%2$s</xliff:g>"</string>
     <string name="process_format" msgid="77905604092541454">"<xliff:g id="APP_NAME">%1$s</xliff:g> (<xliff:g id="COUNT">%2$d</xliff:g>)"</string>
     <string name="high_power_apps" msgid="3459065925679828230">"電池效能最佳化"</string>
-    <string name="additional_battery_info" msgid="4754099329165411970">"用量警示"</string>
+    <string name="additional_battery_info" msgid="4754099329165411970">"電池用量警示"</string>
     <string name="show_all_apps" msgid="1742726460081356745">"顯示所有應用程式"</string>
     <string name="hide_extra_apps" msgid="5568177134273528751">"隱藏其他應用程式"</string>
     <string name="high_power_filter_on" msgid="3222265297576680099">"未套用最佳化設定"</string>
@@ -3115,9 +3112,9 @@
     <string name="additional_permissions" msgid="6463784193877056080">"其他權限"</string>
     <string name="additional_permissions_more" msgid="3538612272673191451">"還有 <xliff:g id="COUNT">%1$d</xliff:g> 項"</string>
     <string name="share_remote_bugreport_dialog_title" msgid="1124840737776588602">"要分享錯誤報告嗎？"</string>
-    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"您的 IT 管理員要求您提供錯誤報告，以便排解這個裝置發生的問題。報告可能會揭露裝置中的應用程式和相關資料。"</string>
-    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"您的 IT 管理員要求您提供錯誤報告，以便排解這個裝置發生的問題。報告可能會揭露裝置中的應用程式和相關資料，裝置運行速度也可能會因此暫時減慢。"</string>
-    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"正在與您的 IT 管理員分享這份錯誤報告。如要瞭解詳情，請與對方聯絡。"</string>
+    <string name="share_remote_bugreport_dialog_message_finished" msgid="4973886976504823801">"你的 IT 管理員要求你提供錯誤報告，以便排解這個裝置發生的問題。報告可能會揭露裝置中的應用程式和相關資料。"</string>
+    <string name="share_remote_bugreport_dialog_message" msgid="3495929560689435496">"你的 IT 管理員要求你提供錯誤報告，以便排解這個裝置發生的問題。報告可能會揭露裝置中的應用程式和相關資料，裝置運行速度也可能會因此暫時減慢。"</string>
+    <string name="sharing_remote_bugreport_dialog_message" msgid="5859287696666024466">"正在與你的 IT 管理員分享這份錯誤報告。如要瞭解詳情，請與對方聯絡。"</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>
@@ -3145,7 +3142,7 @@
     <string name="assist_access_screenshot_summary" msgid="6761636689013259901">"允許小幫手應用程式存取畫面擷圖"</string>
     <string name="assist_flash_title" msgid="506661221230034891">"閃爍螢幕"</string>
     <string name="assist_flash_summary" msgid="9160668468824099262">"小幫手應用程式存取螢幕或螢幕擷取畫面中的文字時，螢幕邊緣會閃爍"</string>
-    <string name="assist_footer" msgid="1982791172085896864">"小幫手應用程式可根據您目前瀏覽的畫面資訊，為您提供協助。部分應用程式同時支援啟動器和語音輸入服務，為您提供更完善的服務。"</string>
+    <string name="assist_footer" msgid="1982791172085896864">"小幫手應用程式可根據你目前瀏覽的畫面資訊，為你提供協助。部分應用程式同時支援啟動器和語音輸入服務，為你提供更完善的服務。"</string>
     <string name="average_memory_use" msgid="829566450150198512">"記憶體平均用量"</string>
     <string name="maximum_memory_use" msgid="7493720799710132496">"記憶體最高用量"</string>
     <string name="memory_usage" msgid="1781358557214390033">"記憶體用量"</string>
@@ -3208,9 +3205,9 @@
     <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_trusted" msgid="6857780460845250885">"是"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"否"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"允許安裝應用程式"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"允許"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"不允許"</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>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"按兩下電源按鈕即可開啟相機"</string>
@@ -3277,11 +3274,11 @@
     <string name="condition_battery_title" msgid="3272131008388575349">"節約耗電量模式已開啟"</string>
     <string name="condition_battery_summary" msgid="4418839236027977450">"已降低執行效能，並停用定位服務和背景資料功能。"</string>
     <string name="condition_cellular_title" msgid="1327317003797575735">"行動數據已關閉"</string>
-    <string name="condition_cellular_summary" msgid="1818046558419658463">"您必須連上 Wi-Fi 才能使用網際網路"</string>
+    <string name="condition_cellular_summary" msgid="1818046558419658463">"你必須連上 Wi-Fi 才能使用網際網路"</string>
     <string name="condition_bg_data_title" msgid="2483860304802846542">"數據節省模式已開啟"</string>
-    <string name="condition_bg_data_summary" msgid="656957852895282228">"您必須連上 Wi-Fi 才能使用背景資料功能。如果無法連上 Wi-Fi，部分應用程式或服務可能會受到影響。"</string>
+    <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="condition_work_summary" msgid="7543202177571590378">"應用程式、背景同步處理以及其他與你的 Work 設定檔相關的功能已停用。"</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>
@@ -3393,17 +3390,18 @@
     <string name="developer_density_summary" msgid="1998244213021456519">"<xliff:g id="ID_1">%d</xliff:g> dp"</string>
     <string name="developer_smallest_width" msgid="7516950434587313360">"最小寬度"</string>
     <string name="premium_sms_none" msgid="8268105565738040566">"沒有任何已安裝的應用程式要求「付費簡訊」存取權"</string>
-    <string name="premium_sms_warning" msgid="9086859595338944882">"「付費簡訊」需要額外計費，相關費用會併入您的電信費帳單。如果您為某個應用程式啟用權限，即可利用該應用程式傳送付費簡訊。"</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_connected_summary" msgid="8733997010923307915">"已連線至"</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">"我們隨時可為您提供服務"</string>
-    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"我們隨時為您提供服務"</string>
-    <string name="support_escalation_summary" msgid="8473084168776014405">"我們的支援小組會協助您解決任何問題"</string>
-    <string name="support_escalation_24_7_summary" msgid="2802773279262547187">"我們的支援小組全年無休，隨時為您提供服務"</string>
+    <string name="support_escalation_title" msgid="4111071371281023145">"我們很樂意為你提供協助"</string>
+    <string name="support_escalation_24_7_title" msgid="8118369197749832074">"我們隨時可為你提供服務"</string>
+    <string name="support_escalation_24_7_content_description" msgid="3772776213036994533">"我們隨時為你提供服務"</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>
     <string name="support_escalation_no_internet_summary" msgid="2526082812336597989">"電話支援服務時間 (當地時間)&lt;br&gt;&lt;b&gt;<xliff:g id="OPERATION_HOURS">%s</xliff:g>&lt;/b&gt;"</string>
     <string name="support_escalation_unavailable_summary" msgid="5208552975245211898">"搜尋相關說明，或是探索實用提示及秘訣"</string>
@@ -3426,7 +3424,7 @@
     <string name="support_system_information_title" msgid="3439905790018934773">"系統資訊"</string>
     <string name="managed_profile_settings_title" msgid="2729481936758125054">"Work 設定檔設定"</string>
     <string name="managed_profile_contact_search_title" msgid="6034734926815544221">"聯絡人搜尋"</string>
-    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許您的機構搜尋聯絡人，以便識別來電者和聯絡人的身分"</string>
+    <string name="managed_profile_contact_search_summary" msgid="5431253552272970512">"允許你的機構搜尋聯絡人，以便識別來電者和聯絡人的身分"</string>
     <plurals name="hours" formatted="false" msgid="7020844602875333472">
       <item quantity="other"><xliff:g id="NUMBER">%s</xliff:g> 小時</item>
       <item quantity="one">1 小時</item>
@@ -3483,7 +3481,7 @@
     <string name="gesture_setting_off" msgid="5230169535435881894">"關閉"</string>
     <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked" msgid="4265541229765635629">"開機載入器已解除鎖定"</string>
     <string name="oem_unlock_enable_disabled_summary_connectivity" msgid="415954951226204461">"請先連上網際網路"</string>
-    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"請連上網際網路或與您的電信業者聯絡"</string>
+    <string name="oem_unlock_enable_disabled_summary_connectivity_or_locked" msgid="5884723935668892613">"請連上網際網路或與你的電信業者聯絡"</string>
     <string name="oem_unlock_enable_disabled_summary_sim_locked_device" msgid="4149387448213399630">"綁定特定電信業者服務的裝置無法使用"</string>
     <string name="automatic_storage_manager_freed_bytes" msgid="7517560170441007788">"總共釋出 <xliff:g id="SIZE">%1$s</xliff:g>\n\n上次執行日期：<xliff:g id="DATE">%2$s</xliff:g>"</string>
     <string name="web_action_enable_title" msgid="4051513950976670853">"免安裝應用程式"</string>
@@ -3575,7 +3573,7 @@
     <string name="storage_settings_2" product="tablet" msgid="1939009096334525216">"平板電腦儲存空間"</string>
     <string name="storage_settings_2" product="default" msgid="4306047711760327031">"手機儲存空間"</string>
     <string name="storage_size_large_alternate" msgid="3550744227788333060">"<xliff:g id="NUMBER">^1</xliff:g>"<small>" <xliff:g id="UNIT">^2</xliff:g>"</small>""</string>
-    <string name="storage_volume_total" msgid="3499221850532701342">"使用量：<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
+    <string name="storage_volume_total" msgid="3499221850532701342">"總儲存空間：<xliff:g id="TOTAL">%1$s</xliff:g>"</string>
     <string name="storage_percent_full" msgid="6095012055875077036">"已使用"</string>
     <string name="clear_instant_app_data" msgid="2004222610585890909">"清除應用程式"</string>
     <string name="clear_instant_app_confirmation" msgid="7451671214898856857">"要移除這個免安裝應用程式嗎？"</string>
@@ -3585,7 +3583,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(已為使用者<xliff:g id="USER">%s</xliff:g>停用)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"自動填入服務"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"自動, 填入, 自動填入"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"要將「<xliff:g id="APP_NAME_0">%1$s</xliff:g>」設為自動填入應用程式嗎？這麼做將允許「<xliff:g id="APP_NAME_1">%1$s</xliff:g>」讀取你的畫面內容，並在其他應用程式中填入欄位。"</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;請確定這是你信任的應用程式&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt;應用程式會根據你的畫面內容判斷要自動填入的內容。"</string>
     <string name="device_theme" msgid="4571803018917608588">"裝置主題"</string>
     <string name="default_theme" msgid="7085644992078579076">"預設"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"儲存空間管理員：<xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 801098f..1e2e285 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -34,7 +34,7 @@
     <item msgid="8881760709354815449">"30 amasekhondi"</item>
     <item msgid="7589406073232279088">"1 iminithi"</item>
     <item msgid="7001195990902244174">"2 amaminithi"</item>
-    <item msgid="7489864775127957179">"5 amaminithii"</item>
+    <item msgid="7489864775127957179">"5 amaminithi"</item>
     <item msgid="2314124409517439288">"10 amaminithi"</item>
     <item msgid="6864027152847611413">"30 amaminithi"</item>
   </string-array>
@@ -134,7 +134,7 @@
   </string-array>
   <string-array name="bluetooth_visibility_timeout_entries">
     <item msgid="8151962652413645395">"2 amaminithi"</item>
-    <item msgid="8675215713017289017">"5 amaminithii"</item>
+    <item msgid="8675215713017289017">"5 amaminithi"</item>
     <item msgid="477015974247590543">"1 ihora"</item>
     <item msgid="5198271470953124739">"Ayiphelelwa isikhathi"</item>
   </string-array>
@@ -175,12 +175,14 @@
     <item msgid="937786527870979616">"I-MSCHAPV2"</item>
     <item msgid="5302613883318643629">"I-GTC"</item>
   </string-array>
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:0 (5760470455461128892) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:1 (7480272092408291086) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:2 (5881794903338319324) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:3 (5610607665198791980) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:4 (2860798636241124128) -->
-    <!-- no translation found for wifi_peap_phase2_entries_with_sim_auth:5 (8926455723452645935) -->
+  <string-array name="wifi_peap_phase2_entries_with_sim_auth">
+    <item msgid="5760470455461128892">"Lutho"</item>
+    <item msgid="7480272092408291086">"MSCHAPV2"</item>
+    <item msgid="5881794903338319324">"GTC"</item>
+    <item msgid="5610607665198791980">"SIM"</item>
+    <item msgid="2860798636241124128">"AKA"</item>
+    <item msgid="8926455723452645935">"AKA\'"</item>
+  </string-array>
   <string-array name="wifi_phase2_entries">
     <item msgid="1818786254010764570">"Lutho"</item>
     <item msgid="6189918678874123056">"I-PAP"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9978f7b..cb8e7b9 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -329,20 +329,19 @@
     <string name="Accounts_settings_title" msgid="1643879107901699406">"Ama-akhawunti"</string>
     <string name="location_settings_title" msgid="1369675479310751735">"Indawo"</string>
     <string name="account_settings_title" msgid="626177544686329806">"Ama-akhawunti"</string>
-    <!-- no translation found for security_settings_title (6134528367364159294) -->
-    <skip />
+    <string name="security_settings_title" msgid="6134528367364159294">"Ukuphepha nendawo"</string>
     <string name="encryption_and_credential_settings_title" msgid="6514904533438791561">"Ukubethela nokuqinisekisa"</string>
-    <string name="encryption_and_credential_settings_summary" msgid="8721883002237981248">"Ifoni ibethelwe"</string>
+    <string name="encryption_and_credential_settings_summary" product="default" msgid="8721883002237981248">"Ifoni ibethelwe"</string>
+    <!-- no translation found for encryption_and_credential_settings_summary (7200428573872395685) -->
+    <skip />
     <string name="lockscreen_settings_title" msgid="3922976395527087455">"Izinketho zokukhiya isikrini"</string>
     <string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</string>
     <string name="security_passwords_title" msgid="2881269890053568809">"Ubumfihlo"</string>
     <string name="disabled_by_administrator_summary" msgid="1601828700318996341">"Kukhutshazwe umlawuli"</string>
     <string name="security_status_title" msgid="5848766673665944640">"Isimo sokuphepha"</string>
-    <!-- no translation found for security_dashboard_summary (6757421634477554939) -->
-    <skip />
-    <!-- no translation found for security_dashboard_summary_no_fingerprint (8129641548372335540) -->
-    <skip />
+    <string name="security_dashboard_summary" msgid="6757421634477554939">"Ukukhiywa kwesikrini, isigxivizo somunwe"</string>
+    <string name="security_dashboard_summary_no_fingerprint" msgid="8129641548372335540">"Isikrini sivaliwe"</string>
     <string name="security_settings_fingerprint_preference_title" msgid="2488725232406204350">"Izigxivizo zeminwe"</string>
     <string name="fingerprint_manage_category_title" msgid="8293801041700001681">"Phatha izigxivizo zeminwe"</string>
     <string name="fingerprint_usage_category_title" msgid="8438526918999536619">"Sebenzisa izigxivizo zeminwe ukuthi"</string>
@@ -414,7 +413,7 @@
     <string name="crypt_keeper_desc" product="default" msgid="2579929266645543631">"Ungabethela ama-akhawunti wakho, izilungiselelo, izinhlelo zokusebenza ezilandiwe nedatha yakhona, imidiya, namanye amafayela. Ngemva kokubethela ifoni yakho, ngokucabangela ukuthi usethe ukukhiya kwesikrini (okungukuthi, iphethini noma iphinikhodi yenombolo noma iphasiwedi), uzodinga ukuvula isikrini ukuze ususe ukubethela ifoni ngaso sonke isikhathi uma uyivula. Enye indlela kuphela ukwenza ukusetha kabusha idatha kwefekthri, ukususa yonke idatha yakho.\n\nUkubethela kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhethri elishajiwe futhi ugcine ifoni yakho ixhunyiwe kuyo yonke inqubo. Uma uyiphazamisa, uzolahlekelwa ngenye noma yonke idatha yakho."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Bethela ifoni"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Sicela ushaje ibhetri yakho bese uzama futhi."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Sicela ushaje ibhethri yakho bese uzama futhi."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Sicela uxhume ishaja yakho bese uzama futhi."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Ayikho i-PIN yokuvala isikrini noma iphasiwedi"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="4071395977297369642">"Udinga ukusetha i-PIN yokukhiya isikrini noma iphasiwedi ngaphambi kokuqala ukubhala ngakhodi."</string>
@@ -446,7 +445,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">"Nogkuvikela okungeziwe, setha isikrini sokukhiya."</string>
+    <string name="setup_lock_settings_picker_fingerprint_message" msgid="5585650064305600578">"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>
@@ -692,6 +691,7 @@
     <string name="wifi_notify_open_networks_summary" msgid="2761326999921366960">"Yazisa uma inethiwekhi yompahakthi enekhwalithi ephezulu itholakala"</string>
     <string name="wifi_wakeup" msgid="8815640989361538036">"Vula i-Wi‑Fi ngokuzenzakalelayo"</string>
     <string name="wifi_wakeup_summary" msgid="2530814331062997163">"I-Wi‑Fi izovuleka eceleni kwamanethiwekhi alondolozwe ngekhwalithi ephezulu, njengenethiwekhi yakho yasekhaya"</string>
+    <string name="wifi_wakeup_summary_scanning_disabled" msgid="7247227922074840445">"Akutholakali ngoba ukuskena kwe-Wi‑Fi kuvaliwe"</string>
     <string name="wifi_poor_network_detection" msgid="4925789238170207169">"Gwema uxhumo olubi"</string>
     <string name="wifi_poor_network_detection_summary" msgid="2784135142239546291">"Ungasebenzisi inethiwekhi ye-Wi-Fi ngaphandle kokuthi inoxhumano lwe-intanethi olukahle."</string>
     <string name="wifi_avoid_poor_network_detection_summary" msgid="4674423884870027498">"Sebenzisa kuphela amanethwekhi anoxhumo oluhle lwe-inthanethi"</string>
@@ -813,11 +813,9 @@
     <string name="wifi_configure_titlebar" msgid="7977475161589303074">"Lungiselela i-Wi‑Fi"</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>
-    <!-- no translation found for wifi_details_subnet_mask (6720279144174924410) -->
-    <skip />
+    <string name="wifi_details_subnet_mask" msgid="6720279144174924410">"Imaski ye-subnet"</string>
     <string name="wifi_details_dns" msgid="8648826607751830768">"I-DNS"</string>
-    <!-- no translation found for wifi_details_ipv6_address_header (6734119149106422148) -->
-    <skip />
+    <string name="wifi_details_ipv6_address_header" msgid="6734119149106422148">"Amakheli e-IPv6"</string>
     <string name="wifi_saved_access_points_label" msgid="2013409399392285262">"Amanethiwekhi alondoloziwe"</string>
     <string name="wifi_advanced_settings_label" msgid="3654366894867838338">"Izilungiselelo ze-IP"</string>
     <string name="wifi_advanced_not_available" msgid="5823045095444154586">"Izilungiselelo ezithuthukisiwe ze-Wi‑Fi azitholakaleli lo msebenzisi"</string>
@@ -1017,13 +1015,12 @@
     <string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Valiwe"</string>
     <string name="screensaver_settings_disabled_prompt" msgid="1239088321034437608">"Ukuze ulawule ukuthi kwenzakale ini uma ifoni idokhiwe kanye/noma ilele, vula isilondolozi sikrini."</string>
     <string name="screensaver_settings_when_to_dream" msgid="7262410541382890146">"Iqala nini"</string>
-    <!-- no translation found for screensaver_settings_current (4663846038247130023) -->
-    <skip />
+    <string name="screensaver_settings_current" msgid="4663846038247130023">"Isithombe-skrini samanje"</string>
     <string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Qala manje"</string>
     <string name="screensaver_settings_button" msgid="7292214707625717013">"Izilungiselelo"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
     <string name="lift_to_wake_title" msgid="4555378006856277635">"Ilifti yokuvuka"</string>
-    <string name="doze_title" msgid="5389406335828323273">"Isikrini sesaziso esingenayo"</string>
+    <string name="doze_title" msgid="2259176504273878294">"Isibonisi esi-Ambient"</string>
     <string name="doze_summary" msgid="3846219936142814032">"Vusa isikrini uma uthola izaziso"</string>
     <string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
     <string name="short_summary_font_size" msgid="6819778801232989076">"Yenza umbhalo ube mkhulu noma ube mncane"</string>
@@ -1081,7 +1078,7 @@
     <string name="device_info_not_available" msgid="8062521887156825182">"Akutholakali"</string>
     <string name="device_status_activity_title" msgid="1411201799384697904">"Isimo"</string>
     <string name="device_status" msgid="607405385799807324">"Isimo"</string>
-    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Isimo sebhetri, inethiwekhi, nolunye ulwazi"</string>
+    <string name="device_status_summary" product="tablet" msgid="3292717754497039686">"Isimo sebhethri, inethiwekhi, nolunye ulwazi"</string>
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"Inombolo yefoni, isiginali, nokunye."</string>
     <string name="storage_settings" msgid="4211799979832404953">"Isitoreji"</string>
     <string name="storage_usb_settings" msgid="7293054033137078060">"Ukugcina"</string>
@@ -1236,8 +1233,8 @@
     <string name="storage_wizard_move_progress_body" msgid="7802577486578105609">"Ungasusi i-<xliff:g id="NAME">^1</xliff:g> ngesikhathi sokuhambisa. \n\nUhlelo lokusebenza lwe-<xliff:g id="APP">^2</xliff:g> kule divayisi ngeke luze lutholakale kuze kuqedwe ukuhambisa."</string>
     <string name="storage_wizard_move_progress_cancel" msgid="542047237524588792">"Khansela ukuhambisa"</string>
     <string name="storage_wizard_slow_body" msgid="8010127667184768025">"Le-<xliff:g id="NAME_0">^1</xliff:g> ibonakala ihamba kancane. \n\nUngaqhubeka, kodwa izinhlelo zokusebenza ezihanjiswe kule ndawo zingangingiza futhi ukudluliselwa kwedatha kungathatha isikhathi eside. \n\nCabanga ukusebenzisa i-<xliff:g id="NAME_1">^1</xliff:g> esheshayo ukuze uthole ukusebenza okungcono."</string>
-    <string name="battery_status_title" msgid="9159414319574976203">"Umumo webhetri"</string>
-    <string name="battery_level_title" msgid="2965679202786873272">"Izinga lebhetri"</string>
+    <string name="battery_status_title" msgid="9159414319574976203">"Umumo webhethri"</string>
+    <string name="battery_level_title" msgid="2965679202786873272">"Izinga lebhethri"</string>
     <string name="apn_settings" msgid="3743170484827528406">"APNs"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Hlela indawo yokungena"</string>
     <!-- unknown quoting pattern: original -1, translation 1 -->
@@ -1368,15 +1365,15 @@
     <string name="managed_profile_location_switch_title" msgid="6712332547063039683">"Indawo yephrofayela yokusebenza"</string>
     <string name="location_mode_title" msgid="3982009713118421689">"Imodi"</string>
     <string name="location_mode_high_accuracy_title" msgid="8241802585110932849">"Ukunemba okuphezulu"</string>
-    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ukulondolozwa kwebhetri"</string>
+    <string name="location_mode_battery_saving_title" msgid="711273645208158637">"Ukulondolozwa kwebhethri"</string>
     <string name="location_mode_sensors_only_title" msgid="3040366132175435160">"Idivayisi kuphela"</string>
     <string name="location_mode_location_off_title" msgid="2829713015012529465">"Indawo ivaliwe"</string>
     <string name="location_app_level_permissions" msgid="1825588230817081339">"Izimvume zeleveli yohlelo lokusebenza"</string>
     <string name="location_category_recent_location_requests" msgid="1938721350424447421">"Izicelo zendawo zakamuva"</string>
     <string name="location_no_recent_apps" msgid="2800907699722178041">"Azikho izinhlelo zokusebenza ezicele indawo kamuva nje"</string>
     <string name="location_category_location_services" msgid="7437150886946685979">"Amasevisi wendawo"</string>
-    <string name="location_high_battery_use" msgid="517199943258508020">"Ukusebenzisa ibhetri okuphezulu"</string>
-    <string name="location_low_battery_use" msgid="8602232529541903596">"Ukusebenzisa ibhetri okuphansi"</string>
+    <string name="location_high_battery_use" msgid="517199943258508020">"Ukusebenzisa ibhethri okuphezulu"</string>
+    <string name="location_low_battery_use" msgid="8602232529541903596">"Ukusebenzisa ibhethri okuphansi"</string>
     <string name="location_mode_screen_title" msgid="4528716772270246542">"Imodi yendawo"</string>
     <string name="location_mode_high_accuracy_description" msgid="3453010562265338113">"Sebenzisa i-GPS, i-Wi-Fi, i-Bluetooth, noma amanethiwekhi eselula ukuze unqume indawo"</string>
     <string name="location_mode_battery_saving_description" msgid="2365298246603348985">"Sebenzisa i-Wi-Fi, i-Bluetooth, noma amanethiwekhi eselula ukuze unqume indawo"</string>
@@ -1601,7 +1598,7 @@
     <string name="system_package" msgid="1352722848400644991">"Izibuyekezo zesistimu azikwazi ukufakwa kwimidiya yangaphandle"</string>
     <string name="move_error_device_admin" msgid="8673026002690505763">"Uhlelo lokusebenza lomlawuli wedivayisi alikwazi ukufakwa kumidiya yangaphandle"</string>
     <string name="force_stop_dlg_title" msgid="977530651470711366">"Phoqelela ukumisa"</string>
-    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Uma uphoqa ukumisa uhlelo lokusebena, kungenzeka ukuthi lungasebenzi."</string>
+    <string name="force_stop_dlg_text" msgid="7208364204467835578">"Uma uphoqa ukumisa uhlelo lokusebenza, kungenzeka ukuthi lungasebenzi."</string>
     <string name="move_app_failed_dlg_title" msgid="1282561064082384192"></string>
     <string name="move_app_failed_dlg_text" msgid="187885379493011720">"Yehlulekile ukuhambisa uhlelo lokusebenza. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Indawo yokufaka ekhethwayo"</string>
@@ -1616,6 +1613,7 @@
     <string name="app_install_details_group_title" msgid="7084623031296083574">"Isitolo"</string>
     <string name="app_install_details_title" msgid="6905279702654975207">"Imininingwane yohlelo lokusebenza"</string>
     <string name="app_install_details_summary" msgid="6464796332049327547">"Uhlelo lokusebenza lufakiwe kusuka ku-<xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
+    <string name="instant_app_details_summary" msgid="4529934403276907045">"Ulwazi oluningi ku-<xliff:g id="APP_STORE">%1$s</xliff:g>"</string>
     <string name="app_ops_settings" msgid="5108481883575527511">"Imisebenzi yohlelo lokusebenza"</string>
     <string name="app_ops_running" msgid="7706949900637284122">"Sebenzayo"</string>
     <string name="app_ops_never_used" msgid="9114608022906887802">"(Ayikaze yasetshenziswa)"</string>
@@ -1692,7 +1690,6 @@
     <string name="keyboard_shortcuts_helper" msgid="4839453720463798145">"Isilekeleli sezinqamuleli zekhibhodi"</string>
     <string name="keyboard_shortcuts_helper_summary" msgid="5871299901459743288">"Bonisa izinqamuleli ezitholakalayo"</string>
     <string name="default_keyboard_layout" msgid="4172606673510531271">"Okuzenzakalelayo"</string>
-    <string name="pointer_settings_category" msgid="8183819795164034286">"Igunane/isiqeshana sokuhambisa iminwe"</string>
     <string name="pointer_speed" msgid="1221342330217861616">"Ijubane lesikhombi"</string>
     <string name="game_controller_settings_category" msgid="8794508575329923718">"Isilawuli somdlalo"</string>
     <string name="vibrate_input_devices" msgid="2599591466928793082">"Sebenzisa ukudlidliza"</string>
@@ -1902,8 +1899,8 @@
     <string name="print_search_box_shown_utterance" msgid="7730361832020726951">"Ibhokisi lokuhlola libonisiwe"</string>
     <string name="print_search_box_hidden_utterance" msgid="7980832833405818400">"Ibhokisi lokusesha lifihliwe"</string>
     <string name="printer_info_desc" msgid="5824995108703060003">"Olunye ulwazi mayelana nale phrinta"</string>
-    <string name="power_usage_summary_title" msgid="7190304207330319919">"Ibhetri"</string>
-    <string name="power_usage_summary" msgid="7237084831082848168">"Yini ekade isebenzisa ibhetri"</string>
+    <string name="power_usage_summary_title" msgid="7190304207330319919">"Ibhethri"</string>
+    <string name="power_usage_summary" msgid="7237084831082848168">"Yini ekade isebenzisa ibhethri"</string>
     <string name="power_usage_not_available" msgid="3109326074656512387">"Idatha esebenzisa ibhethri ayitholakali."</string>
     <string name="power_usage_level_and_status" msgid="7449847570973811784">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATUS">%2$s</xliff:g>"</string>
     <string name="power_discharge_remaining" msgid="4925678997049911808">"<xliff:g id="REMAIN">%1$s</xliff:g> osele"</string>
@@ -1916,13 +1913,13 @@
     <string name="device_screen_usage" msgid="3386088035570409683">"Ukusebenzisa kwesikrini kusuka ekushajeni okuphelele"</string>
     <string name="device_screen_consumption" msgid="4607589286438986687">"Ukusetshenziswa kwesikrini"</string>
     <string name="device_cellular_network" msgid="4724773411762382950">"Ukuskena kwenethiwekhi yeselula"</string>
-    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">%1$s</xliff:g> okwedlule"</string>
-    <string name="power_usage_list_summary" msgid="6775339745194635000">"Ukusebenza kohlelo lokusebenza kusuka ekushajeni okuphelele (<xliff:g id="TIME">%1$s</xliff:g> okwedlule)"</string>
+    <string name="power_last_full_charge_summary" msgid="532845389094620657">"<xliff:g id="TIME">^1</xliff:g> okwedlule"</string>
+    <string name="power_usage_list_summary" msgid="6775339745194635000">"Ukusebenza kohlelo lokusebenza kusuka ekushajeni okuphelele (<xliff:g id="TIME">^1</xliff:g> okwedlule)"</string>
     <string name="screen_usage_summary" msgid="6687403051423153550">"Inani lesikhathi isikrini sivuliwe kusuka ekushijeni okuphelele"</string>
     <string name="device_usage_list_summary" msgid="5623036661468763251">"Ukusebenza kwedivayisi kusuka ekushajeni okuphelele"</string>
-    <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhetri kusukela inqamuliwe"</string>
-    <string name="battery_since_reset" msgid="7464546661121187045">"Ukusebenzisa ibhetri kusukela ekuhleleni futhi"</string>
-    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> kwibhetri"</string>
+    <string name="battery_since_unplugged" msgid="338073389740738437">"Ukusebenzisa ibhethri kusukela inqamuliwe"</string>
+    <string name="battery_since_reset" msgid="7464546661121187045">"Ukusebenzisa ibhethri kusukela ekuhleleni futhi"</string>
+    <string name="battery_stats_on_battery" msgid="4970762168505236033">"<xliff:g id="TIME">%1$s</xliff:g> kwibhethri"</string>
     <string name="battery_stats_duration" msgid="7464501326709469282">"<xliff:g id="TIME">%1$s</xliff:g> kusukela kungaxhunyiwe"</string>
     <string name="battery_stats_charging_label" msgid="4223311142875178785">"Iyashaja"</string>
     <string name="battery_stats_screen_on_label" msgid="7150221809877509708">"Isikrini sivuliwe"</string>
@@ -1948,7 +1945,7 @@
     <string name="power_camera" msgid="4976286950934622605">"Ikhamera"</string>
     <string name="power_wifi" msgid="1135085252964054957">"I-Wi-Fi"</string>
     <string name="power_bluetooth" msgid="4373329044379008289">"I-Bluetooth"</string>
-    <string name="power_cell" msgid="6596471490976003056">"Iseli elindile"</string>
+    <string name="power_cell" msgid="3392999761958982492">"Ukulinda kwenethiwekhi yeselula"</string>
     <string name="power_phone" msgid="5392641106474567277">"Amakholi ezwi"</string>
     <string name="power_idle" product="tablet" msgid="4612478572401640759">"Ithebhulethi ayenzi lutho"</string>
     <string name="power_idle" product="default" msgid="9055659695602194990">"Ifoni ayenzi lutho"</string>
@@ -1985,30 +1982,30 @@
     <string name="battery_action_display" msgid="7338551244519110831">"Izilungiselelo zeskrini"</string>
     <string name="battery_action_wifi" msgid="8181553479021841207">"Izilungiselelo ze-Wi-Fi"</string>
     <string name="battery_action_bluetooth" msgid="8374789049507723142">"Izilungiselelo ze-Bluetooth"</string>
-    <string name="battery_desc_voice" msgid="8980322055722959211">"Ibhetri esebenziswe amakholi wezwi"</string>
-    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Ibhetri esebenziswe lapho ithebhulethi ingenzi lutho"</string>
-    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Ibhetri esebenziswe lapho ifoni ingenzi lutho"</string>
-    <string name="battery_desc_radio" msgid="5479196477223185367">"Ibhetri esetshenziswe umsakazo weseli"</string>
+    <string name="battery_desc_voice" msgid="8980322055722959211">"Ibhethri esebenziswe amakholi wezwi"</string>
+    <string name="battery_desc_standby" product="tablet" msgid="6284747418668280364">"Ibhethri esebenziswe lapho ithebhulethi ingenzi lutho"</string>
+    <string name="battery_desc_standby" product="default" msgid="3009080001948091424">"Ibhethri esebenziswe lapho ifoni ingenzi lutho"</string>
+    <string name="battery_desc_radio" msgid="5479196477223185367">"Ibhethri esetshenziswe umsakazo weseli"</string>
     <string name="battery_sugg_radio" msgid="8211336978326295047">"Shintshela kwimodi yendiza ukulondoloza amandla ezindaweni ezingenayo inethiwekhi yeseli."</string>
     <string name="battery_desc_flashlight" msgid="2908579430841025494">"Ibhethri elisetshenziswa i-flashlight"</string>
     <string name="battery_desc_camera" msgid="7375389919760613499">"Ibhethri elisetshenziswe yikhamera"</string>
-    <string name="battery_desc_display" msgid="5432795282958076557">"Ibhetri isebenziswa ukubukeka nokukhanya kwasemuva"</string>
+    <string name="battery_desc_display" msgid="5432795282958076557">"Ibhethri isebenziswa ukubukeka nokukhanya kwasemuva"</string>
     <string name="battery_sugg_display" msgid="3370202402045141760">"Yehlisa ukukhanya kwesikrini futhi/noma ukuphela kwesikhathi sesikrini"</string>
     <string name="battery_desc_wifi" msgid="2375567464707394131">"Ibhethri elisetshenziswe i-Wi-Fi"</string>
     <string name="battery_sugg_wifi" msgid="7776093125855397043">"Vala i-Wi-Fi uma ungayisebenzisi noma uma ingatholakali"</string>
-    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Ibhetri isebenziswe i-bluetooth"</string>
+    <string name="battery_desc_bluetooth" msgid="8069070756186680367">"Ibhethri isebenziswe i-bluetooth"</string>
     <string name="battery_sugg_bluetooth_basic" msgid="4565141162650835009">"Vula i-bluetooth lapho ungayisebenzisi"</string>
     <string name="battery_sugg_bluetooth_headset" msgid="4071352514714259230">"Zama ukuxhuma kwidivaysi ye-Bluetooth ehlukile"</string>
-    <string name="battery_desc_apps" msgid="8530418792605735226">"Ibhetri esetshenziswe uhlelo lokusebenza"</string>
+    <string name="battery_desc_apps" msgid="8530418792605735226">"Ibhethri esetshenziswe uhlelo lokusebenza"</string>
     <string name="battery_sugg_apps_info" msgid="6907588126789841231">"Misa noma khipha uhlelo"</string>
     <string name="battery_sugg_apps_gps" msgid="5959067516281866135">"Khetha imodi yokulondoloza ibhethri"</string>
-    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uhlelo lokusebenza lunganikeza izilungiselelo ukwehlisa ukusebenzisa ibhetri"</string>
+    <string name="battery_sugg_apps_settings" msgid="3974902365643634514">"Uhlelo lokusebenza lunganikeza izilungiselelo ukwehlisa ukusebenzisa ibhethri"</string>
     <string name="battery_desc_users" msgid="7682989161885027823">"Ibhethri elisetshenziswe umsebenzisi"</string>
     <string name="battery_desc_unaccounted" msgid="7404256448541818019">"Ukusetshenziwa kwamandla we-Miscellaneous"</string>
     <string name="battery_msg_unaccounted" msgid="1963583522633067961">"Ukusetshenziswa kwebhethri ukulinganiselwa kokusetshensiwa kwamandla futhi akufaki phakathi wonke umthombo webhethri ophelile. I-Miscellaneous umehluko phakathi kwamandla alinganiswe ngekhompyutha nokuphela okubonwayo kubhethri."</string>
     <string name="battery_desc_overcounted" msgid="5481865509489228603">"Ukusetshenziswa kwamandla okubalwe ngaphezulu"</string>
     <string name="mah" msgid="95245196971239711">"<xliff:g id="NUMBER">%d</xliff:g> mAh"</string>
-    <string name="battery_used_for" msgid="4383512863007718804">"Kusetshenziselwe okungu-%1$s"</string>
+    <string name="battery_used_for" msgid="2690821851327075443">"Kusetshenziswe nge-<xliff:g id="TIME">^1</xliff:g>"</string>
     <string name="battery_used_by" msgid="1135316757755282999">"<xliff:g id="PERCENT">%1$s</xliff:g> kusetshenziswe yi-<xliff:g id="APP">%2$s</xliff:g>"</string>
     <string name="battery_overall_usage" msgid="2093409063297375436">"<xliff:g id="PERCENT">%1$s</xliff:g> kwalo lonke ibhethri"</string>
     <string name="battery_detail_since_full_charge" msgid="7515347842046955855">"Ukwaphuka kusuka ekushajeni okuphelele"</string>
@@ -2080,7 +2077,6 @@
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Okufakwayo ngezwi; nezilungiselelo zokukhishwayo"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Ukusesha ngezwi"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Ikhibhodi ye-Android"</string>
-    <string name="voice_category" msgid="1430370497125803904">"Inkulumo"</string>
     <string name="voice_input_settings" msgid="1099937800539324567">"Izungiselelo zokuthayipha ngezwi"</string>
     <string name="voice_input_settings_title" msgid="2676028028084981891">"Ukuthayipha ngezwi"</string>
     <string name="voice_service_preference_section_title" msgid="3778706644257601021">"Amasevisi wokuthayipha ngezwi"</string>
@@ -2233,7 +2229,7 @@
     <string name="background_data" msgid="5779592891375473817">"Idatha yasemuva"</string>
     <string name="background_data_summary" msgid="8328521479872763452">"Izinhlelo zokusebenza zingavumelanisa, zithumele, futhi zithole imininingo nganoma isiphi isikhathi"</string>
     <string name="background_data_dialog_title" msgid="6059217698124786537">"Yekisa ukusebenza kwimininingo yemininingo egciniwe?"</string>
-    <string name="background_data_dialog_message" msgid="6981661606680941633">"Ukuvimbela idatha yasemuva kwandisa ukuphila kwebhetri futhi kwehlisa ukusebenzisa idatha. Ezinye izinhlelo zokusebenza zingase zisebenzise idatha yasemuva."</string>
+    <string name="background_data_dialog_message" msgid="6981661606680941633">"Ukuvimbela idatha yasemuva kwandisa ukuphila kwebhethri futhi kwehlisa ukusebenzisa idatha. Ezinye izinhlelo zokusebenza zingase zisebenzise idatha yasemuva."</string>
     <string name="sync_automatically" msgid="1682730255435062059">"I-data yonkwenza kuvumelaniseke ngokuzenzakalelayo"</string>
     <string name="sync_enabled" msgid="4551148952179416813">"Ukuvumelanisa KUVULIWE"</string>
     <string name="sync_disabled" msgid="8511659877596511991">"Ukuvumelanisa KUVALIWE"</string>
@@ -2732,6 +2728,8 @@
     <string name="notification_volume_option_title" msgid="6064656124416882130">"Ivolumu yesaziso"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
     <string name="notification_ringtone_title" msgid="4468722874617061231">"Umsindo wesaziso ozenzakalelayo"</string>
+    <string name="notification_unknown_sound_title" msgid="2535027767851838335">"Uhlelo lokusebenza lunikezele ngomsindo"</string>
+    <string name="notification_sound_default" msgid="565135733949733766">"Umsindo wesaziso ozenzakalelayo"</string>
     <string name="alarm_ringtone_title" msgid="6344025478514311386">"Umsindo we-alamu ozenzakalelayo"</string>
     <string name="vibrate_when_ringing_title" msgid="3806079144545849032">"Iyadlidliza uma kungena amakholi"</string>
     <string name="other_sound_settings" msgid="3151004537006844718">"Eminye imisindo"</string>
@@ -2793,6 +2791,7 @@
     <string name="lock_screen_notifications_interstitial_message_profile" msgid="8307705621027472346">"Uma idivayisi yakho ikhiyiwe, ufuna ukuthi izaziso zephrofayela zivele kanjani?"</string>
     <string name="lock_screen_notifications_interstitial_title_profile" msgid="3169806586032521333">"Izaziso zephrofayela"</string>
     <string name="app_notifications_title" msgid="139788604658984593">"Izaziso"</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_blocked" msgid="7938180808339386300">"Ungalokothi ubonise izaziso"</string>
@@ -2800,10 +2799,10 @@
     <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_min_summary" msgid="8233873580287975662">"Phansi: Awukho umsindo noma ukuphazamiseka kokubuka"</string>
-    <string name="notification_importance_low_summary" msgid="1296192045494524565">"Maphakathi: Awukho umsindo"</string>
-    <string name="notification_importance_default_summary" msgid="5730277944596984792">"Phezulu: Yenza umsindo"</string>
-    <string name="notification_importance_high_summary" msgid="3248683220940159642">"Kuyashesha: Yenza umsindo neskrini esivelayo"</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="6585849855452076626">"Vumela umsindo"</string>
     <string name="show_silently_summary" msgid="7616604629123146565">"Ungenzi umsindo, ukudlidlizela, noma ubheke lezi zaziso kusikrini samanje."</string>
     <string name="default_notification_assistant" msgid="7631945224761430146">"Umsizi wesaziso"</string>
@@ -2837,6 +2836,8 @@
     <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>
+    <string name="app_notifications_off_desc" msgid="4882445501376722969">"I-Android ivimbela izaziso zalolu hlelo lokusebenza kusukela ekuveleni kule divayisi"</string>
+    <string name="channel_notifications_off_desc" msgid="5899225298718840635">"I-Android ivimbela lesi sigaba sezaziso kusukela ekuveleni kule divayisi"</string>
     <string name="notification_channels" msgid="5346841743182627500">"Izigaba"</string>
     <string name="notification_channels_other" msgid="5645317113885788226">"Okunye"</string>
     <string name="no_channels" msgid="3077375508177744586">"Lolu hlelo lokusebenza aluzange luthumele noma iziphi izaziso"</string>
@@ -2970,18 +2971,14 @@
     <string name="display_auto_rotate_stay_in_current" msgid="317932372686498096">"Hlala kumumo wamanje"</string>
     <string name="encryption_interstitial_header" msgid="468015813904595613">"Vikela ukuqala"</string>
     <string name="encryption_continue_button" msgid="1121880322636992402">"Qhubeka"</string>
-    <string name="encryption_interstitial_message_pin" msgid="7164072567822375682">"Ungavikela ngokuthuthukile le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Ize iqale idivayisi, ayikwazi ukuthola amakholi, imilayezo, noma izaziso kufaka phakathi ama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe."</string>
-    <string name="encryption_interstitial_message_pattern" msgid="6747091924626566031">"Ungavikela ngokuthuthukile le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Ize iqale idivayisi, ayikwazi ukuthola amakholi, imilayezo, noma izaziso kufaka phakathi ama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe."</string>
-    <string name="encryption_interstitial_message_password" msgid="3462225324186045679">"Ungavikela ngokuthuthukile le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Ize iqale idivayisi, ayikwazi ukuthola amakholi, imilayezo, noma izaziso kufaka phakathi ama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe."</string>
-    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="3775537118799831558">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokucela iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukuthola amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
-    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="1105290967535237237">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokudinga iphethini yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
-    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="3512482682507378424">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi yakho iyaqala, ayikwazi ukuthola amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
-    <string name="encrypt_require_pin" msgid="2063945047845243752">"Idinga iphinikhodi ukuze iqale idivayisi"</string>
-    <string name="encrypt_require_pattern" msgid="6898479411004015810">"Idinga iphethini ukuze iqale idivayisi"</string>
-    <string name="encrypt_require_password" msgid="8770628366276570518">"Idinga iphasiwedi ukuze iqale idivayisi"</string>
-    <string name="encrypt_dont_require_pin" msgid="1082444817726247368">"Cha ngiyabonga"</string>
-    <string name="encrypt_dont_require_pattern" msgid="6668299362640433843">"Cha ngiyabonga"</string>
-    <string name="encrypt_dont_require_password" msgid="2580403214917009046">"Cha ngiyabonga"</string>
+    <string name="encryption_interstitial_message_pin" msgid="2317181134653424679">"Ungaqhubeka uvikele le divayisi ngokudinga iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukuthola amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
+    <string name="encryption_interstitial_message_pattern" msgid="7081249914068568570">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungavikela ngokuthuthukile le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
+    <string name="encryption_interstitial_message_password" msgid="7796567133897436443">"Ungavikela ngokuthuthukile le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqalise. Kuze kuqale le divayisi, ingathola amakholi, imilayezo noma izaziso, kufaka phakathi ama-alamu. \n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma atshontshiwe. Kudinga iphasiwedi ukuqala idivayisi yakho?"</string>
+    <string name="encryption_interstitial_message_pin_for_fingerprint" msgid="4550632760119547492">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokucela iphinikhodi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukuthola amakholi, imilayezo, noma izaziso ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
+    <string name="encryption_interstitial_message_pattern_for_fingerprint" msgid="932184823193006087">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokudinga iphethini yakho ngaphambi kokuthi iqale. Kuze kube idivayisi iyaqala, ayikwazi ukwamukela amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
+    <string name="encryption_interstitial_message_password_for_fingerprint" msgid="1088818752838720964">"Ngokungeziwe ekusebenziseni izigxivizo zakho zeminwe ukuze uvule idivayisi yakho, ungaqhubeka uvikele le divayisi ngokudinga iphasiwedi yakho ngaphambi kokuthi iqale. Kuze kube idivayisi yakho iyaqala, ayikwazi ukuthola amakholi, imilayezo, noma izaziso, ezifaka ama-alamu.\n\nLokhu kusiza ukuvikela idatha kumadivayisi alahlekile noma antshontshiwe."</string>
+    <string name="encryption_interstitial_yes" msgid="4439509435889513411">"Yebo"</string>
+    <string name="encryption_interstitial_no" msgid="8935031349097025137">"Cha"</string>
     <string name="encrypt_talkback_dialog_require_pin" msgid="8299960550048989807">"Idinga iphinikhodi"</string>
     <string name="encrypt_talkback_dialog_require_pattern" msgid="1499790256154146639">"Idinga iphethini?"</string>
     <string name="encrypt_talkback_dialog_require_password" msgid="8841994614218049215">"Idinga iphasiwedi?"</string>
@@ -3205,9 +3202,9 @@
     <string name="write_settings_description" msgid="6868293938839954623">"Le mvume ivumela uhlelo lokusebenza ukushintsha izilungiselelo zesistimu."</string>
     <string name="write_settings_on" msgid="8230580416068832239">"Yebo"</string>
     <string name="write_settings_off" msgid="5156104383386336233">"Cha"</string>
-    <string name="external_source_trusted" msgid="6857780460845250885">"Yebo"</string>
-    <string name="external_source_untrusted" msgid="6608922938133896956">"Cha"</string>
-    <string name="external_source_switch_title" msgid="5581865736984836418">"Vumela ukufakwa kohlelo lokusebenza"</string>
+    <string name="external_source_trusted" msgid="2707996266575928037">"Kuvumelekile"</string>
+    <string name="external_source_untrusted" msgid="2677442511837596726">"Akuvumelekile"</string>
+    <string name="external_source_switch_title" msgid="3621381992793251070">"Vumela kusukela kulo mthombo"</string>
     <string name="camera_gesture_title" msgid="1075838577642393011">"Shinthsa kabili ingalo ukuze uthole ikhamera"</string>
     <string name="camera_gesture_desc" msgid="1831390075255870960">"Vula uhlelo lokusebenza lekhamera ngokushintsha ingalo yakho kabili"</string>
     <string name="camera_double_tap_power_gesture_title" msgid="1651873760405034645">"Cindezela inkinobho yamandla kabili ukuthola ikhamera"</string>
@@ -3393,7 +3390,8 @@
     <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_connected_summary" msgid="8733997010923307915">"Ixhumekile ku-"</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>
     <string name="quick_settings_developer_tiles" msgid="5947788063262762448">"Othayela bonjiniyela bezilungiselelo ezisheshayo"</string>
     <string name="support_escalation_title" msgid="4111071371281023145">"Silapha ukuze sisize"</string>
@@ -3582,7 +3580,7 @@
     <string name="webview_disabled_for_user" msgid="1216426047631256825">"(kukhutshazelwe umsebenzisi ongu-<xliff:g id="USER">%s</xliff:g>)"</string>
     <string name="autofill_app" msgid="7338387238377914374">"Isevisi yokugcwalisa ngokuzenzakalela"</string>
     <string name="autofill_keywords" msgid="7485591824120812710">"okuzenzakalelayo, gcwalisa, ukugcwalisa okuzenzakalelayo"</string>
-    <string name="autofill_confirmation_message" msgid="7368058965765225486">"Yenza i-<xliff:g id="APP_NAME_0">%1$s</xliff:g> uhlelo lwakho lokusebenza lokugcwalisa okuzenzakalelayo? I-<xliff:g id="APP_NAME_1">%1$s</xliff:g> izokwazi ukufunda isikrini sakho iphinde igcwalise izinkambu kwezinye izinhlelo zokusebenza."</string>
+    <string name="autofill_confirmation_message" msgid="2784869528908005194">"&lt;b&gt;Qiniseka ukuthi wethemba lolu hlelo lokusebenza&lt;/b&gt; &lt;br/&gt; &lt;br/&gt; &lt;xliff:g id=app_name example=Google Autofill&gt;%1$s&lt;/xliff:g&gt; isebenzisa okusesikrinini sakho ukunquma okungagcwaliswa ngokuzenzakalela."</string>
     <string name="device_theme" msgid="4571803018917608588">"Itimu yedivayisi"</string>
     <string name="default_theme" msgid="7085644992078579076">"Okuzenzakalelayo"</string>
     <string name="storage_manager_indicator" msgid="1516810749625915020">"Umphathi wesitolo: <xliff:g id="STATUS">^1</xliff:g>"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b255123..83aefa0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -747,7 +747,9 @@
     <!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
     <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>
     <!-- Security Settings screen Encryption and crendential summary -->
-    <string name="encryption_and_credential_settings_summary">Phone encrypted</string>
+    <string name="encryption_and_credential_settings_summary" product="default">Phone encrypted</string>
+    <!-- Security Settings screen Encryption and crendential summary -->
+    <string name="encryption_and_credential_settings_summary" product="tablet">Device encrypted</string>
     <!-- Security Settings screen setting option title for the item to take you to the lock screen preference screen [CHAR LIMIT=60] -->
     <string name="lockscreen_settings_title">Lock screen preferences</string>
 
@@ -2124,6 +2126,9 @@
     <string name="sound_settings">Sound</string>
     <!-- DO NOT TRANSLATE Summary placeholder -->
     <string name="summary_placeholder" translatable="false">&#160;</string>
+    <!-- DO NOT TRANSLATE Summary placeholder reserving 2 lines -->
+    <string name="summary_two_lines_placeholder" translatable="false">&#160;\n&#160;</string>
+
     <!-- DO NOT TRANSLATE Empty summary for dynamic preferences -->
     <string name="summary_empty" translatable="false"></string>
     <!-- Sound settings screen, volume title -->
@@ -3933,8 +3938,6 @@
     <!-- Summary text for keyboards when no layout has been selected. [CHAR LIMIT=35] -->
     <string name="default_keyboard_layout">Default</string>
 
-    <!-- On Languages & input settings screen, heading. Inside the "Languages & input settings" screen, this is the header for settings that relate to mouse and trackpad devices. [CHAR LIMIT=40] -->
-    <string name="pointer_settings_category">Mouse/trackpad</string>
     <!-- On Languages & input settings screen, setting summary.  Setting for mouse pointer speed. [CHAR LIMIT=35] -->
     <string name="pointer_speed">Pointer speed</string>
 
@@ -4304,6 +4307,11 @@
          can't verify user consent. [CHAR LIMIT=NONE] -->
     <string name="touch_filtered_warning">Because an app is obscuring a permission request, Settings
         can’t verify your response.</string>
+    <!-- Warning shown when user input has been blocked due to another app overlaying screen
+         content. Since we don't know what the app is showing on top of the input target, we
+         can't verify user consent. [CHAR LIMIT=NONE] -->
+    <string name="window_obscured_warning">Because another app is displaying on top of these options,
+        Settings can\u2019t respond to your action.</string>
     <!-- Warning that the device data will not be encrypted with password or PIN if
         enabling an accessibility service and there is a secure lock setup. [CHAR LIMIT=NONE] -->
     <string name="enable_service_encryption_warning">If you turn on <xliff:g id="service"
@@ -4845,8 +4853,6 @@
     <string name="voice_search_settings_title">Voice search</string>
     <!-- Title of keyboard settings list item within voice input/output settings -->
     <string name="keyboard_settings_title">Android keyboard</string>
-    <!-- Title for the 'voice input' category of voice input/output settings -->
-    <string name="voice_category">Speech</string>
 
     <!-- Voice input settings --><skip />
     <!-- [CHAR_LIMIT=NONE] Name of the settings item to open the voice input settings. -->
@@ -6558,7 +6564,10 @@
     <!-- Notification Settings: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
     <string name="app_notifications_title">Notifications</string>
 
-    <!-- [CHAR LIMIT=100] Notification importance slider title -->
+    <!-- [CHAR LIMIT=100] Notification channel title -->
+    <string name="notification_channel_title">Notification category</string>
+
+    <!-- [CHAR LIMIT=100] Notification importance screen title -->
     <string name="notification_importance_title">Importance</string>
 
     <!-- [CHAR LIMIT=100] Notification Importance: unspecified importance level description -->
@@ -6579,17 +6588,17 @@
     <!-- [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 summary: min importance level description -->
-    <string name="notification_importance_min_summary">Low: No sound or visual interruption</string>
+    <!-- [CHAR LIMIT=100] Notification Importance title: min importance level title -->
+    <string name="notification_importance_min_title">Low</string>
 
-    <!-- [CHAR LIMIT=100] Notification Importance summary: low importance level description -->
-    <string name="notification_importance_low_summary">Medium: No sound</string>
+    <!-- [CHAR LIMIT=100] Notification Importance title: low importance level title -->
+    <string name="notification_importance_low_title">Medium</string>
 
-    <!-- [CHAR LIMIT=100] Notification Importance summary: normal importance level description -->
-    <string name="notification_importance_default_summary">High: Make sound</string>
+    <!-- [CHAR LIMIT=100] Notification Importance title: normal importance level title -->
+    <string name="notification_importance_default_title">High</string>
 
-    <!-- [CHAR LIMIT=100] Notification Importance summary: high importance level description -->
-    <string name="notification_importance_high_summary">Urgent: Make sound and pop on screen</string>
+    <!-- [CHAR LIMIT=100] Notification Importance title: high importance level title -->
+    <string name="notification_importance_high_title">Urgent</string>
 
     <!-- [CHAR LIMIT=40] Notification importance title -->
     <string name="allow_sound">Allow Sound</string>
@@ -6603,6 +6612,10 @@
     <!-- Sound & notification > Advanced section: Title for managing notification listeners option. [CHAR LIMIT=30] -->
     <string name="manage_notification_access_title">Notification access</string>
 
+    <!-- Notification Access section: Indicates that the work profile admin doesn't allow this
+         notification listener to access work profile notifications [CHAR LIMIT=100] -->
+    <string name="work_profile_notification_access_blocked_summary">Access to work profile notifications is blocked</string>
+
     <!-- Summary of preference to manage notification listeners, when none are enabled -->
     <string name="manage_notification_access_summary_zero">Apps cannot read notifications</string>
 
@@ -6694,6 +6707,12 @@
     <!-- [CHAR LIMIT=NONE] Text when loading app list in notification settings -->
     <string name="loading_notification_apps">Loading apps...</string>
 
+    <!-- [CHAR LIMIT=NONE] Text appearing when app notifications are off -->
+    <string name="app_notifications_off_desc">Android is blocking this app\'s notifications from appearing on this device</string>
+
+    <!-- [CHAR LIMIT=NONE] Text appearing when channel notifications are off -->
+    <string name="channel_notifications_off_desc">Android is blocking this category of notifications from appearing on this device</string>
+
     <!-- [CHAR LIMIT=NONE] App notification settings: channels title -->
     <string name="notification_channels">Categories</string>
 
diff --git a/res/xml/app_and_notification.xml b/res/xml/app_and_notification.xml
index 627d3f8..639735d 100644
--- a/res/xml/app_and_notification.xml
+++ b/res/xml/app_and_notification.xml
@@ -25,17 +25,28 @@
         android:title="@string/app_permissions"
         android:order="-130"
         settings:keywords="@string/keywords_app_permissions">
-        <intent android:action="android.intent.action.MANAGE_PERMISSIONS"/>
+        <intent android:action="android.intent.action.MANAGE_PERMISSIONS" />
     </Preference>
 
     <PreferenceCategory
         android:key="dashboard_tile_placeholder"
-        android:order="10"/>
+        android:order="10" />
+
+    <com.android.settingslib.RestrictedPreference
+        android:key="app_and_notif_cell_broadcast_settings"
+        android:title="@string/cell_broadcast_settings"
+        android:order="15"
+        settings:useAdminDisabledSummary="true">
+        <intent
+            android:action="android.intent.action.MAIN"
+            android:targetPackage="com.android.cellbroadcastreceiver"
+            android:targetClass="com.android.cellbroadcastreceiver.CellBroadcastSettings" />
+    </com.android.settingslib.RestrictedPreference>
 
     <Preference
         android:key="special_access"
         android:fragment="com.android.settings.applications.SpecialAccessSettings"
         android:title="@string/special_access"
-        android:order="20"/>
+        android:order="20" />
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/app_data_usage.xml b/res/xml/app_data_usage.xml
index 520b93b..26a339a 100644
--- a/res/xml/app_data_usage.xml
+++ b/res/xml/app_data_usage.xml
@@ -15,48 +15,51 @@
 -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/data_usage_summary_title">
+                  android:title="@string/data_usage_summary_title">
 
     <com.android.settings.datausage.SpinnerPreference
         android:key="cycle" />
 
-    <com.android.settings.applications.SpacePreference
-        android:layout_height="8dp" />
+    <PreferenceCategory
+        android:key="app_data_usage_summary_category">
 
-    <Preference
-        android:key="total_usage"
-        android:title="@string/total_size_label"
-        android:selectable="false"
-        android:layout="@layout/horizontal_preference" />
+        <Preference
+            android:key="total_usage"
+            android:title="@string/total_size_label"
+            android:selectable="false"
+            android:layout="@layout/horizontal_preference" />
 
-    <Preference
-        android:key="foreground_usage"
-        android:title="@string/data_usage_label_foreground"
-        android:selectable="false"
-        android:layout="@layout/horizontal_preference" />
+        <Preference
+            android:key="foreground_usage"
+            android:title="@string/data_usage_label_foreground"
+            android:selectable="false"
+            android:layout="@layout/horizontal_preference" />
 
-    <Preference
-        android:key="background_usage"
-        android:title="@string/data_usage_label_background"
-        android:selectable="false"
-        android:layout="@layout/horizontal_preference" />
+        <Preference
+            android:key="background_usage"
+            android:title="@string/data_usage_label_background"
+            android:selectable="false"
+            android:layout="@layout/horizontal_preference" />
 
-    <com.android.settings.applications.SpacePreference
-        android:layout_height="8dp" />
+    </PreferenceCategory>
 
-    <Preference
-        android:key="app_settings"
-        android:title="@string/data_usage_app_settings" />
+    <PreferenceCategory
+        android:key="app_data_usage_settings_category">
+        <Preference
+            android:key="app_settings"
+            android:title="@string/data_usage_app_settings" />
 
-    <SwitchPreference
-        android:key="restrict_background"
-        android:title="@string/data_usage_app_restrict_background"
-        android:summary="@string/data_usage_app_restrict_background_summary" />
+        <SwitchPreference
+            android:key="restrict_background"
+            android:title="@string/data_usage_app_restrict_background"
+            android:summary="@string/data_usage_app_restrict_background_summary" />
 
-    <SwitchPreference
-        android:key="unrestricted_data_saver"
-        android:title="@string/unrestricted_app_title"
-        android:summary="@string/unrestricted_app_summary" />
+        <SwitchPreference
+            android:key="unrestricted_data_saver"
+            android:title="@string/unrestricted_app_title"
+            android:summary="@string/unrestricted_app_summary" />
+
+    </PreferenceCategory>
 
     <PreferenceCategory
         android:key="app_list"
diff --git a/res/xml/app_list_disclosure_settings.xml b/res/xml/app_list_disclosure_settings.xml
new file mode 100644
index 0000000..2aae95e
--- /dev/null
+++ b/res/xml/app_list_disclosure_settings.xml
@@ -0,0 +1,27 @@
+<?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"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  android:key="app_list_disclosure_settings">
+    <PreferenceCategory
+            android:key="dashboard_tile_placeholder"/>
+
+    <com.android.settings.widget.FooterPreference
+            android:title="@string/enterprise_privacy_apps_count_estimation_info"
+            android:selectable="false"/>
+</PreferenceScreen>
diff --git a/res/xml/app_notification_settings.xml b/res/xml/app_notification_settings.xml
index ef8a45c..bfb91ef 100644
--- a/res/xml/app_notification_settings.xml
+++ b/res/xml/app_notification_settings.xml
@@ -18,13 +18,6 @@
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
         android:title="@string/app_notifications_title"
         android:key="app_notification_settings">
-    <!-- Block -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="block"
-        android:title="@string/app_notification_block_title"
-        android:summary="@string/app_notification_block_summary"
-        settings:useAdditionalSummary="true"
-        settings:restrictedSwitchSummary="@string/enabled_by_admin" />
 
     <!-- Show badge -->
     <com.android.settingslib.RestrictedSwitchPreference
diff --git a/res/xml/channel_notification_settings.xml b/res/xml/channel_notification_settings.xml
index ccaa724..7e5045a 100644
--- a/res/xml/channel_notification_settings.xml
+++ b/res/xml/channel_notification_settings.xml
@@ -18,16 +18,7 @@
         xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" >
 
     <!-- Importance -->
-    <!-- Block -->
-    <com.android.settingslib.RestrictedSwitchPreference
-        android:key="block"
-        android:title="@string/app_notification_block_title"
-        android:summary="@string/app_notification_block_summary"
-        settings:useAdditionalSummary="true"
-        settings:restrictedSwitchSummary="@string/enabled_by_admin" />
-
-    <!-- Importance -->
-    <com.android.settings.notification.RestrictedDropDownPreference
+    <Preference
         android:key="importance"
         android:title="@string/notification_importance_title" />
 
diff --git a/res/xml/data_saver.xml b/res/xml/data_saver.xml
index 0244030..76715bb 100644
--- a/res/xml/data_saver.xml
+++ b/res/xml/data_saver.xml
@@ -20,6 +20,7 @@
     <Preference
         android:key="unrestricted_access"
         android:title="@string/unrestricted_data_saver"
+        android:summary="@string/summary_two_lines_placeholder"
         android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
 
 </PreferenceScreen>
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index bec8863..0089ed7 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -138,7 +138,7 @@
             android:title="@string/wait_for_debugger"
             android:summary="@string/wait_for_debugger_summary"/>
 
-        <SwitchPreference
+        <com.android.settingslib.RestrictedSwitchPreference
             android:key="verify_apps_over_usb"
             android:title="@string/verify_apps_over_usb_title"
             android:summary="@string/verify_apps_over_usb_summary"/>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index 9d4acb4..7f740f3 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -53,13 +53,13 @@
     <com.android.settings.TimeoutListPreference
         android:key="screen_timeout"
         android:title="@string/screen_timeout"
-        android:summary="@string/screen_timeout_summary"
+        android:summary="@string/summary_placeholder"
         android:entries="@array/screen_timeout_entries"
         android:entryValues="@array/screen_timeout_values" />
 
     <DropDownPreference
         android:key="auto_rotate"
-        android:summary="%s"
+        android:summary="@string/summary_placeholder"
         android:title="@string/display_auto_rotate_title" />
 
     <Preference
@@ -119,7 +119,7 @@
     <ListPreference
         android:key="theme"
         android:title="@string/device_theme"
-        android:summary="%s" />
+        android:summary="@string/summary_placeholder" />
 
     <Preference
         android:key="vr_display_pref"
diff --git a/res/xml/enterprise_privacy_settings.xml b/res/xml/enterprise_privacy_settings.xml
index c2b77b5..45c784e 100644
--- a/res/xml/enterprise_privacy_settings.xml
+++ b/res/xml/enterprise_privacy_settings.xml
@@ -16,8 +16,8 @@
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
                   xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
-        android:key="enterprise_privacy_settings"
-        android:title="@string/enterprise_privacy_settings">
+                  android:key="enterprise_privacy_settings"
+                  android:title="@string/enterprise_privacy_settings">
 
     <!-- Header -->
     <Preference
@@ -25,67 +25,68 @@
             android:summary="@string/enterprise_privacy_header"
             android:selectable="false"/>
 
-    <PreferenceCategory android:title="@string/enterprise_privacy_exposure_category">
-        <com.android.settings.DividerPreference
-                android:layout_height="wrap_content"
-                android:title="@string/enterprise_privacy_enterprise_data"/>
-        <com.android.settings.DividerPreference
-                android:title="@string/enterprise_privacy_installed_packages"/>
-        <com.android.settings.DividerPreference
-                android:title="@string/enterprise_privacy_usage_stats"/>
-        <com.android.settings.DividerPreference
-                android:key="network_logs"
-                android:title="@string/enterprise_privacy_network_logs"/>
-        <com.android.settings.DividerPreference
-                android:key="bug_reports"
-                android:title="@string/enterprise_privacy_bug_reports"/>
-        <com.android.settings.DividerPreference
-                android:key="security_logs"
-                android:title="@string/enterprise_privacy_security_logs"/>
+    <PreferenceCategory android:title="@string/enterprise_privacy_exposure_category"
+                        android:contentDescription="@string/enterprise_privacy_exposure_category">
+        <Preference android:layout_height="wrap_content"
+                    android:title="@string/enterprise_privacy_enterprise_data"
+                    android:selectable="false"/>
+        <Preference android:title="@string/enterprise_privacy_installed_packages"
+                    android:selectable="false"/>
+        <Preference android:title="@string/enterprise_privacy_usage_stats"
+                    android:selectable="false"/>
+        <Preference android:key="network_logs"
+                    android:title="@string/enterprise_privacy_network_logs"
+                    android:selectable="false"/>
+        <Preference android:key="bug_reports"
+                    android:title="@string/enterprise_privacy_bug_reports"
+                    android:selectable="false"/>
+        <Preference android:key="security_logs"
+                    android:title="@string/enterprise_privacy_security_logs"
+                    android:selectable="false"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/enterprise_privacy_exposure_changes_category">
-        <com.android.settings.DividerPreference
-                android:key="number_enterprise_installed_packages"
-                android:title="@string/enterprise_privacy_enterprise_installed_packages"/>
-        <com.android.settings.DividerPreference
-                android:key="enterprise_privacy_number_location_access_packages"
-                android:title="@string/enterprise_privacy_location_access"/>
-        <com.android.settings.DividerPreference
-                android:key="enterprise_privacy_number_microphone_access_packages"
-                android:title="@string/enterprise_privacy_microphone_access"/>
-        <com.android.settings.DividerPreference
-                android:key="enterprise_privacy_number_camera_access_packages"
-                android:title="@string/enterprise_privacy_camera_access"/>
-        <com.android.settings.DividerPreference
-                android:key="number_enterprise_set_default_apps"
-                android:title="@string/enterprise_privacy_enterprise_set_default_apps"/>
-        <com.android.settings.DividerPreference
-                android:key="always_on_vpn_primary_user"/>
-        <com.android.settings.DividerPreference
-                android:key="always_on_vpn_managed_profile"
-                android:title="@string/enterprise_privacy_always_on_vpn_work"/>
-        <com.android.settings.DividerPreference
-                android:key="input_method"
-                android:title="@string/enterprise_privacy_input_method"/>
-        <com.android.settings.DividerPreference
-                android:key="global_http_proxy"
-                android:title="@string/enterprise_privacy_global_http_proxy"/>
-        <com.android.settings.DividerPreference
-                android:key="ca_certs"
-                android:title="@string/enterprise_privacy_ca_certs"/>
+        <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages"
+                    android:key="number_enterprise_installed_packages"
+                    android:title="@string/enterprise_privacy_enterprise_installed_packages"/>
+        <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation"
+                    android:key="enterprise_privacy_number_location_access_packages"
+                    android:title="@string/enterprise_privacy_location_access"/>
+        <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone"
+                    android:key="enterprise_privacy_number_microphone_access_packages"
+                    android:title="@string/enterprise_privacy_microphone_access"/>
+        <Preference android:fragment="com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera"
+                    android:key="enterprise_privacy_number_camera_access_packages"
+                    android:title="@string/enterprise_privacy_camera_access"/>
+        <Preference android:fragment="com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment"
+                    android:key="number_enterprise_set_default_apps"
+                    android:title="@string/enterprise_privacy_enterprise_set_default_apps"/>
+        <Preference android:key="always_on_vpn_primary_user"
+                    android:selectable="false"/>
+        <Preference android:key="always_on_vpn_managed_profile"
+                    android:title="@string/enterprise_privacy_always_on_vpn_work"
+                    android:selectable="false"/>
+        <Preference android:key="input_method"
+                    android:title="@string/enterprise_privacy_input_method"
+                    android:selectable="false"/>
+        <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"
+                    android:selectable="false"/>
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/enterprise_privacy_device_access_category">
-        <com.android.settings.DividerPreference
-                android:title="@string/enterprise_privacy_lock_device"/>
-        <com.android.settings.DividerPreference
-                android:title="@string/enterprise_privacy_wipe_device"/>
-        <com.android.settings.DividerPreference
-                android:key="failed_password_wipe_current_user"
-                android:title="@string/enterprise_privacy_failed_password_wipe_device"/>
-        <com.android.settings.DividerPreference
-                android:key="failed_password_wipe_managed_profile"
-                android:title="@string/enterprise_privacy_failed_password_wipe_work"/>
+        <Preference android:title="@string/enterprise_privacy_lock_device"
+                    android:selectable="false"/>
+        <Preference android:title="@string/enterprise_privacy_wipe_device"
+                    android:selectable="false"/>
+        <Preference android:key="failed_password_wipe_current_user"
+                    android:title="@string/enterprise_privacy_failed_password_wipe_device"
+                    android:selectable="false"/>
+        <Preference android:key="failed_password_wipe_managed_profile"
+                    android:title="@string/enterprise_privacy_failed_password_wipe_work"
+                    android:selectable="false"/>
     </PreferenceCategory>
 </PreferenceScreen>
diff --git a/res/xml/enterprise_set_default_apps_settings.xml b/res/xml/enterprise_set_default_apps_settings.xml
new file mode 100644
index 0000000..b006f46
--- /dev/null
+++ b/res/xml/enterprise_set_default_apps_settings.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"
+                  xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+                  android:key="enterprise_set_default_apps_settings">
+    <PreferenceCategory
+            android:key="dashboard_tile_placeholder"/>
+</PreferenceScreen>
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index 17bd576..ca5ce45 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -97,22 +97,13 @@
 
     </PreferenceCategory>
 
-    <PreferenceCategory
-        android:key="pointer_settings_category"
-        android:title="@string/pointer_settings_category">
+    <PreferenceCategory>
 
         <com.android.settings.PointerSpeedPreference
             android:key="pointer_speed"
             android:title="@string/pointer_speed"
             android:dialogTitle="@string/pointer_speed"/>
 
-    </PreferenceCategory>
-
-    <!-- TTS -->
-    <PreferenceCategory
-        android:key="voice_category"
-        android:title="@string/voice_category">
-
         <Preference
             android:key="tts_settings"
             android:title="@string/tts_settings_title"
diff --git a/res/xml/notification_importance.xml b/res/xml/notification_importance.xml
new file mode 100644
index 0000000..f801f3c
--- /dev/null
+++ b/res/xml/notification_importance.xml
@@ -0,0 +1,38 @@
+<?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/notification_importance_title">
+
+        <com.android.settings.widget.RadioButtonPreference
+            android:key="importance_high"
+            android:title="@string/notification_importance_high_title"
+            android:summary="@string/notification_importance_high"
+        />
+        <com.android.settings.widget.RadioButtonPreference
+            android:key="importance_default"
+            android:title="@string/notification_importance_default_title"
+            android:summary="@string/notification_importance_default" />
+        <com.android.settings.widget.RadioButtonPreference
+            android:key="importance_low"
+            android:title="@string/notification_importance_low_title"
+            android:summary="@string/notification_importance_low" />
+        <com.android.settings.widget.RadioButtonPreference
+            android:key="importance_min"
+            android:title="@string/notification_importance_min_title"
+            android:summary="@string/notification_importance_min" />
+
+</PreferenceScreen>
diff --git a/res/xml/reset_dashboard_fragment.xml b/res/xml/reset_dashboard_fragment.xml
index 02328af..c769d5d 100644
--- a/res/xml/reset_dashboard_fragment.xml
+++ b/res/xml/reset_dashboard_fragment.xml
@@ -21,9 +21,11 @@
     android:title="@string/reset_dashboard_title">
 
     <!-- Network reset -->
-    <Preference
+    <com.android.settingslib.RestrictedPreference
         android:key="network_reset_pref"
         android:title="@string/reset_network_title"
+        settings:userRestriction="no_network_reset"
+        settings:useAdminDisabledSummary="true"
         android:fragment="com.android.settings.ResetNetwork" />
 
     <!-- Reset app preferences -->
diff --git a/res/xml/system_dashboard_fragment.xml b/res/xml/system_dashboard_fragment.xml
index 1186e78..b50d2fd 100644
--- a/res/xml/system_dashboard_fragment.xml
+++ b/res/xml/system_dashboard_fragment.xml
@@ -18,6 +18,16 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:title="@string/header_category_system">
 
+    <!-- Backup -->
+    <Preference
+        android:key="backup_settings"
+        android:title="@string/privacy_settings_title"
+        android:summary="@string/summary_placeholder"
+        android:icon="@drawable/ic_settings_backup"
+        android:order="-60">
+        <intent android:action="android.settings.BACKUP_AND_RESET_SETTINGS" />
+    </Preference>
+
     <!-- System updates -->
     <Preference
         android:key="system_update_settings"
diff --git a/res/xml/wifi_network_details_fragment.xml b/res/xml/wifi_network_details_fragment.xml
index 5b20d59..5d5958d 100644
--- a/res/xml/wifi_network_details_fragment.xml
+++ b/res/xml/wifi_network_details_fragment.xml
@@ -28,9 +28,9 @@
             android:key="general_details_category" >
         <!-- Buttons -->
         <com.android.settings.applications.LayoutPreference
-                android:key="forget_button"
-                android:selectable="false"
-                android:layout="@layout/single_button_panel" />
+            android:key="buttons"
+            android:layout="@layout/two_buttons_panel"
+            android:selectable="false" />
 
         <com.android.settings.wifi.WifiDetailPreference
                 android:key="signal_strength"
diff --git a/src/com/android/settings/ApnEditor.java b/src/com/android/settings/ApnEditor.java
index f668957..d5affa8 100644
--- a/src/com/android/settings/ApnEditor.java
+++ b/src/com/android/settings/ApnEditor.java
@@ -64,6 +64,7 @@
         implements OnPreferenceChangeListener, OnKeyListener {
 
     private final static String TAG = ApnEditor.class.getSimpleName();
+    private final static boolean VDBG = false;   // STOPSHIP if true
 
     private final static String SAVED_POS = "pos";
     private final static String KEY_AUTH_TYPE = "auth_type";
@@ -785,6 +786,46 @@
     }
 
     /**
+     * Add key, value to cv and compare the value against the value at index in mCursor. Return true
+     * if values are different. assumeDiff indicates if values can be assumed different in which
+     * case no comparison is needed.
+     * @return true if value is different from the value at index in mCursor
+     */
+    boolean setStringValueAndCheckIfDiff(ContentValues cv, String key, String value,
+                                         boolean assumeDiff, int index) {
+        cv.put(key, value);
+        String valueFromCursor = mCursor.getString(index);
+        if (VDBG) {
+            Log.d(TAG, "setStringValueAndCheckIfDiff: assumeDiff: " + assumeDiff
+                    + " key: " + key
+                    + " value: '" + value
+                    + "' valueFromCursor: '" + valueFromCursor + "'");
+        }
+        return assumeDiff
+                || !((TextUtils.isEmpty(value) && TextUtils.isEmpty(valueFromCursor))
+                || (value != null && value.equals(valueFromCursor)));
+    }
+
+    /**
+     * Add key, value to cv and compare the value against the value at index in mCursor. Return true
+     * if values are different. assumeDiff indicates if values can be assumed different in which
+     * case no comparison is needed.
+     * @return true if value is different from the value at index in mCursor
+     */
+    boolean setIntValueAndCheckIfDiff(ContentValues cv, String key, int value,
+                                      boolean assumeDiff, int index) {
+        cv.put(key, value);
+        int valueFromCursor = mCursor.getInt(index);
+        if (VDBG) {
+            Log.d(TAG, "setIntValueAndCheckIfDiff: assumeDiff: " + assumeDiff
+                    + " key: " + key
+                    + " value: '" + value
+                    + "' valueFromCursor: '" + valueFromCursor + "'");
+        }
+        return assumeDiff || value != valueFromCursor;
+    }
+
+    /**
      * Check the key fields' validity and save if valid.
      * @param force save even if the fields are not valid, if the app is
      *        being suspended
@@ -820,33 +861,110 @@
         }
 
         ContentValues values = new ContentValues();
+        // call update() if it's a new APN. If not, check if any field differs from the db value;
+        // if any diff is found update() should be called
+        boolean callUpdate = mNewApn;
 
         // Add a dummy name "Untitled", if the user exits the screen without adding a name but
         // entered other information worth keeping.
-        values.put(Telephony.Carriers.NAME,
-                name.length() < 1 ? getResources().getString(R.string.untitled_apn) : name);
-        values.put(Telephony.Carriers.APN, apn);
-        values.put(Telephony.Carriers.PROXY, checkNotSet(mProxy.getText()));
-        values.put(Telephony.Carriers.PORT, checkNotSet(mPort.getText()));
-        values.put(Telephony.Carriers.MMSPROXY, checkNotSet(mMmsProxy.getText()));
-        values.put(Telephony.Carriers.MMSPORT, checkNotSet(mMmsPort.getText()));
-        values.put(Telephony.Carriers.USER, checkNotSet(mUser.getText()));
-        values.put(Telephony.Carriers.SERVER, checkNotSet(mServer.getText()));
-        values.put(Telephony.Carriers.PASSWORD, checkNotSet(mPassword.getText()));
-        values.put(Telephony.Carriers.MMSC, checkNotSet(mMmsc.getText()));
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.NAME,
+                name.length() < 1 ? getResources().getString(R.string.untitled_apn) : name,
+                callUpdate,
+                NAME_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.APN,
+                apn,
+                callUpdate,
+                APN_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.PROXY,
+                checkNotSet(mProxy.getText()),
+                callUpdate,
+                PROXY_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.PORT,
+                checkNotSet(mPort.getText()),
+                callUpdate,
+                PORT_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MMSPROXY,
+                checkNotSet(mMmsProxy.getText()),
+                callUpdate,
+                MMSPROXY_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MMSPORT,
+                checkNotSet(mMmsPort.getText()),
+                callUpdate,
+                MMSPORT_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.USER,
+                checkNotSet(mUser.getText()),
+                callUpdate,
+                USER_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.SERVER,
+                checkNotSet(mServer.getText()),
+                callUpdate,
+                SERVER_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.PASSWORD,
+                checkNotSet(mPassword.getText()),
+                callUpdate,
+                PASSWORD_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MMSC,
+                checkNotSet(mMmsc.getText()),
+                callUpdate,
+                MMSC_INDEX);
 
         String authVal = mAuthType.getValue();
         if (authVal != null) {
-            values.put(Telephony.Carriers.AUTH_TYPE, Integer.parseInt(authVal));
+            callUpdate = setIntValueAndCheckIfDiff(values,
+                    Telephony.Carriers.AUTH_TYPE,
+                    Integer.parseInt(authVal),
+                    callUpdate,
+                    AUTH_TYPE_INDEX);
         }
 
-        values.put(Telephony.Carriers.PROTOCOL, checkNotSet(mProtocol.getValue()));
-        values.put(Telephony.Carriers.ROAMING_PROTOCOL, checkNotSet(mRoamingProtocol.getValue()));
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.PROTOCOL,
+                checkNotSet(mProtocol.getValue()),
+                callUpdate,
+                PROTOCOL_INDEX);
 
-        values.put(Telephony.Carriers.TYPE, checkNotSet(mApnType.getText()));
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.ROAMING_PROTOCOL,
+                checkNotSet(mRoamingProtocol.getValue()),
+                callUpdate,
+                ROAMING_PROTOCOL_INDEX);
 
-        values.put(Telephony.Carriers.MCC, mcc);
-        values.put(Telephony.Carriers.MNC, mnc);
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.TYPE,
+                checkNotSet(mApnType.getText()),
+                callUpdate,
+                TYPE_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MCC,
+                mcc,
+                callUpdate,
+                MCC_INDEX);
+
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MNC,
+                mnc,
+                callUpdate,
+                MNC_INDEX);
 
         values.put(Telephony.Carriers.NUMERIC, mcc + mnc);
 
@@ -866,7 +984,11 @@
                 bearerBitmask |= ServiceState.getBitmaskForTech(Integer.parseInt(bearer));
             }
         }
-        values.put(Telephony.Carriers.BEARER_BITMASK, bearerBitmask);
+        callUpdate = setIntValueAndCheckIfDiff(values,
+                Telephony.Carriers.BEARER_BITMASK,
+                bearerBitmask,
+                callUpdate,
+                BEARER_BITMASK_INDEX);
 
         int bearerVal;
         if (bearerBitmask == 0 || mBearerInitialVal == 0) {
@@ -879,13 +1001,35 @@
             // random tech from the new bitmask??
             bearerVal = 0;
         }
-        values.put(Telephony.Carriers.BEARER, bearerVal);
+        callUpdate = setIntValueAndCheckIfDiff(values,
+                Telephony.Carriers.BEARER,
+                bearerVal,
+                callUpdate,
+                BEARER_INDEX);
 
-        values.put(Telephony.Carriers.MVNO_TYPE, checkNotSet(mMvnoType.getValue()));
-        values.put(Telephony.Carriers.MVNO_MATCH_DATA, checkNotSet(mMvnoMatchData.getText()));
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MVNO_TYPE,
+                checkNotSet(mMvnoType.getValue()),
+                callUpdate,
+                MVNO_TYPE_INDEX);
 
-        values.put(Telephony.Carriers.CARRIER_ENABLED, mCarrierEnabled.isChecked() ? 1 : 0);
-        getContentResolver().update(mUri, values, null, null);
+        callUpdate = setStringValueAndCheckIfDiff(values,
+                Telephony.Carriers.MVNO_MATCH_DATA,
+                checkNotSet(mMvnoMatchData.getText()),
+                callUpdate,
+                MVNO_MATCH_DATA_INDEX);
+
+        callUpdate = setIntValueAndCheckIfDiff(values,
+                Telephony.Carriers.CARRIER_ENABLED,
+                mCarrierEnabled.isChecked() ? 1 : 0,
+                callUpdate,
+                CARRIER_ENABLED_INDEX);
+
+        if (callUpdate) {
+            getContentResolver().update(mUri, values, null, null);
+        } else {
+            if (VDBG) Log.d(TAG, "validateAndSave: not calling update()");
+        }
 
         return true;
     }
diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java
index fb2f29f..3bb82cf 100644
--- a/src/com/android/settings/DeviceAdminAdd.java
+++ b/src/com/android/settings/DeviceAdminAdd.java
@@ -65,6 +65,8 @@
 import com.android.settings.users.UserDialogs;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.SecureTouchListener;
+
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -350,6 +352,8 @@
 
         final View restrictedAction = findViewById(R.id.restricted_action);
         restrictedAction.setFilterTouchesWhenObscured(true);
+        restrictedAction.setOnTouchListener(
+                new SecureTouchListener(getString(R.string.window_obscured_warning)));
         restrictedAction.setOnClickListener(new View.OnClickListener() {
             public void onClick(View v) {
                 if (mAdding) {
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 951a26b..a9ca458 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -27,7 +27,6 @@
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.display.AutoBrightnessPreferenceController;
 import com.android.settings.display.AutoRotatePreferenceController;
-import com.android.settings.display.BrightnessLevelPreferenceController;
 import com.android.settings.display.CameraGesturePreferenceController;
 import com.android.settings.display.DozePreferenceController;
 import com.android.settings.display.FontSizePreferenceController;
@@ -107,7 +106,6 @@
         controllers.add(new VrDisplayPreferenceController(context));
         controllers.add(new WallpaperPreferenceController(context));
         controllers.add(new ThemePreferenceController(context));
-        controllers.add(new BrightnessLevelPreferenceController(context));
         return controllers;
     }
 
diff --git a/src/com/android/settings/LicenseHtmlGeneratorFromXml.java b/src/com/android/settings/LicenseHtmlGeneratorFromXml.java
new file mode 100644
index 0000000..7025c5a
--- /dev/null
+++ b/src/com/android/settings/LicenseHtmlGeneratorFromXml.java
@@ -0,0 +1,292 @@
+/*
+ * 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.support.annotation.VisibleForTesting;
+import android.text.TextUtils;
+import android.util.Log;
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.zip.GZIPInputStream;
+
+/**
+ * The utility class that generate a license html file from xml files.
+ * All the HTML snippets and logic are copied from build/make/tools/generate-notice-files.py.
+ *
+ * TODO: Remove duplicate codes once backward support ends.
+ */
+class LicenseHtmlGeneratorFromXml {
+    private static final String TAG = "LicenseHtmlGeneratorFromXml";
+
+    private static final String TAG_ROOT = "licenses";
+    private static final String TAG_FILE_NAME = "file-name";
+    private static final String TAG_FILE_CONTENT = "file-content";
+    private static final String ATTR_CONTENT_ID = "contentId";
+
+    private static final String HTML_HEAD_STRING =
+            "<html><head>\n" +
+            "<style type=\"text/css\">\n" +
+            "body { padding: 0; font-family: sans-serif; }\n" +
+            ".same-license { background-color: #eeeeee;\n" +
+            "                border-top: 20px solid white;\n" +
+            "                padding: 10px; }\n" +
+            ".label { font-weight: bold; }\n" +
+            ".file-list { margin-left: 1em; color: blue; }\n" +
+            "</style>\n" +
+            "</head>" +
+            "<body topmargin=\"0\" leftmargin=\"0\" rightmargin=\"0\" bottommargin=\"0\">\n" +
+            "<div class=\"toc\">\n" +
+            "<ul>";
+
+    private static final String HTML_MIDDLE_STRING =
+            "</ul>\n" +
+            "</div><!-- table of contents -->\n" +
+            "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">";
+
+    private static final String HTML_REAR_STRING =
+            "</table></body></html>";
+
+    private final List<File> mXmlFiles;
+
+    /*
+     * A map from a file name to a content id (MD5 sum of file content) for its license.
+     * For example, "/system/priv-app/TeleService/TeleService.apk" maps to
+     * "9645f39e9db895a4aa6e02cb57294595". Here "9645f39e9db895a4aa6e02cb57294595" is a MD5 sum
+     * of the content of packages/services/Telephony/MODULE_LICENSE_APACHE2.
+     */
+    private final Map<String, String> mFileNameToContentIdMap = new HashMap();
+
+    /*
+     * A map from a content id (MD5 sum of file content) to a license file content.
+     * For example, "9645f39e9db895a4aa6e02cb57294595" maps to the content string of
+     * packages/services/Telephony/MODULE_LICENSE_APACHE2. Here "9645f39e9db895a4aa6e02cb57294595"
+     * is a MD5 sum of the file content.
+     */
+    private final Map<String, String> mContentIdToFileContentMap = new HashMap();
+
+    static class ContentIdAndFileNames {
+        final String mContentId;
+        final List<String> mFileNameList = new ArrayList();
+
+        ContentIdAndFileNames(String contentId) {
+            mContentId = contentId;
+        }
+    }
+
+    private LicenseHtmlGeneratorFromXml(List<File> xmlFiles) {
+        mXmlFiles = xmlFiles;
+    }
+
+    public static boolean generateHtml(List<File> xmlFiles, File outputFile) {
+        LicenseHtmlGeneratorFromXml genertor = new LicenseHtmlGeneratorFromXml(xmlFiles);
+        return genertor.generateHtml(outputFile);
+    }
+
+    private boolean generateHtml(File outputFile) {
+        for (File xmlFile : mXmlFiles) {
+            parse(xmlFile);
+        }
+
+        if (mFileNameToContentIdMap.isEmpty() || mContentIdToFileContentMap.isEmpty()) {
+            return false;
+        }
+
+        PrintWriter writer = null;
+        try {
+            writer = new PrintWriter(outputFile);
+
+            generateHtml(mFileNameToContentIdMap, mContentIdToFileContentMap, writer);
+
+            writer.flush();
+            writer.close();
+            return true;
+        } catch (FileNotFoundException | SecurityException e) {
+            Log.e(TAG, "Failed to generate " + outputFile, e);
+
+            if (writer != null) {
+                writer.close();
+            }
+            return false;
+        }
+    }
+
+    private void parse(File xmlFile) {
+        if (xmlFile == null || !xmlFile.exists() || xmlFile.length() == 0) {
+            return;
+        }
+
+        InputStreamReader in = null;
+        try {
+            if (xmlFile.getName().endsWith(".gz")) {
+                in = new InputStreamReader(new GZIPInputStream(new FileInputStream(xmlFile)));
+            } else {
+                in = new FileReader(xmlFile);
+            }
+
+            parse(in, mFileNameToContentIdMap, mContentIdToFileContentMap);
+
+            in.close();
+        } catch (XmlPullParserException | IOException e) {
+            Log.e(TAG, "Failed to parse " + xmlFile, e);
+            if (in != null) {
+                try {
+                    in.close();
+                } catch (IOException ie) {
+                    Log.w(TAG, "Failed to close " + xmlFile);
+                }
+            }
+        }
+    }
+
+    /*
+     * Parses an input stream and fills a map from a file name to a content id for its license
+     * and a map from a content id to a license file content.
+     *
+     * Following xml format is expected from the input stream.
+     *
+     *     <licenses>
+     *     <file-name contentId="content_id_of_license1">file1</file-name>
+     *     <file-name contentId="content_id_of_license2">file2</file-name>
+     *     ...
+     *     <file-content contentId="content_id_of_license1">license1 file contents</file-content>
+     *     <file-content contentId="content_id_of_license2">license2 file contents</file-content>
+     *     ...
+     *     </licenses>
+     */
+    @VisibleForTesting
+    static void parse(InputStreamReader in, Map<String, String> outFileNameToContentIdMap,
+            Map<String, String> outContentIdToFileContentMap)
+                    throws XmlPullParserException, IOException {
+        Map<String, String> fileNameToContentIdMap = new HashMap<String, String>();
+        Map<String, String> contentIdToFileContentMap = new HashMap<String, String>();
+
+        XmlPullParser parser = Xml.newPullParser();
+        parser.setInput(in);
+        parser.nextTag();
+
+        parser.require(XmlPullParser.START_TAG, "", TAG_ROOT);
+
+        int state = parser.getEventType();
+        while (state != XmlPullParser.END_DOCUMENT) {
+            if (state == XmlPullParser.START_TAG) {
+                if (TAG_FILE_NAME.equals(parser.getName())) {
+                    String contentId = parser.getAttributeValue("", ATTR_CONTENT_ID);
+                        if (!TextUtils.isEmpty(contentId)) {
+                        String fileName = readText(parser).trim();
+                        if (!TextUtils.isEmpty(fileName)) {
+                            fileNameToContentIdMap.put(fileName, contentId);
+                        }
+                    }
+                } else if (TAG_FILE_CONTENT.equals(parser.getName())) {
+                    String contentId = parser.getAttributeValue("", ATTR_CONTENT_ID);
+                    if (!TextUtils.isEmpty(contentId) &&
+                            !outContentIdToFileContentMap.containsKey(contentId) &&
+                            !contentIdToFileContentMap.containsKey(contentId)) {
+                        String fileContent = readText(parser);
+                        if (!TextUtils.isEmpty(fileContent)) {
+                            contentIdToFileContentMap.put(contentId, fileContent);
+                        }
+                    }
+                }
+            }
+
+            state = parser.next();
+        }
+        outFileNameToContentIdMap.putAll(fileNameToContentIdMap);
+        outContentIdToFileContentMap.putAll(contentIdToFileContentMap);
+    }
+
+    private static String readText(XmlPullParser parser)
+            throws IOException, XmlPullParserException {
+        StringBuffer result = new StringBuffer();
+        int state = parser.next();
+        while (state == XmlPullParser.TEXT) {
+            result.append(parser.getText());
+            state = parser.next();
+        }
+        return result.toString();
+    }
+
+    @VisibleForTesting
+    static void generateHtml(Map<String, String> fileNameToContentIdMap,
+            Map<String, String> contentIdToFileContentMap, PrintWriter writer) {
+        List<String> fileNameList = new ArrayList();
+        fileNameList.addAll(fileNameToContentIdMap.keySet());
+        Collections.sort(fileNameList);
+
+        writer.println(HTML_HEAD_STRING);
+
+        int count = 0;
+        Map<String, Integer> contentIdToOrderMap = new HashMap();
+        List<ContentIdAndFileNames> contentIdAndFileNamesList = new ArrayList();
+
+        // Prints all the file list with a link to its license file content.
+        for (String fileName : fileNameList) {
+            String contentId = fileNameToContentIdMap.get(fileName);
+            // Assigns an id to a newly referred license file content.
+            if (!contentIdToOrderMap.containsKey(contentId)) {
+                contentIdToOrderMap.put(contentId, count);
+
+                // An index in contentIdAndFileNamesList is the order of each element.
+                contentIdAndFileNamesList.add(new ContentIdAndFileNames(contentId));
+                count++;
+            }
+
+            int id = contentIdToOrderMap.get(contentId);
+            contentIdAndFileNamesList.get(id).mFileNameList.add(fileName);
+            writer.format("<li><a href=\"#id%d\">%s</a></li>\n", id, fileName);
+        }
+
+        writer.println(HTML_MIDDLE_STRING);
+
+        count = 0;
+        // Prints all contents of the license files in order of id.
+        for (ContentIdAndFileNames contentIdAndFileNames : contentIdAndFileNamesList) {
+            writer.format("<tr id=\"id%d\"><td class=\"same-license\">\n", count);
+            writer.println("<div class=\"label\">Notices for file(s):</div>");
+            writer.println("<div class=\"file-list\">");
+            for (String fileName : contentIdAndFileNames.mFileNameList) {
+                writer.format("%s <br/>\n", fileName);
+            }
+            writer.println("</div><!-- file-list -->");
+            writer.println("<pre class=\"license-text\">");
+            writer.println(contentIdToFileContentMap.get(
+                    contentIdAndFileNames.mContentId));
+            writer.println("</pre><!-- license-text -->");
+            writer.println("</td></tr><!-- same-license -->");
+
+            count++;
+        }
+
+        writer.println(HTML_REAR_STRING);
+    }
+}
diff --git a/src/com/android/settings/LicenseHtmlLoader.java b/src/com/android/settings/LicenseHtmlLoader.java
new file mode 100644
index 0000000..9717926
--- /dev/null
+++ b/src/com/android/settings/LicenseHtmlLoader.java
@@ -0,0 +1,110 @@
+/*
+ * 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.Context;
+import android.support.annotation.VisibleForTesting;
+import android.util.Log;
+
+import com.android.settings.utils.AsyncLoader;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * LicenseHtmlLoader is a loader which loads a license html file from default license xml files.
+ */
+class LicenseHtmlLoader extends AsyncLoader<File> {
+    private static final String TAG = "LicenseHtmlLoader";
+
+    private static final String[] DEFAULT_LICENSE_XML_PATHS = {
+                "/system/etc/NOTICE.xml.gz",
+                "/vendor/etc/NOTICE.xml.gz",
+                "/odm/etc/NOTICE.xml.gz",
+                "/oem/etc/NOTICE.xml.gz"};
+    private static final String NOTICE_HTML_FILE_NAME = "NOTICE.html";
+
+    private Context mContext;
+
+    public LicenseHtmlLoader(Context context) {
+        super(context);
+        mContext = context;
+    }
+
+    @Override
+    public File loadInBackground() {
+        return generateHtmlFromDefaultXmlFiles();
+    }
+
+    @Override
+    protected void onDiscardResult(File f) {
+    }
+
+    private File generateHtmlFromDefaultXmlFiles() {
+        final List<File> xmlFiles = getVaildXmlFiles();
+        if (xmlFiles.isEmpty()) {
+            Log.e(TAG, "No notice file exists.");
+            return null;
+        }
+
+        File cachedHtmlFile = getCachedHtmlFile();
+        if(!isCachedHtmlFileOutdated(xmlFiles, cachedHtmlFile) ||
+                generateHtmlFile(xmlFiles, cachedHtmlFile)) {
+            return cachedHtmlFile;
+        }
+
+        return null;
+    }
+
+    @VisibleForTesting
+    List<File> getVaildXmlFiles() {
+        final List<File> xmlFiles = new ArrayList();
+        for (final String xmlPath : DEFAULT_LICENSE_XML_PATHS) {
+            File file = new File(xmlPath);
+            if (file.exists() && file.length() != 0) {
+                xmlFiles.add(file);
+            }
+        }
+        return xmlFiles;
+    }
+
+    @VisibleForTesting
+    File getCachedHtmlFile() {
+        return new File(mContext.getCacheDir(), NOTICE_HTML_FILE_NAME);
+    }
+
+    @VisibleForTesting
+    boolean isCachedHtmlFileOutdated(List<File> xmlFiles, File cachedHtmlFile) {
+        boolean outdated = true;
+        if (cachedHtmlFile.exists() && cachedHtmlFile.length() != 0) {
+            outdated = false;
+            for (File file : xmlFiles) {
+                if (cachedHtmlFile.lastModified() < file.lastModified()) {
+                    outdated = true;
+                    break;
+                }
+            }
+        }
+        return outdated;
+    }
+
+    @VisibleForTesting
+    boolean generateHtmlFile(List<File> xmlFiles, File htmlFile) {
+        return LicenseHtmlGeneratorFromXml.generateHtml(xmlFiles, htmlFile);
+    }
+}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 34990ec..3e45af7 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -79,7 +79,7 @@
 
     private static final String LOG_TAG = "Settings";
 
-    private static final int LOADER_ID_INDEXABLE_CONTENT_MONITOR = 1;
+    public static final int LOADER_ID_INDEXABLE_CONTENT_MONITOR = 1;
 
     // Constants for state save/restore
     private static final String SAVE_KEY_CATEGORIES = ":settings:categories";
diff --git a/src/com/android/settings/SettingsLicenseActivity.java b/src/com/android/settings/SettingsLicenseActivity.java
index e0b7efe..5b23a68 100644
--- a/src/com/android/settings/SettingsLicenseActivity.java
+++ b/src/com/android/settings/SettingsLicenseActivity.java
@@ -17,32 +17,87 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.LoaderManager;
 import android.content.ActivityNotFoundException;
+import android.content.ContentResolver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.Loader;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.StrictMode;
 import android.os.SystemProperties;
+import android.support.annotation.VisibleForTesting;
+import android.support.v4.content.FileProvider;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
+import com.android.settings.users.RestrictedProfileSettings;
+
 import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * The "dialog" that shows from "License" in the Settings app.
  */
-public class SettingsLicenseActivity extends Activity {
+public class SettingsLicenseActivity extends Activity implements
+            LoaderManager.LoaderCallbacks<File> {
     private static final String TAG = "SettingsLicenseActivity";
 
     private static final String DEFAULT_LICENSE_PATH = "/system/etc/NOTICE.html.gz";
     private static final String PROPERTY_LICENSE_PATH = "ro.config.license_path";
 
+    private static final int LOADER_ID_LICENSE_HTML_LOADER = 0;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        final String path = SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
+        final String licenseHtmlPath =
+                SystemProperties.get(PROPERTY_LICENSE_PATH, DEFAULT_LICENSE_PATH);
+        if (isFilePathValid(licenseHtmlPath)) {
+            showSelectedFile(licenseHtmlPath);
+        } else {
+            showHtmlFromDefaultXmlFiles();
+        }
+    }
+
+    @Override
+    public Loader<File> onCreateLoader(int id, Bundle args) {
+        return new LicenseHtmlLoader(this);
+    }
+
+    @Override
+    public void onLoadFinished(Loader<File> loader, File generatedHtmlFile) {
+        showGeneratedHtmlFile(generatedHtmlFile);
+    }
+
+    @Override
+    public void onLoaderReset(Loader<File> loader) {
+    }
+
+    private void showHtmlFromDefaultXmlFiles() {
+        getLoaderManager().initLoader(LOADER_ID_LICENSE_HTML_LOADER, Bundle.EMPTY, this);
+    }
+
+    @VisibleForTesting
+    Uri getUriFromGeneratedHtmlFile(File generatedHtmlFile) {
+        return FileProvider.getUriForFile(this, RestrictedProfileSettings.FILE_PROVIDER_AUTHORITY,
+                generatedHtmlFile);
+    }
+
+    private void showGeneratedHtmlFile(File generatedHtmlFile) {
+        if (generatedHtmlFile != null) {
+            showHtmlFromUri(getUriFromGeneratedHtmlFile(generatedHtmlFile));
+        } else {
+            Log.e(TAG, "Failed to generate.");
+            showErrorAndFinish();
+        }
+    }
+
+    private void showSelectedFile(final String path) {
         if (TextUtils.isEmpty(path)) {
             Log.e(TAG, "The system property for the license file is empty");
             showErrorAndFinish();
@@ -50,18 +105,24 @@
         }
 
         final File file = new File(path);
-        if (!file.exists() || file.length() == 0) {
+        if (!isFileValid(file)) {
             Log.e(TAG, "License file " + path + " does not exist");
             showErrorAndFinish();
             return;
         }
+        showHtmlFromUri(Uri.fromFile(file));
+     }
 
+     private void showHtmlFromUri(Uri uri) {
         // Kick off external viewer due to WebView security restrictions; we
         // carefully point it at HTMLViewer, since it offers to decompress
         // before viewing.
         final Intent intent = new Intent(Intent.ACTION_VIEW);
-        intent.setDataAndType(Uri.fromFile(file), "text/html");
+        intent.setDataAndType(uri, "text/html");
         intent.putExtra(Intent.EXTRA_TITLE, getString(R.string.settings_license_activity_title));
+        if (ContentResolver.SCHEME_CONTENT.equals(uri.getScheme())) {
+            intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        }
         intent.addCategory(Intent.CATEGORY_DEFAULT);
         intent.setPackage("com.android.htmlviewer");
 
@@ -79,4 +140,13 @@
                 .show();
         finish();
     }
+
+    private boolean isFilePathValid(final String path) {
+        return !TextUtils.isEmpty(path) && isFileValid(new File(path));
+    }
+
+    @VisibleForTesting
+    boolean isFileValid(final File file) {
+        return file.exists() && file.length() != 0;
+    }
 }
diff --git a/src/com/android/settings/SetupChooseLockPattern.java b/src/com/android/settings/SetupChooseLockPattern.java
index 30a3c7c..762d3b3 100644
--- a/src/com/android/settings/SetupChooseLockPattern.java
+++ b/src/com/android/settings/SetupChooseLockPattern.java
@@ -75,7 +75,7 @@
         protected Intent getRedactionInterstitialIntent(Context context) {
             // Setup wizard's redaction interstitial is deferred to optional step. Enable that
             // optional step if the lock screen was set up.
-            SetupRedactionInterstitial.setEnabled(context, false);
+            SetupRedactionInterstitial.setEnabled(context, true);
             return null;
         }
     }
diff --git a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
index 9f89bc1..e0c58db 100644
--- a/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
+++ b/src/com/android/settings/accessibility/AccessibilityServiceWarning.java
@@ -23,6 +23,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.storage.StorageManager;
+import android.text.BidiFormatter;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -34,6 +35,7 @@
 import com.android.settings.R;
 
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Utility class for creating the dialog that asks users for explicit permission to grant
@@ -44,7 +46,7 @@
             AccessibilityServiceInfo info, DialogInterface.OnClickListener listener) {
         final AlertDialog ad = new AlertDialog.Builder(parentActivity)
                 .setTitle(parentActivity.getString(R.string.enable_service_title,
-                        info.getResolveInfo().loadLabel(parentActivity.getPackageManager())))
+                        getServiceName(parentActivity, info)))
                 .setView(createEnableDialogContentView(parentActivity, info))
                 .setCancelable(true)
                 .setPositiveButton(android.R.string.ok, listener)
@@ -97,7 +99,7 @@
                 R.id.encryption_warning);
         if (isFullDiskEncrypted()) {
             String text = context.getString(R.string.enable_service_encryption_warning,
-                    info.getResolveInfo().loadLabel(context.getPackageManager()));
+                    getServiceName(context, info));
             encryptionWarningView.setText(text);
             encryptionWarningView.setVisibility(View.VISIBLE);
         } else {
@@ -107,7 +109,7 @@
         TextView capabilitiesHeaderView = (TextView) content.findViewById(
                 R.id.capabilities_header);
         capabilitiesHeaderView.setText(context.getString(R.string.capabilities_list_title,
-                info.getResolveInfo().loadLabel(context.getPackageManager())));
+                getServiceName(context, info)));
 
         LinearLayout capabilitiesView = (LinearLayout) content.findViewById(R.id.capabilities);
 
@@ -161,4 +163,12 @@
 
         return content;
     }
+
+    // Get the service name and bidi wrap it to protect from bidi side effects.
+    private static CharSequence getServiceName(Context context, AccessibilityServiceInfo info) {
+        final Locale locale = context.getResources().getConfiguration().getLocales().get(0);
+        final CharSequence label =
+                info.getResolveInfo().loadLabel(context.getPackageManager());
+        return BidiFormatter.getInstance(locale).unicodeWrap(label);
+    }
 }
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index 44dd353..eb3e726 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -478,7 +478,7 @@
             final String serviceState = serviceEnabled ?
                     getString(R.string.accessibility_summary_state_enabled) :
                     getString(R.string.accessibility_summary_state_disabled);
-            final String serviceSummary = info.loadSummary(getPackageManager());
+            final CharSequence serviceSummary = info.loadSummary(getPackageManager());
             final String stateSummaryCombo = getString(
                     R.string.accessibility_summary_default_combination,
                     serviceState, serviceSummary);
diff --git a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
index 3250521..d7749ea 100644
--- a/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
+++ b/src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
@@ -69,7 +69,7 @@
             candidates.add(new DefaultAppInfo(mPm,
                     UserHandle.myUserId(),
                     installedServiceInfo.getComponentName(),
-                    installedServiceInfo.loadSummary(mPm.getPackageManager()),
+                    (String) installedServiceInfo.loadSummary(mPm.getPackageManager()),
                     true /* enabled */));
         }
 
diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
index 9018d9b..2499478 100644
--- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
+++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java
@@ -23,8 +23,10 @@
 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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -55,7 +57,15 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
-        return null;
+        return buildPreferenceControllers(context);
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context) {
+        final List<PreferenceController> controllers = new ArrayList<>();
+        controllers.add(new EmergencyBroadcastPreferenceController(context,
+                "app_and_notif_cell_broadcast_settings"));
+        controllers.add(new SpecialAppAccessPreferenceController(context));
+        return controllers;
     }
 
     public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
@@ -67,5 +77,10 @@
                     sir.xmlResId = R.xml.app_and_notification;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context);
+                }
             };
 }
diff --git a/src/com/android/settings/applications/AppCounter.java b/src/com/android/settings/applications/AppCounter.java
index 8758b14..8eff526 100644
--- a/src/com/android/settings/applications/AppCounter.java
+++ b/src/com/android/settings/applications/AppCounter.java
@@ -32,7 +32,7 @@
 
     public AppCounter(Context context, PackageManagerWrapper packageManager) {
         mPm = packageManager;
-        mUm = UserManager.get(context);
+        mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
     }
 
     @Override
diff --git a/src/com/android/settings/applications/AppLister.java b/src/com/android/settings/applications/AppLister.java
new file mode 100644
index 0000000..425afa0
--- /dev/null
+++ b/src/com/android/settings/applications/AppLister.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.applications;
+
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.AsyncTask;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Lists apps for current user that fit some criteria specified by includeInCount method
+ * implementation.
+ * This class is similar to {@link AppCounter} class, but but builds actual list of apps instead
+ * of just counting them.
+ */
+public abstract class AppLister extends AsyncTask<Void, Void, List<UserAppInfo>> {
+    protected final PackageManagerWrapper mPm;
+    protected final UserManager mUm;
+
+    public AppLister(PackageManagerWrapper packageManager, UserManager userManager) {
+        mPm = packageManager;
+        mUm = userManager;
+    }
+
+    @Override
+    protected List<UserAppInfo> doInBackground(Void... params) {
+        final List<UserAppInfo> result = new ArrayList<>();
+        for (UserInfo user : mUm.getProfiles(UserHandle.myUserId())) {
+            final List<ApplicationInfo> list =
+                    mPm.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                            | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
+                            | (user.isAdmin() ? PackageManager.MATCH_ANY_USER : 0),
+                            user.id);
+            for (ApplicationInfo info : list) {
+                if (includeInCount(info)) {
+                    result.add(new UserAppInfo(user, info));
+                }
+            }
+        }
+        return result;
+    }
+
+    @Override
+    protected void onPostExecute(List<UserAppInfo> list) {
+        onAppListBuilt(list);
+    }
+
+    protected abstract void onAppListBuilt(List<UserAppInfo> list);
+    protected abstract boolean includeInCount(ApplicationInfo info);
+}
diff --git a/src/com/android/settings/applications/AppStateAppOpsBridge.java b/src/com/android/settings/applications/AppStateAppOpsBridge.java
index cfbb2fc..420d955 100644
--- a/src/com/android/settings/applications/AppStateAppOpsBridge.java
+++ b/src/com/android/settings/applications/AppStateAppOpsBridge.java
@@ -19,12 +19,12 @@
 import android.app.AppOpsManager;
 import android.app.AppOpsManager.PackageOps;
 import android.content.Context;
-import android.content.pm.IPackageManager;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
 import android.util.ArrayMap;
 import android.util.Log;
 import android.util.SparseArray;
@@ -46,7 +46,7 @@
 
     private static final String TAG = "AppStateAppOpsBridge";
 
-    private final IPackageManager mIPackageManager;
+    private final IPackageManagerWrapper mIPackageManager;
     private final UserManager mUserManager;
     private final List<UserHandle> mProfiles;
     private final AppOpsManager mAppOpsManager;
@@ -56,9 +56,16 @@
 
     public AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
             int appOpsOpCode, String[] permissions) {
+        this(context, appState, callback, appOpsOpCode, permissions,
+            new IPackageManagerWrapperImpl(AppGlobals.getPackageManager()));
+    }
+
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    AppStateAppOpsBridge(Context context, ApplicationsState appState, Callback callback,
+            int appOpsOpCode, String[] permissions, IPackageManagerWrapper packageManager) {
         super(appState, callback);
         mContext = context;
-        mIPackageManager = AppGlobals.getPackageManager();
+        mIPackageManager = packageManager;
         mUserManager = UserManager.get(context);
         mProfiles = mUserManager.getUserProfiles();
         mAppOpsManager = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);
@@ -92,18 +99,21 @@
                 .getUserId(uid)));
         try {
             permissionState.packageInfo = mIPackageManager.getPackageInfo(pkg,
-                    PackageManager.GET_PERMISSIONS | PackageManager.MATCH_UNINSTALLED_PACKAGES,
+                    PackageManager.GET_PERMISSIONS | PackageManager.MATCH_ANY_USER,
                     permissionState.userHandle.getIdentifier());
-            // Check static permission state (whatever that is declared in package manifest)
-            String[] requestedPermissions = permissionState.packageInfo.requestedPermissions;
-            int[] permissionFlags = permissionState.packageInfo.requestedPermissionsFlags;
-            if (requestedPermissions != null) {
-                for (int i = 0; i < requestedPermissions.length; i++) {
-                    if (doesAnyPermissionMatch(requestedPermissions[i], mPermissions)) {
-                        permissionState.permissionDeclared = true;
-                        if ((permissionFlags[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0) {
-                            permissionState.staticPermissionGranted = true;
-                            break;
+            if (permissionState.packageInfo != null) {
+                // Check static permission state (whatever that is declared in package manifest)
+                String[] requestedPermissions = permissionState.packageInfo.requestedPermissions;
+                int[] permissionFlags = permissionState.packageInfo.requestedPermissionsFlags;
+                if (requestedPermissions != null) {
+                    for (int i = 0; i < requestedPermissions.length; i++) {
+                        if (doesAnyPermissionMatch(requestedPermissions[i], mPermissions)) {
+                            permissionState.permissionDeclared = true;
+                            if ((permissionFlags[i] & PackageInfo.REQUESTED_PERMISSION_GRANTED)
+                                    != 0) {
+                                permissionState.staticPermissionGranted = true;
+                                break;
+                            }
                         }
                     }
                 }
diff --git a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
index 52f1da5..c7d0a62 100644
--- a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
+++ b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounter.java
@@ -31,7 +31,6 @@
 public abstract class AppWithAdminGrantedPermissionsCounter extends AppCounter {
 
     private final String[] mPermissions;
-    private final PackageManagerWrapper mPackageManager;
     private final IPackageManagerWrapper mPackageManagerService;
     private final DevicePolicyManagerWrapper mDevicePolicyManager;
 
@@ -40,18 +39,24 @@
             DevicePolicyManagerWrapper devicePolicyManager) {
         super(context, packageManager);
         mPermissions = permissions;
-        mPackageManager = packageManager;
         mPackageManagerService = packageManagerService;
         mDevicePolicyManager = devicePolicyManager;
     }
 
     @Override
     protected boolean includeInCount(ApplicationInfo info) {
+        return includeInCount(mPermissions, mDevicePolicyManager, mPm, mPackageManagerService,
+                info);
+    }
+
+    public static boolean includeInCount(String[] permissions,
+            DevicePolicyManagerWrapper devicePolicyManager, PackageManagerWrapper packageManager,
+            IPackageManagerWrapper packageManagerService, ApplicationInfo info) {
         if (info.targetSdkVersion >= Build.VERSION_CODES.M) {
             // The app uses run-time permissions. Check whether one or more of the permissions were
             // granted by enterprise policy.
-            for (final String permission : mPermissions) {
-                if (mDevicePolicyManager.getPermissionGrantState(null /* admin */, info.packageName,
+            for (final String permission : permissions) {
+                if (devicePolicyManager.getPermissionGrantState(null /* admin */, info.packageName,
                         permission) == DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED) {
                     return true;
                 }
@@ -61,14 +66,14 @@
 
         // The app uses install-time permissions. Check whether the app requested one or more of the
         // permissions and was installed by enterprise policy, implicitly granting permissions.
-        if (mPackageManager.getInstallReason(info.packageName,
+        if (packageManager.getInstallReason(info.packageName,
                 new UserHandle(UserHandle.getUserId(info.uid)))
                         != PackageManager.INSTALL_REASON_POLICY) {
             return false;
         }
         try {
-            for (final String permission : mPermissions) {
-                if (mPackageManagerService.checkUidPermission(permission, info.uid)
+            for (final String permission : permissions) {
+                if (packageManagerService.checkUidPermission(permission, info.uid)
                         == PackageManager.PERMISSION_GRANTED) {
                     return true;
                 }
diff --git a/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java
new file mode 100644
index 0000000..b21f31f
--- /dev/null
+++ b/src/com/android/settings/applications/AppWithAdminGrantedPermissionsLister.java
@@ -0,0 +1,46 @@
+/*
+ * 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 android.content.pm.ApplicationInfo;
+import android.os.UserManager;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+
+/**
+ * Lists installed apps across all users that have been granted one or more specific permissions by
+ * the admin.
+ */
+public abstract class AppWithAdminGrantedPermissionsLister extends AppLister {
+    private final String[] mPermissions;
+    private final IPackageManagerWrapper mPackageManagerService;
+    private final DevicePolicyManagerWrapper mDevicePolicyManager;
+
+    public AppWithAdminGrantedPermissionsLister(String[] permissions,
+            PackageManagerWrapper packageManager, IPackageManagerWrapper packageManagerService,
+            DevicePolicyManagerWrapper devicePolicyManager, UserManager userManager) {
+        super(packageManager, userManager);
+        mPermissions = permissions;
+        mPackageManagerService = packageManagerService;
+        mDevicePolicyManager = devicePolicyManager;
+    }
+
+    @Override
+    protected boolean includeInCount(ApplicationInfo info) {
+        return AppWithAdminGrantedPermissionsCounter.includeInCount(mPermissions,
+                mDevicePolicyManager, mPm, mPackageManagerService, info);
+    }
+}
diff --git a/src/com/android/settings/applications/ApplicationFeatureProvider.java b/src/com/android/settings/applications/ApplicationFeatureProvider.java
index 5e986db..3266fe0 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProvider.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProvider.java
@@ -16,13 +16,14 @@
 
 package com.android.settings.applications;
 
-import com.android.settings.applications.instantapps.InstantAppButtonsController;
-
+import android.annotation.UserIdInt;
 import android.app.Fragment;
 import android.content.Intent;
 import android.view.View;
 
-import java.util.Set;
+import com.android.settings.applications.instantapps.InstantAppButtonsController;
+
+import java.util.List;
 
 public interface ApplicationFeatureProvider {
 
@@ -49,6 +50,14 @@
     void calculateNumberOfPolicyInstalledApps(boolean async, NumberOfAppsCallback callback);
 
     /**
+     * Asynchronously builds the list of apps installed on the device via policy in the current user
+     * and all its managed profiles.
+     *
+     * @param callback The callback to invoke with the result
+     */
+    void listPolicyInstalledApps(ListOfAppsCallback callback);
+
+    /**
      * Asynchronously calculates the total number of apps installed in the current user and all its
      * managed profiles that have been granted one or more of the given permissions by the admin.
      *
@@ -61,16 +70,28 @@
             NumberOfAppsCallback callback);
 
     /**
-     * Return the persistent preferred activities configured by the admin for the current user and
-     * all its managed profiles. A persistent preferred activity is an activity that the admin
-     * configured to always handle a given intent (e.g. open browser), even if the user has other
-     * apps installed that would also be able to handle the intent.
+     * Asynchronously builds the list of apps installed in the current user and all its
+     * managed profiles that have been granted one or more of the given permissions by the admin.
      *
+     * @param permissions Only consider apps that have been granted one or more of these permissions
+     *        by the admin, either at run-time or install-time
+     * @param callback The callback to invoke with the result
+     */
+    void listAppsWithAdminGrantedPermissions(String[] permissions, ListOfAppsCallback callback);
+
+    /**
+     * Return the persistent preferred activities configured by the admin for the given user.
+     * A persistent preferred activity is an activity that the admin configured to always handle a
+     * given intent (e.g. open browser), even if the user has other apps installed that would also
+     * be able to handle the intent.
+     *
+     * @param userId ID of the user for which to find persistent preferred activities
      * @param intent The intents for which to find persistent preferred activities
      *
-     * @return the persistent preferred activites for the given intent
+     * @return the persistent preferred activites for the given intents, ordered first by user id,
+     * then by package name
      */
-    Set<PersistentPreferredActivityInfo> findPersistentPreferredActivities(Intent[] intents);
+    List<UserAppInfo> findPersistentPreferredActivities(@UserIdInt int userId, Intent[] intents);
 
     /**
      * Callback that receives the number of packages installed on the device.
@@ -79,29 +100,10 @@
         void onNumberOfAppsResult(int num);
     }
 
-    public static class PersistentPreferredActivityInfo {
-        public final String packageName;
-        public final int userId;
-
-        public PersistentPreferredActivityInfo(String packageName, int userId) {
-            this.packageName = packageName;
-            this.userId = userId;
-        }
-
-        @Override
-        public boolean equals(Object other) {
-            if (!(other instanceof PersistentPreferredActivityInfo)) {
-                return false;
-            }
-            final PersistentPreferredActivityInfo otherActivityInfo
-                    = (PersistentPreferredActivityInfo) other;
-            return otherActivityInfo.packageName.equals(packageName)
-                    && otherActivityInfo.userId == userId;
-        }
-
-        @Override
-        public int hashCode() {
-            return packageName.hashCode() ^ userId;
-        }
+    /**
+     * Callback that receives the list of packages installed on the device.
+     */
+    interface ListOfAppsCallback {
+        void onListOfAppsResult(List<UserAppInfo> result);
     }
 }
diff --git a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
index 4171857..a744792 100644
--- a/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
+++ b/src/com/android/settings/applications/ApplicationFeatureProviderImpl.java
@@ -22,6 +22,7 @@
 import android.content.pm.ComponentInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
 import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
@@ -31,6 +32,7 @@
 import com.android.settings.applications.instantapps.InstantAppButtonsController;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
@@ -74,6 +76,13 @@
     }
 
     @Override
+    public void listPolicyInstalledApps(ListOfAppsCallback callback) {
+        final CurrentUserPolicyInstalledAppLister lister =
+                new CurrentUserPolicyInstalledAppLister(mPm, mUm, callback);
+        lister.execute();
+    }
+
+    @Override
     public void calculateNumberOfAppsWithAdminGrantedPermissions(String[] permissions,
             boolean async, NumberOfAppsCallback callback) {
         final CurrentUserAndManagedProfileAppWithAdminGrantedPermissionsCounter counter =
@@ -87,36 +96,43 @@
     }
 
     @Override
-    public Set<PersistentPreferredActivityInfo> findPersistentPreferredActivities(
-            Intent[] intents) {
-        final Set<PersistentPreferredActivityInfo> activities = new ArraySet<>();
-        final List<UserHandle> users = mUm.getUserProfiles();
+    public void listAppsWithAdminGrantedPermissions(String[] permissions,
+            ListOfAppsCallback callback) {
+        final CurrentUserAppWithAdminGrantedPermissionsLister lister =
+                new CurrentUserAppWithAdminGrantedPermissionsLister(permissions, mPm, mPms, mDpm,
+                        mUm, callback);
+        lister.execute();
+    }
+
+    @Override
+    public List<UserAppInfo> findPersistentPreferredActivities(int userId, Intent[] intents) {
+        final List<UserAppInfo> preferredActivities = new ArrayList<>();
+        final Set<UserAppInfo> uniqueApps = new ArraySet<>();
+        final UserInfo userInfo = mUm.getUserInfo(userId);
         for (final Intent intent : intents) {
-            for (final UserHandle user : users) {
-                final int userId = user.getIdentifier();
-                try {
-                    final ResolveInfo resolveInfo = mPms.findPersistentPreferredActivity(intent,
-                            userId);
-                    if (resolveInfo != null) {
-                        ComponentInfo componentInfo = null;
-                        if (resolveInfo.activityInfo != null) {
-                            componentInfo = resolveInfo.activityInfo;
-                        } else if (resolveInfo.serviceInfo != null) {
-                            componentInfo = resolveInfo.serviceInfo;
-                        } else if (resolveInfo.providerInfo != null) {
-                            componentInfo = resolveInfo.providerInfo;
-                        }
-                        if (componentInfo != null) {
-                            activities.add(new PersistentPreferredActivityInfo(
-                                    componentInfo.packageName, userId));
+            try {
+                final ResolveInfo resolveInfo =
+                        mPms.findPersistentPreferredActivity(intent, userId);
+                if (resolveInfo != null) {
+                    ComponentInfo componentInfo = null;
+                    if (resolveInfo.activityInfo != null) {
+                        componentInfo = resolveInfo.activityInfo;
+                    } else if (resolveInfo.serviceInfo != null) {
+                        componentInfo = resolveInfo.serviceInfo;
+                    } else if (resolveInfo.providerInfo != null) {
+                        componentInfo = resolveInfo.providerInfo;
+                    }
+                    if (componentInfo != null) {
+                        UserAppInfo info = new UserAppInfo(userInfo, componentInfo.applicationInfo);
+                        if (uniqueApps.add(info)) {
+                            preferredActivities.add(info);
                         }
                     }
-                } catch (RemoteException exception) {
                 }
+            } catch (RemoteException exception) {
             }
-
         }
-        return activities;
+        return preferredActivities;
     }
 
     private static class CurrentUserAndManagedProfilePolicyInstalledAppCounter
@@ -152,4 +168,39 @@
             mCallback.onNumberOfAppsResult(num);
         }
     }
+
+    private static class CurrentUserPolicyInstalledAppLister extends InstalledAppLister {
+        private ListOfAppsCallback mCallback;
+
+        CurrentUserPolicyInstalledAppLister(PackageManagerWrapper packageManager,
+                UserManager userManager, ListOfAppsCallback callback) {
+            super(packageManager, userManager);
+            mCallback = callback;
+        }
+
+        @Override
+        protected void onAppListBuilt(List<UserAppInfo> list) {
+            mCallback.onListOfAppsResult(list);
+        }
+    }
+
+    private static class CurrentUserAppWithAdminGrantedPermissionsLister extends
+            AppWithAdminGrantedPermissionsLister {
+        private ListOfAppsCallback mCallback;
+
+        CurrentUserAppWithAdminGrantedPermissionsLister(String[] permissions,
+                PackageManagerWrapper packageManager, IPackageManagerWrapper packageManagerService,
+                DevicePolicyManagerWrapper devicePolicyManager, UserManager userManager,
+                ListOfAppsCallback callback) {
+            super(permissions, packageManager, packageManagerService, devicePolicyManager,
+                    userManager);
+            mCallback = callback;
+        }
+
+        @Override
+        protected void onAppListBuilt(List<UserAppInfo> list) {
+            mCallback.onListOfAppsResult(list);
+        }
+    }
+
 }
diff --git a/src/com/android/settings/applications/AutofillManagerWrapper.java b/src/com/android/settings/applications/AutofillManagerWrapper.java
new file mode 100644
index 0000000..04091b0
--- /dev/null
+++ b/src/com/android/settings/applications/AutofillManagerWrapper.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.applications;
+
+import android.view.autofill.AutofillManager;
+
+/**
+ * This interface replicates a subset of the android.view.autofill.AutofillManager (AFM). The
+ * interface exists so that we can use a thin wrapper around the AFM in production code and a mock
+ * in tests. We cannot directly mock or shadow the AFM, because some of the methods we rely on are
+ * newer than the API version supported by Robolectric.
+ */
+public interface AutofillManagerWrapper {
+    /**
+     * Calls {@code AutofillManager.hasAutofillFeature()}.
+     *
+     * @see AutofillManager#hasAutofillFeature
+     */
+    public boolean hasAutofillFeature();
+
+    /**
+     * Calls {@code AutofillManager.isAutofillSupported()}.
+     *
+     * @see AutofillManager#isAutofillSupported
+     */
+    public boolean isAutofillSupported();
+}
diff --git a/src/com/android/settings/applications/AutofillManagerWrapperImpl.java b/src/com/android/settings/applications/AutofillManagerWrapperImpl.java
new file mode 100644
index 0000000..9dd1b33
--- /dev/null
+++ b/src/com/android/settings/applications/AutofillManagerWrapperImpl.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.applications;
+
+import android.view.autofill.AutofillManager;
+
+public class AutofillManagerWrapperImpl implements AutofillManagerWrapper {
+    private final AutofillManager mAfm;
+
+    public AutofillManagerWrapperImpl(AutofillManager afm) {
+        mAfm = afm;
+    }
+
+    @Override
+    public boolean hasAutofillFeature() {
+        if (mAfm == null) {
+            return false;
+        }
+
+        return mAfm.hasAutofillFeature();
+    }
+
+    @Override
+    public boolean isAutofillSupported() {
+        if (mAfm == null) {
+            return false;
+        }
+
+        return mAfm.isAutofillSupported();
+    }
+}
diff --git a/src/com/android/settings/applications/EnterpriseDefaultApps.java b/src/com/android/settings/applications/EnterpriseDefaultApps.java
new file mode 100644
index 0000000..f48b955
--- /dev/null
+++ b/src/com/android/settings/applications/EnterpriseDefaultApps.java
@@ -0,0 +1,67 @@
+/*
+ * 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 android.content.Intent;
+import android.net.Uri;
+import android.provider.ContactsContract;
+import android.provider.MediaStore;
+
+/**
+ * UI grouping of important intents that can be configured by device and profile owners.
+ */
+public enum EnterpriseDefaultApps {
+    BROWSER(new Intent[] {
+            buildIntent(Intent.ACTION_VIEW, Intent.CATEGORY_BROWSABLE, "http:", null)}),
+    CALENDAR(new Intent[] {
+            buildIntent(Intent.ACTION_INSERT, null, null, "vnd.android.cursor.dir/event")}),
+    CAMERA(new Intent[] {
+            new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
+            new Intent(MediaStore.ACTION_VIDEO_CAPTURE)}),
+    CONTACTS(new Intent[] {
+            buildIntent(Intent.ACTION_PICK, null, null, ContactsContract.Contacts.CONTENT_TYPE)}),
+    EMAIL(new Intent[] {
+            new Intent(Intent.ACTION_SENDTO), new Intent(Intent.ACTION_SEND),
+            new Intent(Intent.ACTION_SEND_MULTIPLE)}),
+    MAP(new Intent[] {buildIntent(Intent.ACTION_VIEW, null, "geo:", null)}),
+    PHONE(new Intent[] {new Intent(Intent.ACTION_DIAL), new Intent(Intent.ACTION_CALL)});
+    private final Intent[] mIntents;
+
+    EnterpriseDefaultApps(Intent[] intents) {
+        mIntents = intents;
+    }
+
+    public Intent[] getIntents() {
+        return mIntents;
+    }
+
+    private static Intent buildIntent(String action, String category, String protocol,
+            String type) {
+        final Intent intent = new Intent(action);
+        if (category != null) {
+            intent.addCategory(category);
+        }
+        if (protocol != null) {
+            intent.setData(Uri.parse(protocol));
+        }
+        if (type != null) {
+            intent.setType(type);
+        }
+        return intent;
+    }
+
+}
diff --git a/src/com/android/settings/applications/IPackageManagerWrapper.java b/src/com/android/settings/applications/IPackageManagerWrapper.java
index f885985..b4d1b85 100644
--- a/src/com/android/settings/applications/IPackageManagerWrapper.java
+++ b/src/com/android/settings/applications/IPackageManagerWrapper.java
@@ -17,6 +17,8 @@
 package com.android.settings.applications;
 
 import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.ParceledListSlice;
 import android.content.pm.ResolveInfo;
 import android.os.RemoteException;
 
@@ -41,4 +43,33 @@
      * @see android.content.pm.IPackageManager#findPersistentPreferredActivity
      */
     ResolveInfo findPersistentPreferredActivity(Intent intent, int userId) throws RemoteException;
+
+    /**
+     * Calls {@code IPackageManager.getPackageInfo()}.
+     *
+     * @see android.content.pm.IPackageManager#getPackageInfo
+     */
+    PackageInfo getPackageInfo(String packageName, int flags, int userId) throws RemoteException;
+
+    /**
+     * Calls {@code IPackageManager.getAppOpPermissionPackages()}.
+     *
+     * @see android.content.pm.IPackageManager#getAppOpPermissionPackages
+     */
+    String[] getAppOpPermissionPackages(String permissionName) throws RemoteException;
+
+    /**
+     * Calls {@code IPackageManager.isPackageAvailable()}.
+     *
+     * @see android.content.pm.IPackageManager#isPackageAvailable
+     */
+    boolean isPackageAvailable(String packageName, int userId) throws RemoteException;
+
+    /**
+     * Calls {@code IPackageManager.getPackagesHoldingPermissions()}.
+     *
+     * @see android.content.pm.IPackageManager#getPackagesHoldingPermissions
+     */
+    ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
+        String[] permissions, int flags, int userId) throws RemoteException;
 }
diff --git a/src/com/android/settings/applications/IPackageManagerWrapperImpl.java b/src/com/android/settings/applications/IPackageManagerWrapperImpl.java
index 5ea15b9..af5f378 100644
--- a/src/com/android/settings/applications/IPackageManagerWrapperImpl.java
+++ b/src/com/android/settings/applications/IPackageManagerWrapperImpl.java
@@ -18,6 +18,8 @@
 
 import android.content.Intent;
 import android.content.pm.IPackageManager;
+import android.content.pm.PackageInfo;
+import android.content.pm.ParceledListSlice;
 import android.content.pm.ResolveInfo;
 import android.os.RemoteException;
 
@@ -39,4 +41,27 @@
             throws RemoteException {
         return mPms.findPersistentPreferredActivity(intent, userId);
     }
+
+    @Override
+    public PackageInfo getPackageInfo(String packageName, int flags, int userId)
+            throws RemoteException {
+        return mPms.getPackageInfo(packageName, flags, userId);
+    }
+
+    @Override
+    public String[] getAppOpPermissionPackages(String permissionName) throws RemoteException {
+        return mPms.getAppOpPermissionPackages(permissionName);
+    }
+
+    @Override
+    public boolean isPackageAvailable(String packageName, int userId) throws RemoteException {
+        return mPms.isPackageAvailable(packageName, userId);
+    }
+
+    @Override
+    public ParceledListSlice<PackageInfo> getPackagesHoldingPermissions(
+        String[] permissions, int flags, int userId) throws RemoteException {
+        return mPms.getPackagesHoldingPermissions(permissions, flags, userId);
+    }
+
 }
diff --git a/src/com/android/settings/applications/InstalledAppCounter.java b/src/com/android/settings/applications/InstalledAppCounter.java
index 8065d49..932face 100644
--- a/src/com/android/settings/applications/InstalledAppCounter.java
+++ b/src/com/android/settings/applications/InstalledAppCounter.java
@@ -31,21 +31,24 @@
     public static final int IGNORE_INSTALL_REASON = -1;
 
     private final int mInstallReason;
-    private final PackageManagerWrapper mPackageManager;
 
     public InstalledAppCounter(Context context, int installReason,
             PackageManagerWrapper packageManager) {
         super(context, packageManager);
         mInstallReason = installReason;
-        mPackageManager = packageManager;
     }
 
     @Override
     protected boolean includeInCount(ApplicationInfo info) {
+        return includeInCount(mInstallReason, mPm, info);
+    }
+
+    public static boolean includeInCount(int installReason, PackageManagerWrapper pm,
+            ApplicationInfo info) {
         final int userId = UserHandle.getUserId(info.uid);
-        if (mInstallReason != IGNORE_INSTALL_REASON
-                && mPackageManager.getInstallReason(info.packageName,
-                        new UserHandle(userId)) != mInstallReason) {
+        if (installReason != IGNORE_INSTALL_REASON
+                && pm.getInstallReason(info.packageName,
+                        new UserHandle(userId)) != installReason) {
             return false;
         }
         if ((info.flags & ApplicationInfo.FLAG_UPDATED_SYSTEM_APP) != 0) {
@@ -57,7 +60,7 @@
         Intent launchIntent = new Intent(Intent.ACTION_MAIN, null)
                 .addCategory(Intent.CATEGORY_LAUNCHER)
                 .setPackage(info.packageName);
-        List<ResolveInfo> intents = mPm.queryIntentActivitiesAsUser(
+        List<ResolveInfo> intents = pm.queryIntentActivitiesAsUser(
                 launchIntent,
                 PackageManager.GET_DISABLED_COMPONENTS
                         | PackageManager.MATCH_DIRECT_BOOT_AWARE
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index c0d2dd8..e9b7481 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -526,6 +526,9 @@
         super.onActivityResult(requestCode, resultCode, data);
         switch (requestCode) {
             case REQUEST_UNINSTALL:
+                // Refresh option menu
+                getActivity().invalidateOptionsMenu();
+
                 if (mDisableAfterUninstall) {
                     mDisableAfterUninstall = false;
                     new DisableChanger(this, mAppEntry.info,
diff --git a/src/com/android/settings/applications/InstalledAppLister.java b/src/com/android/settings/applications/InstalledAppLister.java
new file mode 100644
index 0000000..d8e7c58
--- /dev/null
+++ b/src/com/android/settings/applications/InstalledAppLister.java
@@ -0,0 +1,33 @@
+/*
+ * 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 android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.os.UserManager;
+
+public abstract class InstalledAppLister extends AppLister {
+
+    public InstalledAppLister(PackageManagerWrapper packageManager, UserManager userManager) {
+        super(packageManager, userManager);
+    }
+
+    @Override
+    protected boolean includeInCount(ApplicationInfo info) {
+        return InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY, mPm, info);
+    }
+}
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index f24c3f7..be3bdfa 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -17,6 +17,7 @@
 package com.android.settings.applications;
 
 import android.annotation.IdRes;
+import android.annotation.Nullable;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
@@ -130,13 +131,13 @@
     public static final int SIZE_EXTERNAL = 2;
 
     // Filter options used for displayed list of applications
-    // The order which they appear is the order they will show when spinner is present.
+    // Filters will appear sorted based on their value defined here.
     public static final int FILTER_APPS_POWER_WHITELIST = 0;
     public static final int FILTER_APPS_POWER_WHITELIST_ALL = 1;
     public static final int FILTER_APPS_ALL = 2;
     public static final int FILTER_APPS_ENABLED = 3;
-    public static final int FILTER_APPS_DISABLED = 4;
-    public static final int FILTER_APPS_INSTANT = 5;
+    public static final int FILTER_APPS_INSTANT = 4;
+    public static final int FILTER_APPS_DISABLED = 5;
     public static final int FILTER_APPS_BLOCKED = 6;
     public static final int FILTER_APPS_PERSONAL = 7;
     public static final int FILTER_APPS_WORK = 8;
@@ -416,20 +417,31 @@
         if (mListType == LIST_TYPE_HIGH_POWER) {
             mFilterAdapter.enableFilter(FILTER_APPS_POWER_WHITELIST_ALL);
         }
-        if (mListType == LIST_TYPE_STORAGE) {
-            AppFilter filter = new VolumeFilter(mVolumeUuid);
-            if (mStorageType == STORAGE_TYPE_MUSIC) {
+
+        AppFilter overrideFilter = getOverrideFilter(mListType, mStorageType, mVolumeUuid);
+        if (overrideFilter != null) {
+            mApplications.setOverrideFilter(overrideFilter);
+        }
+    }
+
+    @VisibleForTesting
+    static @Nullable AppFilter getOverrideFilter(int listType, int storageType, String volumeUuid) {
+        AppFilter filter = new VolumeFilter(volumeUuid);
+        if (listType == LIST_TYPE_STORAGE) {
+            if (storageType == STORAGE_TYPE_MUSIC) {
                 filter = new CompoundFilter(ApplicationsState.FILTER_AUDIO, filter);
             } else {
                 filter = new CompoundFilter(ApplicationsState.FILTER_OTHER_APPS, filter);
             }
-            mApplications.setOverrideFilter(filter);
+            return filter;
         }
-        if (mListType == LIST_TYPE_GAMES) {
-            mApplications.setOverrideFilter(ApplicationsState.FILTER_GAMES);
-        } else if (mListType == LIST_TYPE_MOVIES) {
-            mApplications.setOverrideFilter(ApplicationsState.FILTER_MOVIES);
+        if (listType == LIST_TYPE_GAMES) {
+            return new CompoundFilter(ApplicationsState.FILTER_GAMES, filter);
+        } else if (listType == LIST_TYPE_MOVIES) {
+            return new CompoundFilter(ApplicationsState.FILTER_MOVIES, filter);
         }
+
+        return null;
     }
 
     private int getDefaultFilter() {
diff --git a/src/com/android/settings/applications/RunningState.java b/src/com/android/settings/applications/RunningState.java
index dd44887..d4abe6c 100644
--- a/src/com/android/settings/applications/RunningState.java
+++ b/src/com/android/settings/applications/RunningState.java
@@ -500,7 +500,7 @@
                 si.mRunningService = service;
                 try {
                     si.mServiceInfo = ActivityThread.getPackageManager().getServiceInfo(
-                            service.service, PackageManager.MATCH_UNINSTALLED_PACKAGES,
+                            service.service, PackageManager.MATCH_ANY_USER,
                             UserHandle.getUserId(service.uid));
 
                     if (si.mServiceInfo == null) {
diff --git a/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.java
new file mode 100644
index 0000000..3735c01
--- /dev/null
+++ b/src/com/android/settings/applications/SpecialAppAccessPreferenceController.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.applications;
+
+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.datausage.DataSaverBackend;
+
+public class SpecialAppAccessPreferenceController extends PreferenceController {
+
+    private static final String KEY_SPECIAL_ACCESS = "special_access";
+
+    private DataSaverBackend mDataSaverBackend;
+
+    public SpecialAppAccessPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_SPECIAL_ACCESS;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        if (mDataSaverBackend == null) {
+            mDataSaverBackend = new DataSaverBackend(mContext);
+        }
+        final int count = mDataSaverBackend.getWhitelistedCount();
+        preference.setSummary(mContext.getResources().getQuantityString(
+            R.plurals.special_access_summary, count, count));
+    }
+}
diff --git a/src/com/android/settings/applications/UserAppInfo.java b/src/com/android/settings/applications/UserAppInfo.java
new file mode 100644
index 0000000..04fa713
--- /dev/null
+++ b/src/com/android/settings/applications/UserAppInfo.java
@@ -0,0 +1,58 @@
+/*
+ * 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 android.content.pm.ApplicationInfo;
+import android.content.pm.UserInfo;
+import android.text.TextUtils;
+
+import java.util.Objects;
+
+/**
+ * Simple class for bringing together information about application and user for which it was
+ * installed.
+ */
+public class UserAppInfo {
+    public final UserInfo userInfo;
+    public final ApplicationInfo appInfo;
+
+    public UserAppInfo(UserInfo mUserInfo, ApplicationInfo mAppInfo) {
+        this.userInfo = mUserInfo;
+        this.appInfo = mAppInfo;
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (other == this) {
+            return true;
+        }
+        if (other == null || getClass() != other.getClass()) {
+            return false;
+        }
+        final UserAppInfo that = (UserAppInfo) other;
+
+        // As UserInfo and AppInfo do not support hashcode/equals contract, assume
+        // equality based on corresponding identity fields.
+        return that.userInfo.id == userInfo.id && TextUtils.equals(that.appInfo.packageName,
+                appInfo.packageName);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(userInfo.id, appInfo.packageName);
+    }
+}
diff --git a/src/com/android/settings/applications/defaultapps/AutofillPickerActivity.java b/src/com/android/settings/applications/autofill/AutofillPickerActivity.java
similarity index 88%
rename from src/com/android/settings/applications/defaultapps/AutofillPickerActivity.java
rename to src/com/android/settings/applications/autofill/AutofillPickerActivity.java
index a173909..93b9880 100644
--- a/src/com/android/settings/applications/defaultapps/AutofillPickerActivity.java
+++ b/src/com/android/settings/applications/autofill/AutofillPickerActivity.java
@@ -11,16 +11,17 @@
  * 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;
+package com.android.settings.applications.autofill;
 
 import android.content.Intent;
 import android.os.Bundle;
 
 import com.android.settings.R;
 import com.android.settings.SettingsActivity;
+import com.android.settings.applications.defaultapps.DefaultAutofillPicker;
 
 /**
- * Standalone activity used to launch {@link DefaultAppPickerFragment} from a
+ * Standalone activity used to launch a {@link DefaultAutofillPicker} fragment from a
  * {@link android.provider.Settings#ACTION_REQUEST_SET_AUTOFILL_SERVICE} intent.
  */
 public class AutofillPickerActivity extends SettingsActivity {
@@ -32,7 +33,6 @@
         intent.putExtra(EXTRA_SHOW_FRAGMENT, DefaultAutofillPicker.class.getName());
         intent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.autofill_app);
         intent.putExtra(DefaultAutofillPicker.EXTRA_PACKAGE_NAME, packageName);
-
         super.onCreate(savedInstanceState);
     }
 
diff --git a/src/com/android/settings/applications/autofill/AutofillPickerTrampolineActivity.java b/src/com/android/settings/applications/autofill/AutofillPickerTrampolineActivity.java
new file mode 100644
index 0000000..1db3c82
--- /dev/null
+++ b/src/com/android/settings/applications/autofill/AutofillPickerTrampolineActivity.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.applications.autofill;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.autofill.AutofillManager;
+
+import com.android.settings.applications.defaultapps.DefaultAutofillPicker;
+
+/**
+ * Standalone activity used to launch a {@link DefaultAutofillPicker} fragment from a
+ * {@link android.provider.Settings#ACTION_REQUEST_SET_AUTOFILL_SERVICE} intent.
+ *
+ * <p>It first check for cases that can fail fast, then forward to {@link AutofillPickerActivity}
+ * if necessary.
+ */
+public class AutofillPickerTrampolineActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // First check if the current user's service already belongs to the app...
+        final Intent intent = getIntent();
+        final String packageName = intent.getData().getSchemeSpecificPart();
+        final String currentService = DefaultAutofillPicker.getDefaultKey(this);
+        if (currentService != null && currentService.startsWith(packageName)) {
+            // ...and succeed right away if it does.
+            setResult(RESULT_OK);
+            finish();
+            return;
+        }
+
+        // Then check if the Autofill is available for the current user...
+        final AutofillManager afm = getSystemService(AutofillManager.class);
+        if (afm == null || !afm.hasAutofillFeature() || !afm.isAutofillSupported()) {
+            // ... and fail right away if it is not.
+            setResult(RESULT_CANCELED);
+            finish();
+            return;
+        }
+
+        // Otherwise, go ahead and show the real UI...
+        final Intent newIntent = new Intent(this, AutofillPickerActivity.class)
+                .setFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
+                .setData(intent.getData());
+        startActivity(newIntent);
+        finish();
+    }
+}
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
index 9ab704e..73f4bbe 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
@@ -55,8 +55,8 @@
         if (TextUtils.isEmpty(confirmationMessage)) {
             super.onRadioButtonClicked(selected);
         } else if (activity != null) {
-            final DialogFragment fragment = ConfirmationDialogFragment.newInstance(
-                    this, selectedKey, confirmationMessage);
+            final DialogFragment fragment =
+                    newConfirmationDialogFragment(selectedKey, confirmationMessage);
             fragment.show(activity.getFragmentManager(), ConfirmationDialogFragment.TAG);
         }
     }
@@ -74,6 +74,11 @@
         }
     }
 
+    protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
+            CharSequence confirmationMessage) {
+        return ConfirmationDialogFragment.newInstance(this, selectedKey, confirmationMessage);
+    }
+
     protected CharSequence getConfirmationMessage(CandidateInfo info) {
         return null;
     }
@@ -85,6 +90,12 @@
         public static final String EXTRA_KEY = "extra_key";
         public static final String EXTRA_MESSAGE = "extra_message";
 
+        private final DialogInterface.OnClickListener mCancelListener;
+
+        private ConfirmationDialogFragment(DialogInterface.OnClickListener cancelListener) {
+            mCancelListener = cancelListener;
+        }
+
         @Override
         public int getMetricsCategory() {
             return MetricsProto.MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
@@ -92,7 +103,14 @@
 
         public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
                 String key, CharSequence message) {
-            final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
+            return newInstance(parent, key, message, null);
+        }
+
+        // TODO: add test case for cancelListener
+        public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
+                String key, CharSequence message, DialogInterface.OnClickListener cancelListener) {
+            final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment(
+                    cancelListener);
             final Bundle argument = new Bundle();
             argument.putString(EXTRA_KEY, key);
             argument.putCharSequence(EXTRA_MESSAGE, message);
@@ -107,7 +125,7 @@
             final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
                     .setMessage(bundle.getCharSequence(EXTRA_MESSAGE))
                     .setPositiveButton(android.R.string.ok, this)
-                    .setNegativeButton(android.R.string.cancel, null);
+                    .setNegativeButton(android.R.string.cancel, mCancelListener);
             return builder.create();
         }
 
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
index 037cddf..6dcf7b8 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
@@ -16,18 +16,29 @@
 
 package com.android.settings.applications.defaultapps;
 
+import android.Manifest;
 import android.app.Activity;
 import android.content.ComponentName;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.ServiceInfo;
+import android.net.Uri;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.provider.Settings;
 import android.service.autofill.AutofillService;
 import android.service.autofill.AutofillServiceInfo;
+import android.support.v7.preference.Preference;
 import android.text.Html;
 import android.text.TextUtils;
+import android.util.Log;
 
+import com.android.internal.content.PackageMonitor;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 
@@ -36,10 +47,44 @@
 
 public class DefaultAutofillPicker extends DefaultAppPickerFragment {
 
+    private static final String TAG = "DefaultAutofillPicker";
+
     static final String SETTING = Settings.Secure.AUTOFILL_SERVICE;
     static final Intent AUTOFILL_PROBE = new Intent(AutofillService.SERVICE_INTERFACE);
 
-    static final String EXTRA_PACKAGE_NAME = "package_name";
+    /**
+     * Extra set when the fragment is implementing ACTION_REQUEST_SET_AUTOFILL_SERVICE.
+     */
+    public static final String EXTRA_PACKAGE_NAME = "package_name";
+
+    /**
+     * Set when the fragment is implementing ACTION_REQUEST_SET_AUTOFILL_SERVICE.
+     */
+    public DialogInterface.OnClickListener mCancelListener;
+    private final Handler mHandler = new Handler();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Activity activity = getActivity();
+        if (activity != null && activity.getIntent().getStringExtra(EXTRA_PACKAGE_NAME) != null) {
+            mCancelListener = (d, w) -> {
+                activity.setResult(Activity.RESULT_CANCELED);
+                activity.finish();
+            };
+        }
+
+        mSettingsPackageMonitor.register(getActivity(), getActivity().getMainLooper(), false);
+        update();
+    }
+
+    @Override
+    protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
+            CharSequence confirmationMessage) {
+        return ConfirmationDialogFragment.newInstance(this, selectedKey, confirmationMessage,
+                mCancelListener);
+    }
 
     @Override
     public int getMetricsCategory() {
@@ -51,21 +96,104 @@
         return true;
     }
 
+    /**
+     * Monitor coming and going auto fill services and calls {@link #update()} when necessary
+     */
+    private final PackageMonitor mSettingsPackageMonitor = new PackageMonitor() {
+        @Override
+        public void onPackageAdded(String packageName, int uid) {
+            mHandler.post(() -> update());
+        }
+
+        @Override
+        public void onPackageModified(String packageName) {
+            mHandler.post(() -> update());
+        }
+
+        @Override
+        public void onPackageRemoved(String packageName, int uid) {
+            mHandler.post(() -> update());
+        }
+    };
+
+    /**
+     * Update the data in this UI.
+     */
+    private void update() {
+        updateCandidates();
+        addAddServicePreference();
+    }
+
+    @Override
+    public void onDestroy() {
+        mSettingsPackageMonitor.unregister();
+        super.onDestroy();
+    }
+
+    /**
+     * Gets the preference that allows to add a new autofill service.
+     *
+     * @return The preference or {@code null} if no service can be added
+     */
+    private Preference newAddServicePreferenceOrNull() {
+        final String searchUri = Settings.Secure.getString(getActivity().getContentResolver(),
+                Settings.Secure.AUTOFILL_SERVICE_SEARCH_URI);
+        if (TextUtils.isEmpty(searchUri)) {
+            return null;
+        }
+
+        final Intent addNewServiceIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(searchUri));
+        Preference preference = new Preference(getPrefContext());
+        preference.setTitle(R.string.print_menu_item_add_service);
+        preference.setIcon(R.drawable.ic_menu_add);
+        preference.setOrder(Integer.MAX_VALUE -1);
+        preference.setIntent(addNewServiceIntent);
+        preference.setPersistent(false);
+        return preference;
+    }
+
+    /**
+     * Add a preference that allows the user to add a service if the market link for that is
+     * configured.
+     */
+    private void addAddServicePreference() {
+        final Preference addNewServicePreference = newAddServicePreferenceOrNull();
+        if (addNewServicePreference != null) {
+            getPreferenceScreen().addPreference(addNewServicePreference);
+        }
+    }
+
     @Override
     protected List<DefaultAppInfo> getCandidates() {
         final List<DefaultAppInfo> candidates = new ArrayList<>();
         final List<ResolveInfo> resolveInfos = mPm.getPackageManager()
                 .queryIntentServices(AUTOFILL_PROBE, PackageManager.GET_META_DATA);
         for (ResolveInfo info : resolveInfos) {
-            candidates.add(new DefaultAppInfo(mPm, mUserId, new ComponentName(
-                    info.serviceInfo.packageName, info.serviceInfo.name)));
+            final String permission = info.serviceInfo.permission;
+            // TODO(b/37563972): remove BIND_AUTOFILL once clients use BIND_AUTOFILL_SERVICE
+            if (Manifest.permission.BIND_AUTOFILL_SERVICE.equals(permission)
+                    || Manifest.permission.BIND_AUTOFILL.equals(permission)) {
+                candidates.add(new DefaultAppInfo(mPm, mUserId, new ComponentName(
+                        info.serviceInfo.packageName, info.serviceInfo.name)));
+            }
         }
         return candidates;
     }
 
+    public static String getDefaultKey(Context context) {
+        String setting = Settings.Secure.getString(context.getContentResolver(), SETTING);
+        if (setting != null) {
+            ComponentName componentName = ComponentName.unflattenFromString(setting);
+            if (componentName != null) {
+                return componentName.flattenToString();
+            }
+        }
+        return null;
+    }
+
     @Override
     protected String getDefaultKey() {
-        return Settings.Secure.getString(getContext().getContentResolver(), SETTING);
+        return getDefaultKey(getContext());
     }
 
     @Override
@@ -121,9 +249,15 @@
                 final String flattenKey = new ComponentName(
                         serviceInfo.packageName, serviceInfo.name).flattenToString();
                 if (TextUtils.equals(mSelectedKey, flattenKey)) {
-                    final String settingsActivity = new AutofillServiceInfo(
-                            mPackageManager, serviceInfo)
-                            .getSettingsActivity();
+                    final String settingsActivity;
+                    try {
+                        settingsActivity = new AutofillServiceInfo(mPackageManager, serviceInfo)
+                                .getSettingsActivity();
+                    } catch (SecurityException e) {
+                        // Service does not declare the proper permission, ignore it.
+                        Log.w(TAG, "Error getting info for " + serviceInfo + ": " + e);
+                        return null;
+                    }
                     if (TextUtils.isEmpty(settingsActivity)) {
                         return null;
                     }
diff --git a/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java b/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
index 161f2df..1fd10ff 100644
--- a/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
+++ b/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceController.java
@@ -21,16 +21,25 @@
 import android.content.Intent;
 import android.provider.Settings;
 import android.text.TextUtils;
+import android.view.autofill.AutofillManager;
+
+import com.android.settings.applications.AutofillManagerWrapper;
+import com.android.settings.applications.AutofillManagerWrapperImpl;
 
 public class DefaultAutofillPreferenceController extends DefaultAppPreferenceController {
+    private AutofillManagerWrapper mAutofillManager;
 
     public DefaultAutofillPreferenceController(Context context) {
         super(context);
+
+        mAutofillManager = new AutofillManagerWrapperImpl(
+                mContext.getSystemService(AutofillManager.class));
     }
 
     @Override
     public boolean isAvailable() {
-        return true;
+        return mAutofillManager.hasAutofillFeature()
+                && mAutofillManager.isAutofillSupported();
     }
 
     @Override
diff --git a/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
new file mode 100644
index 0000000..8e0f922
--- /dev/null
+++ b/src/com/android/settings/backup/BackupSettingsActivityPreferenceController.java
@@ -0,0 +1,64 @@
+/*
+ * 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.backup;
+
+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;
+
+public class BackupSettingsActivityPreferenceController extends PreferenceController {
+    private static final String KEY_BACKUP_SETTINGS = "backup_settings";
+    private static final String TAG = "BackupSettingActivityPC" ;
+
+    private final UserManager mUm;
+    private final BackupManager mBackupManager;
+
+    public BackupSettingsActivityPreferenceController(Context context) {
+        super(context);
+        mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
+        mBackupManager = new BackupManager(context);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return mUm.isAdminUser();
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return KEY_BACKUP_SETTINGS;
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        final boolean backupEnabled = mBackupManager.isBackupEnabled();
+
+        preference.setSummary(backupEnabled
+                ? R.string.accessibility_feature_state_on
+                : R.string.accessibility_feature_state_off);
+    }
+}
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
index ed63fcb..97382c3 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialog.java
@@ -24,16 +24,17 @@
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.os.Bundle;
+import android.support.annotation.VisibleForTesting;
 
 /**
  * BluetoothPairingDialog asks the user to enter a PIN / Passkey / simple confirmation
  * for pairing with a remote Bluetooth device. It is an activity that appears as a dialog.
  */
-public final class BluetoothPairingDialog extends Activity {
+public class BluetoothPairingDialog extends Activity {
     public static final String FRAGMENT_TAG = "bluetooth.pairing.fragment";
 
     private BluetoothPairingController mBluetoothPairingController;
-    private boolean mReceiverRegistered;
+    private boolean mReceiverRegistered = false;
 
     /**
      * Dismiss the dialog if the bond state changes to bonded or none,
@@ -62,23 +63,26 @@
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        boolean fragmentFound = true;
-
-        BluetoothPairingDialogFragment bluetoothFragment =
-                (BluetoothPairingDialogFragment) getFragmentManager()
-                        .findFragmentByTag(FRAGMENT_TAG);
         Intent intent = getIntent();
         mBluetoothPairingController = new BluetoothPairingController(intent, this);
-
-        // check if the fragment exists already
+        // build the dialog fragment
+        boolean fragmentFound = true;
+        // check if the fragment has been preloaded
+        BluetoothPairingDialogFragment bluetoothFragment =
+            (BluetoothPairingDialogFragment) getFragmentManager().findFragmentByTag(FRAGMENT_TAG);
+        // dismiss the fragment if it is already used
+        if (bluetoothFragment != null && (bluetoothFragment.isPairingControllerSet()
+            || bluetoothFragment.isPairingDialogActivitySet())) {
+            bluetoothFragment.dismiss();
+            bluetoothFragment = null;
+        }
+        // build a new fragment if it is null
         if (bluetoothFragment == null) {
             fragmentFound = false;
             bluetoothFragment = new BluetoothPairingDialogFragment();
         }
-
-        // set the controller
         bluetoothFragment.setPairingController(mBluetoothPairingController);
-
+        bluetoothFragment.setPairingDialogActivity(this);
         // pass the fragment to the manager when it is created from scratch
         if (!fragmentFound) {
             bluetoothFragment.show(getFragmentManager(), FRAGMENT_TAG);
@@ -101,8 +105,15 @@
         }
     }
 
-    private void dismiss() {
+    @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 3d786fb..7b8fc6c 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingDialogFragment.java
@@ -47,6 +47,7 @@
     private AlertDialog.Builder mBuilder;
     private AlertDialog mDialog;
     private BluetoothPairingController mPairingController;
+    private BluetoothPairingDialog mPairingDialogActivity;
     private EditText mPairingView;
     /**
      * The interface we expect a listener to implement. Typically this should be done by
@@ -61,9 +62,13 @@
 
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
-        if (mPairingController == null) {
+        if (!isPairingControllerSet()) {
             throw new IllegalStateException(
-                    "Must call setPairingController() before showing dialog");
+                "Must call setPairingController() before showing dialog");
+        }
+        if (!isPairingDialogActivitySet()) {
+            throw new IllegalStateException(
+                "Must call setPairingDialogActivity() before showing dialog");
         }
         mBuilder = new AlertDialog.Builder(getActivity());
         mDialog = setupDialog();
@@ -97,6 +102,7 @@
         } else if (which == DialogInterface.BUTTON_NEGATIVE) {
             mPairingController.onDialogNegativeClick(this);
         }
+        mPairingDialogActivity.dismiss();
     }
 
     @Override
@@ -119,8 +125,8 @@
      * controller may not be substituted once it is assigned. Forcibly switching a
      * controller for a new one will lead to undefined behavior.
      */
-    public void setPairingController(BluetoothPairingController pairingController) {
-        if (mPairingController != null) {
+    void setPairingController(BluetoothPairingController pairingController) {
+        if (isPairingControllerSet()) {
             throw new IllegalStateException("The controller can only be set once. "
                     + "Forcibly replacing it will lead to undefined behavior");
         }
@@ -128,6 +134,33 @@
     }
 
     /**
+     * Checks whether mPairingController is set
+     * @return True when mPairingController is set, False otherwise
+     */
+    boolean isPairingControllerSet() {
+        return mPairingController != null;
+    }
+
+    /**
+     * Sets the BluetoothPairingDialog activity that started this fragment
+     * @param pairingDialogActivity The pairing dialog activty that started this fragment
+     */
+    void setPairingDialogActivity(BluetoothPairingDialog pairingDialogActivity) {
+        if (isPairingDialogActivitySet()) {
+            throw new IllegalStateException("The pairing dialog activity can only be set once");
+        }
+        mPairingDialogActivity = pairingDialogActivity;
+    }
+
+    /**
+     * Checks whether mPairingDialogActivity is set
+     * @return True when mPairingDialogActivity is set, False otherwise
+     */
+    boolean isPairingDialogActivitySet() {
+        return mPairingDialogActivity != null;
+    }
+
+    /**
      * Creates the appropriate type of dialog and returns it.
      */
     private AlertDialog setupDialog() {
diff --git a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
index 96aace9..4d02fd5 100644
--- a/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
+++ b/src/com/android/settings/bluetooth/BluetoothPairingRequest.java
@@ -52,7 +52,7 @@
     if (powerManager.isInteractive() && shouldShowDialog) {
       // Since the screen is on and the BT-related activity is in the foreground,
       // just open the dialog
-      context.startActivity(pairingIntent);
+      context.startActivityAsUser(pairingIntent, UserHandle.CURRENT);
     } else {
       // Put up a notification that leads to the dialog
       intent.setClass(context, BluetoothPairingService.class);
diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
index aeb7efb..6a1c06c 100644
--- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
+++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
@@ -96,9 +96,7 @@
                         keys.add(NfcPreferenceController.KEY_TOGGLE_NFC);
                         keys.add(NfcPreferenceController.KEY_ANDROID_BEAM_SETTINGS);
                     }
-                    if (!pm.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) {
-                        keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
-                    }
+                    keys.add(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
                     return keys;
                 }
             };
diff --git a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
index 6c23b39..69f174b 100644
--- a/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
+++ b/src/com/android/settings/core/instrumentation/SharedPreferencesLogger.java
@@ -144,7 +144,7 @@
             } catch (Exception e) {
             }
             try {
-                pm.getPackageInfo(value, PackageManager.MATCH_UNINSTALLED_PACKAGES);
+                pm.getPackageInfo(value, PackageManager.MATCH_ANY_USER);
                 logPackageName(key, value);
             } catch (PackageManager.NameNotFoundException e) {
                 // Clearly not a package, and it's unlikely this preference is in prefSet, so
diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
index 78d6122..342888e 100644
--- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
+++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java
@@ -20,9 +20,9 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.provider.Settings;
-import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.Log;
@@ -51,22 +51,17 @@
     private static final String DASHBOARD_TILE_PREF_KEY_PREFIX = "dashboard_tile_pref_";
     private static final String META_DATA_KEY_INTENT_ACTION = "com.android.settings.intent.action";
 
-
     protected final Context mContext;
+
     private final MetricsFeatureProvider mMetricsFeatureProvider;
     private final CategoryManager mCategoryManager;
+    private final PackageManager mPackageManager;
 
     public DashboardFeatureProviderImpl(Context context) {
         mContext = context.getApplicationContext();
         mCategoryManager = CategoryManager.get(context, getExtraIntentAction());
         mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
-    }
-
-    @VisibleForTesting
-    DashboardFeatureProviderImpl(Context context, CategoryManager categoryManager) {
-        mContext = context.getApplicationContext();
-        mCategoryManager = categoryManager;
-        mMetricsFeatureProvider = FeatureFactory.getFactory(context).getMetricsFeatureProvider();
+        mPackageManager = context.getPackageManager();
     }
 
     @Override
@@ -208,6 +203,10 @@
 
     private void launchIntentOrSelectProfile(Activity activity, Tile tile, Intent intent,
             int sourceMetricCategory) {
+        if (!isIntentResolvable(intent)) {
+            Log.w(TAG, "Cannot resolve intent, skipping. " + intent);
+            return;
+        }
         ProfileSelectDialog.updateUserHandlesIfNeeded(mContext, tile);
         if (tile.userHandle == null) {
             mMetricsFeatureProvider.logDashboardStartIntent(mContext, intent, sourceMetricCategory);
@@ -219,4 +218,8 @@
             ProfileSelectDialog.show(activity.getFragmentManager(), tile);
         }
     }
+
+    private boolean isIntentResolvable(Intent intent) {
+        return mPackageManager.resolveActivity(intent, 0) != null;
+    }
 }
diff --git a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
index 07a7293..0cc3d15 100644
--- a/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
+++ b/src/com/android/settings/dashboard/ProgressiveDisclosureMixin.java
@@ -120,7 +120,7 @@
      * Whether the screen should be collapsed.
      */
     public boolean shouldCollapse(PreferenceScreen screen) {
-        return !mUserExpanded && screen.getPreferenceCount() >= mTileLimit;
+        return !mUserExpanded && screen.getPreferenceCount() > mTileLimit;
     }
 
     /**
@@ -218,7 +218,7 @@
                 return pref;
             }
             if (pref instanceof PreferenceGroup) {
-                final Preference returnedPreference = ((PreferenceGroup)pref).findPreference(key);
+                final Preference returnedPreference = ((PreferenceGroup) pref).findPreference(key);
                 if (returnedPreference != null) {
                     return returnedPreference;
                 }
@@ -231,7 +231,7 @@
     /**
      * Add preference to collapsed list.
      */
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     void addToCollapsedList(Preference preference) {
         // Insert preference based on it's order.
         int insertionIndex = Collections.binarySearch(mCollapsedPrefs, preference);
@@ -242,12 +242,12 @@
         updateExpandButtonSummary();
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     List<Preference> getCollapsedPrefs() {
         return mCollapsedPrefs;
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     void updateExpandButtonSummary() {
         final int size = mCollapsedPrefs.size();
         if (size == 0) {
@@ -257,8 +257,11 @@
         } else {
             CharSequence summary = mCollapsedPrefs.get(0).getTitle();
             for (int i = 1; i < size; i++) {
-                summary = mContext.getString(R.string.join_many_items_middle, summary,
-                        mCollapsedPrefs.get(i).getTitle());
+                final CharSequence nextSummary = mCollapsedPrefs.get(i).getTitle();
+                if (!TextUtils.isEmpty(nextSummary)) {
+                    summary = mContext.getString(R.string.join_many_items_middle, summary,
+                            nextSummary);
+                }
             }
             mExpandButton.setSummary(summary);
         }
diff --git a/src/com/android/settings/datausage/BillingCycleSettings.java b/src/com/android/settings/datausage/BillingCycleSettings.java
index aca4809..dda984b 100644
--- a/src/com/android/settings/datausage/BillingCycleSettings.java
+++ b/src/com/android/settings/datausage/BillingCycleSettings.java
@@ -14,16 +14,13 @@
 
 package com.android.settings.datausage;
 
-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.NumberFormat;
 import android.net.NetworkPolicy;
 import android.net.NetworkTemplate;
 import android.os.Bundle;
@@ -45,7 +42,8 @@
 import com.android.settingslib.NetworkPolicyEditor;
 import com.android.settingslib.net.DataUsageController;
 
-import java.text.ParseException;
+import static android.net.NetworkPolicy.LIMIT_DISABLED;
+import static android.net.NetworkPolicy.WARNING_DISABLED;
 
 public class BillingCycleSettings extends DataUsageBase implements
         Preference.OnPreferenceChangeListener, DataUsageEditController {
@@ -248,6 +246,7 @@
             final boolean isLimit = getArguments().getBoolean(EXTRA_LIMIT);
             final long bytes = isLimit ? editor.getPolicyLimitBytes(template)
                     : editor.getPolicyWarningBytes(template);
+            final long limitDisabled = isLimit ? LIMIT_DISABLED : WARNING_DISABLED;
 
             if (bytes > 1.5f * GB_IN_BYTES) {
                 final String bytesText = formatText(bytes / (float) GB_IN_BYTES);
@@ -266,7 +265,7 @@
 
         private String formatText(float v) {
             v = Math.round(v * 100) / 100f;
-            return NumberFormat.getInstance().format(v);
+            return String.valueOf(v);
         }
 
         @Override
@@ -279,20 +278,15 @@
 
             final NetworkTemplate template = getArguments().getParcelable(EXTRA_TEMPLATE);
             final boolean isLimit = getArguments().getBoolean(EXTRA_LIMIT);
-            EditText bytesField = mView.findViewById(R.id.bytes);
-            Spinner spinner = mView.findViewById(R.id.size_spinner);
+            EditText bytesField = (EditText) mView.findViewById(R.id.bytes);
+            Spinner spinner = (Spinner) mView.findViewById(R.id.size_spinner);
 
             String bytesString = bytesField.getText().toString();
-
-            double input = 0;
-            try {
-                input = NumberFormat.getInstance().parse(bytesString).doubleValue();
-            } catch (ParseException e) {
-                Log.w(TAG, "Failed to parse byte value " + bytesString);
+            if (bytesString.isEmpty()) {
+                bytesString = "0";
             }
-
-            final long bytes = (long) (input
-                    * (spinner.getSelectedItemPosition() == 0 ? MB_IN_BYTES : GB_IN_BYTES));
+            final long bytes = (long) (Float.valueOf(bytesString)
+                        * (spinner.getSelectedItemPosition() == 0 ? MB_IN_BYTES : GB_IN_BYTES));
 
             // to fix the overflow problem
             final long correctedBytes = Math.min(MAX_DATA_LIMIT_BYTES, bytes);
diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java
index 8eb1f61..16172bd 100644
--- a/src/com/android/settings/datausage/DataUsageSummary.java
+++ b/src/com/android/settings/datausage/DataUsageSummary.java
@@ -75,6 +75,7 @@
     private static final String KEY_LIMIT_SUMMARY = "limit_summary";
     private static final String KEY_RESTRICT_BACKGROUND = "restrict_background";
     private static final String KEY_NETWORK_RESTRICTIONS = "network_restrictions";
+    private static final String KEY_WIFI_USAGE_TITLE = "wifi_category";
 
     private DataUsageController mDataUsageController;
     private DataUsageInfoController mDataInfoController;
@@ -491,6 +492,7 @@
                 if (hasMobileData) {
                     keys.add(KEY_RESTRICT_BACKGROUND);
                 }
+                keys.add(KEY_WIFI_USAGE_TITLE);
 
                 return keys;
             }
diff --git a/src/com/android/settings/development/DevelopmentSettings.java b/src/com/android/settings/development/DevelopmentSettings.java
index 583a5eb..e06c869 100644
--- a/src/com/android/settings/development/DevelopmentSettings.java
+++ b/src/com/android/settings/development/DevelopmentSettings.java
@@ -40,7 +40,6 @@
 import android.content.pm.IShortcutService;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
 import android.hardware.usb.IUsbManager;
 import android.hardware.usb.UsbManager;
@@ -140,7 +139,6 @@
     private static final String DEBUG_APP_KEY = "debug_app";
     private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
     private static final String MOCK_LOCATION_APP_KEY = "mock_location_app";
-    private static final String VERIFY_APPS_OVER_USB_KEY = "verify_apps_over_usb";
     private static final String DEBUG_VIEW_ATTRIBUTES = "debug_view_attributes";
     private static final String FORCE_ALLOW_ON_EXTERNAL_KEY = "force_allow_on_external";
     private static final String STRICT_MODE_KEY = "strict_mode";
@@ -207,6 +205,8 @@
                                     "persist.bluetooth.avrcpversion";
     private static final String BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY =
                                     "persist.bluetooth.enableinbandringing";
+    private static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY =
+                                    "persist.bluetooth.btsnoopenable";
 
     private static final String BLUETOOTH_ENABLE_INBAND_RINGING_KEY = "bluetooth_enable_inband_ringing";
     private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY = "bluetooth_select_avrcp_version";
@@ -226,8 +226,6 @@
 
     private static final String SHOW_ALL_ANRS_KEY = "show_all_anrs";
 
-    private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
-
     private static final String TERMINAL_APP_PACKAGE = "com.android.terminal";
 
     private static final String KEY_CONVERT_FBE = "convert_to_file_encryption";
@@ -275,7 +273,7 @@
     private Preference mMockLocationAppPref;
 
     private SwitchPreference mWaitForDebugger;
-    private SwitchPreference mVerifyAppsOverUsb;
+    private VerifyAppsOverUsbPreferenceController mVerifyAppsOverUsbController;
     private SwitchPreference mWifiDisplayCertification;
     private SwitchPreference mWifiVerboseLogging;
     private SwitchPreference mWifiAggressiveHandover;
@@ -393,6 +391,7 @@
         mBugReportInPowerController = new BugReportInPowerPreferenceController(getActivity());
         mTelephonyMonitorController = new TelephonyMonitorPreferenceController(getActivity());
         mWebViewAppPrefController = new WebViewAppPreferenceController(getActivity());
+        mVerifyAppsOverUsbController = new VerifyAppsOverUsbPreferenceController(getActivity());
 
         setIfOnlyAvailableForAdmins(true);
         if (isUiRestricted() || !Utils.isDeviceProvisioned(getActivity())) {
@@ -453,14 +452,8 @@
         mMockLocationAppPref = findPreference(MOCK_LOCATION_APP_KEY);
         mAllPrefs.add(mMockLocationAppPref);
 
-        mVerifyAppsOverUsb = findAndInitSwitchPref(VERIFY_APPS_OVER_USB_KEY);
-        if (!showVerifierSetting()) {
-            if (debugDebuggingCategory != null) {
-                debugDebuggingCategory.removePreference(mVerifyAppsOverUsb);
-            } else {
-                mVerifyAppsOverUsb.setEnabled(false);
-            }
-        }
+        mVerifyAppsOverUsbController.displayPreference(getPreferenceScreen());
+
         mStrictMode = findAndInitSwitchPref(STRICT_MODE_KEY);
         mPointerLocation = findAndInitSwitchPref(POINTER_LOCATION_KEY);
         mShowTouches = findAndInitSwitchPref(SHOW_TOUCHES_KEY);
@@ -767,8 +760,8 @@
         mHaveDebugSettings |= mTelephonyMonitorController.updatePreference();
         updateSwitchPreference(mKeepScreenOn, Settings.Global.getInt(cr,
                 Settings.Global.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
-        updateSwitchPreference(mBtHciSnoopLog, Settings.Secure.getInt(cr,
-                Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
+        updateSwitchPreference(mBtHciSnoopLog, SystemProperties.getBoolean(
+                BLUETOOTH_BTSNOOP_ENABLE_PROPERTY, false));
         updateSwitchPreference(mDebugViewAttributes, Settings.Global.getInt(cr,
                 Settings.Global.DEBUG_VIEW_ATTRIBUTES, 0) != 0);
         updateSwitchPreference(mForceAllowOnExternal, Settings.Global.getInt(cr,
@@ -795,7 +788,7 @@
         updateImmediatelyDestroyActivitiesOptions();
         updateAppProcessLimitOptions();
         updateShowAllANRsOptions();
-        updateVerifyAppsOverUsbOptions();
+        mVerifyAppsOverUsbController.updatePreference();
         updateOtaDisableAutomaticUpdateOptions();
         updateBugreportOptions();
         updateForceRtlOptions();
@@ -881,10 +874,8 @@
 
     private void writeBtHciSnoopLogOptions() {
         BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
-        adapter.configHciSnoopLog(mBtHciSnoopLog.isChecked());
-        Settings.Secure.putInt(getActivity().getContentResolver(),
-                Settings.Secure.BLUETOOTH_HCI_LOG,
-                mBtHciSnoopLog.isChecked() ? 1 : 0);
+        SystemProperties.set(BLUETOOTH_BTSNOOP_ENABLE_PROPERTY,
+                Boolean.toString(mBtHciSnoopLog.isChecked()));
     }
 
     private void writeDebuggerOptions() {
@@ -995,19 +986,6 @@
         }
     }
 
-    private void updateVerifyAppsOverUsbOptions() {
-        updateSwitchPreference(mVerifyAppsOverUsb,
-                Settings.Global.getInt(getActivity().getContentResolver(),
-                        Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0);
-        mVerifyAppsOverUsb.setEnabled(enableVerifierSetting());
-    }
-
-    private void writeVerifyAppsOverUsbOptions() {
-        Settings.Global.putInt(getActivity().getContentResolver(),
-                Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB,
-                mVerifyAppsOverUsb.isChecked() ? 1 : 0);
-    }
-
     private void updateOtaDisableAutomaticUpdateOptions() {
         // We use the "disabled status" in code, but show the opposite text
         // "Automatic system updates" on screen. So a value 0 indicates the
@@ -1026,31 +1004,6 @@
                 mOtaDisableAutomaticUpdate.isChecked() ? 0 : 1);
     }
 
-    private boolean enableVerifierSetting() {
-        final ContentResolver cr = getActivity().getContentResolver();
-        if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) == 0) {
-            return false;
-        }
-        if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 0) {
-            return false;
-        } else {
-            final PackageManager pm = getActivity().getPackageManager();
-            final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
-            verification.setType(PACKAGE_MIME_TYPE);
-            verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
-            final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(verification, 0);
-            if (receivers.size() == 0) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    private boolean showVerifierSetting() {
-        return Settings.Global.getInt(getActivity().getContentResolver(),
-                Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0;
-    }
-
     private static boolean showEnableOemUnlockPreference() {
         return !SystemProperties.get(PERSISTENT_DATA_BLOCK_PROP).equals("");
     }
@@ -2417,6 +2370,10 @@
             return true;
         }
 
+        if (mVerifyAppsOverUsbController.handlePreferenceTreeClick(preference)) {
+            return true;
+        }
+
         if (preference == mEnableAdb) {
             if (mEnableAdb.isChecked()) {
                 mDialogClicked = false;
@@ -2431,8 +2388,7 @@
             } else {
                 Settings.Global.putInt(getActivity().getContentResolver(),
                         Settings.Global.ADB_ENABLED, 0);
-                mVerifyAppsOverUsb.setEnabled(false);
-                mVerifyAppsOverUsb.setChecked(false);
+                mVerifyAppsOverUsbController.updatePreference();
                 updateBugreportOptions();
             }
         } else if (preference == mClearAdbKeys) {
@@ -2482,8 +2438,6 @@
             startActivityForResult(intent, RESULT_DEBUG_APP);
         } else if (preference == mWaitForDebugger) {
             writeDebuggerOptions();
-        } else if (preference == mVerifyAppsOverUsb) {
-            writeVerifyAppsOverUsbOptions();
         } else if (preference == mOtaDisableAutomaticUpdate) {
             writeOtaDisableAutomaticUpdateOptions();
         } else if (preference == mStrictMode) {
@@ -2631,8 +2585,7 @@
                 mDialogClicked = true;
                 Settings.Global.putInt(getActivity().getContentResolver(),
                         Settings.Global.ADB_ENABLED, 1);
-                mVerifyAppsOverUsb.setEnabled(true);
-                updateVerifyAppsOverUsbOptions();
+                mVerifyAppsOverUsbController.updatePreference();
                 updateBugreportOptions();
             } else {
                 // Reset the toggle
diff --git a/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
new file mode 100644
index 0000000..c0bb0c7
--- /dev/null
+++ b/src/com/android/settings/development/VerifyAppsOverUsbPreferenceController.java
@@ -0,0 +1,149 @@
+/*
+ * 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.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.provider.Settings;
+import android.support.annotation.VisibleForTesting;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.core.PreferenceController;
+import com.android.settingslib.RestrictedLockUtils;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import java.util.List;
+
+/**
+ * Controller to manage the state of "Verify apps over USB" toggle.
+ */
+public class VerifyAppsOverUsbPreferenceController extends PreferenceController {
+    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";
+
+    private RestrictedSwitchPreference mPreference;
+
+    /**
+     * Class for indirection of RestrictedLockUtils for testing purposes. It would be nice to mock
+     * the appropriate methods in UserManager instead but they aren't accessible.
+     */
+    @VisibleForTesting
+    class RestrictedLockUtilsDelegate {
+        public EnforcedAdmin checkIfRestrictionEnforced(
+                Context context, String userRestriction, int userId) {
+            return RestrictedLockUtils.checkIfRestrictionEnforced(context, userRestriction, userId);
+        }
+    }
+    // NB: This field is accessed using reflection in the test, please keep name in sync.
+    private final RestrictedLockUtilsDelegate mRestrictedLockUtils =
+            new RestrictedLockUtilsDelegate();
+
+    VerifyAppsOverUsbPreferenceController(Context context) {
+        super(context);
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        if (isAvailable()) {
+            mPreference = (RestrictedSwitchPreference)
+                    screen.findPreference(VERIFY_APPS_OVER_USB_KEY);
+        }
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 1) > 0;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return VERIFY_APPS_OVER_USB_KEY;
+    }
+
+    /** Saves the settings value when it is toggled. */
+    @Override
+    public boolean handlePreferenceTreeClick(Preference preference) {
+        if (VERIFY_APPS_OVER_USB_KEY.equals(preference.getKey())) {
+            Settings.Global.putInt(mContext.getContentResolver(),
+                    Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, mPreference.isChecked() ? 1 : 0);
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Checks whether the toggle should be enabled depending on whether verify apps over USB is
+     * possible currently. If ADB is disabled or if package verifier does not exist, the toggle
+     * should be disabled.
+     */
+    private boolean shouldBeEnabled() {
+        final ContentResolver cr = mContext.getContentResolver();
+        if (Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) == 0) {
+            return false;
+        }
+        if (Settings.Global.getInt(cr, Settings.Global.PACKAGE_VERIFIER_ENABLE, 1) == 0) {
+            return false;
+        } else {
+            final PackageManager pm = mContext.getPackageManager();
+            final Intent verification = new Intent(Intent.ACTION_PACKAGE_NEEDS_VERIFICATION);
+            verification.setType(PACKAGE_MIME_TYPE);
+            verification.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+            final List<ResolveInfo> receivers = pm.queryBroadcastReceivers(verification, 0);
+            if (receivers.size() == 0) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Updates position, enabled status and maybe admin message.
+     */
+    public void updatePreference() {
+        if (!isAvailable()) {
+            return;
+        }
+
+        if (!shouldBeEnabled()) {
+            mPreference.setChecked(false);
+            mPreference.setDisabledByAdmin(null);
+            mPreference.setEnabled(false);
+            return;
+        }
+
+        final EnforcedAdmin enforcingAdmin = mRestrictedLockUtils.checkIfRestrictionEnforced(
+                        mContext, UserManager.ENSURE_VERIFY_APPS, UserHandle.myUserId());
+        if (enforcingAdmin != null) {
+            mPreference.setChecked(true);
+            mPreference.setDisabledByAdmin(enforcingAdmin);
+            return;
+        }
+
+        mPreference.setEnabled(true);
+        final boolean checked = Settings.Global.getInt(mContext.getContentResolver(),
+                Settings.Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1) != 0;
+        mPreference.setChecked(checked);
+    }
+}
diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
index 2a5ac17..57f7345 100644
--- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
+++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java
@@ -18,6 +18,7 @@
 
 import android.app.Activity;
 import android.app.LoaderManager;
+import android.app.usage.StorageStatsManager;
 import android.content.Context;
 import android.content.Loader;
 import android.graphics.drawable.Drawable;
@@ -29,6 +30,7 @@
 import android.provider.SearchIndexableResource;
 import android.support.annotation.VisibleForTesting;
 import android.util.SparseArray;
+import android.view.View;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
@@ -44,9 +46,11 @@
 import com.android.settings.deviceinfo.storage.StorageItemPreferenceController;
 import com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController;
 import com.android.settings.deviceinfo.storage.UserIconLoader;
+import com.android.settings.deviceinfo.storage.VolumeSizesLoader;
 import com.android.settings.search.BaseSearchIndexProvider;
 import com.android.settings.search.Indexable;
 import com.android.settingslib.applications.StorageStatsSource;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
 import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider;
 
 import java.util.ArrayList;
@@ -58,9 +62,12 @@
     private static final String TAG = "StorageDashboardFrag";
     private static final int STORAGE_JOB_ID = 0;
     private static final int ICON_JOB_ID = 1;
+    private static final int VOLUME_SIZE_JOB_ID = 2;
     private static final int OPTIONS_MENU_MIGRATE_DATA = 100;
 
     private VolumeInfo mVolume;
+    private PrivateStorageInfo mStorageInfo;
+    private SparseArray<StorageAsyncLoader.AppsStorageResult> mAppsResult;
 
     private StorageSummaryDonutPreferenceController mSummaryController;
     private StorageItemPreferenceController mPreferenceController;
@@ -81,29 +88,6 @@
         }
 
         initializeOptionsMenu(activity);
-
-        final long sharedDataSize = mVolume.getPath().getTotalSpace();
-        long totalSize = sm.getPrimaryStorageSize();
-        long systemSize = totalSize - sharedDataSize;
-
-        if (totalSize <= 0) {
-            totalSize = sharedDataSize;
-            systemSize = 0;
-        }
-
-        final long usedBytes = totalSize - mVolume.getPath().getFreeSpace();
-        mSummaryController.updateBytes(usedBytes, totalSize);
-        mPreferenceController.setVolume(mVolume);
-        mPreferenceController.setUsedSize(usedBytes);
-        mPreferenceController.setTotalSize(totalSize);
-        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(totalSize);
-
-            }
-        }
     }
 
     @VisibleForTesting
@@ -116,10 +100,40 @@
     }
 
     @Override
+    public void onViewCreated(View v, Bundle savedInstanceState) {
+        super.onViewCreated(v, savedInstanceState);
+        setLoading(true, false);
+    }
+
+    @Override
     public void onResume() {
         super.onResume();
         getLoaderManager().restartLoader(STORAGE_JOB_ID, Bundle.EMPTY, this);
         getLoaderManager().initLoader(ICON_JOB_ID, Bundle.EMPTY, new IconLoaderCallbacks());
+        getLoaderManager().initLoader(VOLUME_SIZE_JOB_ID, Bundle.EMPTY, new VolumeSizeCallbacks());
+    }
+
+    private void onReceivedSizes() {
+        if (mStorageInfo == null || mAppsResult == null) {
+            return;
+        }
+
+        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);
+            }
+        }
+
+        mPreferenceController.onLoadFinished(mAppsResult.get(UserHandle.myUserId()));
+        updateSecondaryUserControllers(mSecondaryUsers, mAppsResult);
+        setLoading(false, true);
     }
 
     @Override
@@ -224,8 +238,8 @@
     @Override
     public void onLoadFinished(Loader<SparseArray<StorageAsyncLoader.AppsStorageResult>> loader,
             SparseArray<StorageAsyncLoader.AppsStorageResult> data) {
-        mPreferenceController.onLoadFinished(data.get(UserHandle.myUserId()));
-        updateSecondaryUserControllers(mSecondaryUsers, data);
+        mAppsResult = data;
+        onReceivedSizes();
     }
 
     @Override
@@ -260,4 +274,31 @@
         @Override
         public void onLoaderReset(Loader<SparseArray<Drawable>> loader) {}
     }
+
+    public final class VolumeSizeCallbacks
+            implements LoaderManager.LoaderCallbacks<PrivateStorageInfo> {
+        @Override
+        public Loader<PrivateStorageInfo> onCreateLoader(int id, Bundle args) {
+            Context context = getContext();
+            StorageManager sm = context.getSystemService(StorageManager.class);
+            StorageManagerVolumeProvider smvp = new StorageManagerVolumeProvider(sm);
+            final StorageStatsManager stats = context.getSystemService(StorageStatsManager.class);
+            return new VolumeSizesLoader(context, smvp, stats, mVolume);
+        }
+
+        @Override
+        public void onLoaderReset(Loader<PrivateStorageInfo> loader) {}
+
+        @Override
+        public void onLoadFinished(
+                Loader<PrivateStorageInfo> loader, PrivateStorageInfo privateStorageInfo) {
+            if (privateStorageInfo == null) {
+                getActivity().finish();
+                return;
+            }
+
+            mStorageInfo = privateStorageInfo;
+            onReceivedSizes();
+        }
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index 763b6d4..6ae6c1a 100644
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -17,14 +17,15 @@
 package com.android.settings.deviceinfo;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceViewHolder;
-import android.text.format.Formatter;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.ProgressBar;
 
 import com.android.settings.R;
+import com.android.settings.utils.FileSizeFormatter;
 
 public class StorageItemPreference extends Preference {
     public int userHandle;
@@ -44,9 +45,12 @@
     }
 
     public void setStorageSize(long size, long total) {
-        setSummary(size == 0
-                ? String.valueOf(0)
-                : Formatter.formatFileSize(getContext(), size));
+        setSummary(
+                FileSizeFormatter.formatFileSize(
+                        getContext(),
+                        size,
+                        getGigabyteSuffix(getContext().getResources()),
+                        FileSizeFormatter.GIGABYTE_IN_BYTES));
         if (total == 0) {
             mProgressPercent = 0;
         } else {
@@ -75,4 +79,8 @@
         updateProgressBar();
         super.onBindViewHolder(view);
     }
+
+    private static int getGigabyteSuffix(Resources res) {
+        return res.getIdentifier("gigabyteShort", "string", "android");
+    }
 }
diff --git a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
index 377ec1e..4ce785a 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
@@ -81,6 +81,7 @@
     private long mUsedBytes;
     private long mTotalSize;
 
+    private PreferenceScreen mScreen;
     private StorageItemPreference mPhotoPreference;
     private StorageItemPreference mAudioPreference;
     private StorageItemPreference mGamePreference;
@@ -169,6 +170,22 @@
      */
     public void setVolume(VolumeInfo volume) {
         mVolume = volume;
+        setFilesPreferenceVisibility();
+    }
+
+    private void setFilesPreferenceVisibility() {
+        if (mScreen != null) {
+            final VolumeInfo sharedVolume = mSvp.findEmulatedForPrivate(mVolume);
+            // If we don't have a shared volume for our internal storage (or the shared volume isn't
+            // mounted as readable for whatever reason), we should hide the File preference.
+            final boolean hideFilePreference =
+                    (sharedVolume == null) || !sharedVolume.isMountedReadable();
+            if (hideFilePreference) {
+                mScreen.removePreference(mFilePreference);
+            } else {
+                mScreen.addPreference(mFilePreference);
+            }
+        }
     }
 
     /**
@@ -207,6 +224,7 @@
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
+        mScreen = screen;
         mPhotoPreference = (StorageItemPreference) screen.findPreference(PHOTO_KEY);
         mAudioPreference = (StorageItemPreference) screen.findPreference(AUDIO_KEY);
         mGamePreference = (StorageItemPreference) screen.findPreference(GAME_KEY);
@@ -215,14 +233,7 @@
         mSystemPreference = (StorageItemPreference) screen.findPreference(SYSTEM_KEY);
         mFilePreference = (StorageItemPreference) screen.findPreference(FILES_KEY);
 
-        final VolumeInfo sharedVolume = mSvp.findEmulatedForPrivate(mVolume);
-        // If we don't have a shared volume for our internal storage (or the shared volume isn't
-        // mounted as readable for whatever reason), we should hide the File preference.
-        final boolean hideFilePreference =
-                (sharedVolume == null) || !sharedVolume.isMountedReadable();
-        if (hideFilePreference) {
-            screen.removePreference(mFilePreference);
-        }
+        setFilesPreferenceVisibility();
     }
 
     public void onLoadFinished(StorageAsyncLoader.AppsStorageResult data) {
@@ -289,6 +300,10 @@
     }
 
     private Intent getAudioIntent() {
+        if (mVolume == null) {
+            return null;
+        }
+
         Bundle args = new Bundle();
         args.putString(ManageApplications.EXTRA_CLASSNAME,
                 Settings.StorageUseActivity.class.getName());
@@ -301,6 +316,10 @@
     }
 
     private Intent getAppsIntent() {
+        if (mVolume == null) {
+            return null;
+        }
+
         Bundle args = new Bundle();
         args.putString(ManageApplications.EXTRA_CLASSNAME,
                 Settings.StorageUseActivity.class.getName());
diff --git a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
index 890d99e..91c4a6b 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageSummaryDonutPreferenceController.java
@@ -34,6 +34,7 @@
 public class StorageSummaryDonutPreferenceController extends PreferenceController {
     private long mUsedBytes;
     private long mTotalBytes;
+    private StorageSummaryDonutPreference mSummary;
 
     public StorageSummaryDonutPreferenceController(Context context) {
         super(context);
@@ -41,9 +42,8 @@
 
     @Override
     public void displayPreference(PreferenceScreen screen) {
-        StorageSummaryDonutPreference summary = (StorageSummaryDonutPreference)
-                screen.findPreference("pref_summary");
-        summary.setEnabled(true);
+        mSummary = (StorageSummaryDonutPreference) screen.findPreference("pref_summary");
+        mSummary.setEnabled(true);
     }
 
     @Override
@@ -61,6 +61,13 @@
         summary.setEnabled(true);
     }
 
+    /** Invalidates the data on the view and re-renders. */
+    public void invalidateData() {
+        if (mSummary != null) {
+            updateState(mSummary);
+        }
+    }
+
     @Override
     public boolean isAvailable() {
         return true;
@@ -79,6 +86,7 @@
     public void updateBytes(long used, long total) {
         mUsedBytes = used;
         mTotalBytes = total;
+        invalidateData();
     }
 
     /**
diff --git a/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java
new file mode 100644
index 0000000..720f151
--- /dev/null
+++ b/src/com/android/settings/deviceinfo/storage/VolumeSizesLoader.java
@@ -0,0 +1,68 @@
+/*
+ * 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.app.usage.StorageStatsManager;
+import android.content.Context;
+import android.os.storage.VolumeInfo;
+import android.support.annotation.VisibleForTesting;
+
+import com.android.settings.utils.AsyncLoader;
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+import com.android.settingslib.deviceinfo.StorageVolumeProvider;
+
+import java.io.IOException;
+
+public class VolumeSizesLoader extends AsyncLoader<PrivateStorageInfo> {
+    private StorageVolumeProvider mVolumeProvider;
+    private StorageStatsManager mStats;
+    private VolumeInfo mVolume;
+
+    public VolumeSizesLoader(
+            Context context,
+            StorageVolumeProvider volumeProvider,
+            StorageStatsManager stats,
+            VolumeInfo volume) {
+        super(context);
+        mVolumeProvider = volumeProvider;
+        mStats = stats;
+        mVolume = volume;
+    }
+
+    @Override
+    protected void onDiscardResult(PrivateStorageInfo result) {}
+
+    @Override
+    public PrivateStorageInfo loadInBackground() {
+        PrivateStorageInfo volumeSizes;
+        try {
+            volumeSizes = getVolumeSize(mVolumeProvider, mStats, mVolume);
+        } catch (IOException e) {
+            return null;
+        }
+        return volumeSizes;
+    }
+
+    @VisibleForTesting
+    static PrivateStorageInfo getVolumeSize(
+            StorageVolumeProvider storageVolumeProvider, StorageStatsManager stats, VolumeInfo info)
+            throws IOException {
+        long privateTotalBytes = storageVolumeProvider.getTotalBytes(stats, info);
+        long privateFreeBytes = storageVolumeProvider.getFreeBytes(stats, info);
+        return new PrivateStorageInfo(privateFreeBytes, privateTotalBytes);
+    }
+}
diff --git a/src/com/android/settings/display/AutoRotatePreferenceController.java b/src/com/android/settings/display/AutoRotatePreferenceController.java
index 11c9333..fd79e51 100644
--- a/src/com/android/settings/display/AutoRotatePreferenceController.java
+++ b/src/com/android/settings/display/AutoRotatePreferenceController.java
@@ -45,6 +45,7 @@
     public void updateState(Preference preference) {
         final DropDownPreference rotatePreference = (DropDownPreference) preference;
         final int rotateLockedResourceId;
+        preference.setSummary("%s");
         // The following block sets the string used when rotation is locked.
         // If the device locks specifically to portrait or landscape (rather than current
         // rotation), then we use a different string to include this information.
diff --git a/src/com/android/settings/display/BrightnessLevelPreferenceController.java b/src/com/android/settings/display/BrightnessLevelPreferenceController.java
deleted file mode 100644
index e0000d6..0000000
--- a/src/com/android/settings/display/BrightnessLevelPreferenceController.java
+++ /dev/null
@@ -1,49 +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.display;
-
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS;
-
-import android.content.Context;
-import android.provider.Settings;
-import android.support.v7.preference.Preference;
-import com.android.settings.core.PreferenceController;
-import java.text.NumberFormat;
-
-public class BrightnessLevelPreferenceController extends PreferenceController {
-
-    private static final String KEY_BRIGHTNESS = "brightness";
-
-    public BrightnessLevelPreferenceController(Context context) {
-        super(context);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY_BRIGHTNESS;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final double brightness = Settings.System.getInt(mContext.getContentResolver(),
-            SCREEN_BRIGHTNESS, 0);
-        preference.setSummary(NumberFormat.getPercentInstance().format(brightness / 255));
-    }
-
-}
diff --git a/src/com/android/settings/display/ThemePreferenceController.java b/src/com/android/settings/display/ThemePreferenceController.java
index a8d47d6..99a19f8 100644
--- a/src/com/android/settings/display/ThemePreferenceController.java
+++ b/src/com/android/settings/display/ThemePreferenceController.java
@@ -13,11 +13,10 @@
  */
 package com.android.settings.display;
 
-import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;
-
 import android.content.Context;
 import android.content.om.IOverlayManager;
 import android.content.om.OverlayInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.os.RemoteException;
@@ -35,8 +34,11 @@
 
 import libcore.util.Objects;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import static com.android.internal.logging.nano.MetricsProto.MetricsEvent.ACTION_THEME;
+
 public class ThemePreferenceController extends PreferenceController implements
         Preference.OnPreferenceChangeListener {
 
@@ -92,6 +94,7 @@
             theme = mContext.getString(R.string.default_theme);
             pref.setSummary(theme);
         }
+        pref.setSummary(theme);
         pref.setValue(theme);
     }
 
@@ -109,12 +112,22 @@
         return true;
     }
 
+    private boolean isChangeableOverlay(String packageName) {
+        try {
+            PackageInfo pi = mPackageManager.getPackageInfo(packageName, 0);
+            return pi != null && !pi.isStaticOverlay;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
     private String getTheme() {
         try {
             List<OverlayInfo> infos = mOverlayService.getOverlayInfosForTarget("android",
                     UserHandle.myUserId());
             for (int i = 0, size = infos.size(); i < size; i++) {
-                if (infos.get(i).isEnabled()) {
+                if (infos.get(i).isEnabled() &&
+                         isChangeableOverlay(infos.get(i).packageName)) {
                     return infos.get(i).packageName;
                 }
             }
@@ -141,11 +154,13 @@
         try {
             List<OverlayInfo> infos = mOverlayService.getOverlayInfosForTarget("android",
                     UserHandle.myUserId());
-            String[] pkgs = new String[infos.size()];
+            List<String> pkgs = new ArrayList(infos.size());
             for (int i = 0, size = infos.size(); i < size; i++) {
-                pkgs[i] = infos.get(i).packageName;
+                if (isChangeableOverlay(infos.get(i).packageName)) {
+                    pkgs.add(infos.get(i).packageName);
+                }
             }
-            return pkgs;
+            return pkgs.toArray(new String[pkgs.size()]);
         } catch (RemoteException e) {
         }
         return new String[0];
diff --git a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
index 0db9e15..f0aca01 100644
--- a/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
+++ b/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBase.java
@@ -16,7 +16,6 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.Intent;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
@@ -32,6 +31,7 @@
     private final String mPermissionGroup;
     private final ApplicationFeatureProvider mFeatureProvider;
     private final boolean mAsync;
+    private boolean mHasApps;
 
     public AdminGrantedPermissionsPreferenceControllerBase(Context context, Lifecycle lifecycle,
             boolean async, String[] permissions, String permissionGroup) {
@@ -41,6 +41,7 @@
         mFeatureProvider = FeatureFactory.getFactory(context)
                 .getApplicationFeatureProvider(context);
         mAsync = async;
+        mHasApps = false;
     }
 
     @Override
@@ -50,11 +51,13 @@
                 (num) -> {
                     if (num == 0) {
                         preference.setVisible(false);
+                        mHasApps = false;
                     } else {
                         preference.setVisible(true);
                         preference.setSummary(mContext.getResources().getQuantityString(
                                 R.plurals.enterprise_privacy_number_packages_lower_bound,
                                 num, num));
+                        mHasApps = true;
                     }
                 });
     }
@@ -76,7 +79,8 @@
         final Boolean[] haveAppsWithAdminGrantedPermissions = { null };
         mFeatureProvider.calculateNumberOfAppsWithAdminGrantedPermissions(mPermissions,
                 false /* async */, (num) -> haveAppsWithAdminGrantedPermissions[0] = num > 0);
-        return haveAppsWithAdminGrantedPermissions[0];
+        mHasApps = haveAppsWithAdminGrantedPermissions[0];
+        return mHasApps;
     }
 
     @Override
@@ -84,9 +88,9 @@
         if (!getPreferenceKey().equals(preference.getKey())) {
             return false;
         }
-        final Intent intent = new Intent(Intent.ACTION_MANAGE_PERMISSION_APPS)
-                .putExtra(Intent.EXTRA_PERMISSION_NAME, mPermissionGroup);
-        mContext.startActivity(intent);
-        return true;
+        if (!mHasApps) {
+            return false;
+        }
+        return super.handlePreferenceTreeClick(preference);
     }
 }
diff --git a/src/com/android/settings/enterprise/ApplicationListFragment.java b/src/com/android/settings/enterprise/ApplicationListFragment.java
new file mode 100644
index 0000000..ff68a8b
--- /dev/null
+++ b/src/com/android/settings/enterprise/ApplicationListFragment.java
@@ -0,0 +1,115 @@
+/*
+ * 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.Manifest;
+import android.content.Context;
+
+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 java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Base fragment for displaying a list of applications on a device.
+ * Inner static classes are concrete implementations.
+ */
+public abstract class ApplicationListFragment extends DashboardFragment
+        implements ApplicationListPreferenceController.ApplicationListBuilder {
+
+    static final String TAG = "EnterprisePrivacySettings";
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.app_list_disclosure_settings;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final List controllers = new ArrayList<>();
+        ApplicationListPreferenceController controller = new ApplicationListPreferenceController(
+                context, this, context.getPackageManager(), this);
+        controllers.add(controller);
+        return controllers;
+    }
+
+    private abstract static class AdminGrantedPermission extends ApplicationListFragment {
+        private final String[] mPermissions;
+
+        public AdminGrantedPermission(String[] permissions) {
+            mPermissions = permissions;
+        }
+
+        @Override
+        public void buildApplicationList(Context context,
+                ApplicationFeatureProvider.ListOfAppsCallback callback) {
+            FeatureFactory.getFactory(context).getApplicationFeatureProvider(context)
+                    .listAppsWithAdminGrantedPermissions(mPermissions, callback);
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS;
+        }
+    }
+
+    public static class AdminGrantedPermissionCamera extends AdminGrantedPermission {
+        public AdminGrantedPermissionCamera() {
+            super(new String[] {Manifest.permission.CAMERA});
+        }
+    }
+
+    public static class AdminGrantedPermissionLocation extends AdminGrantedPermission {
+        public AdminGrantedPermissionLocation() {
+            super(new String[] {Manifest.permission.ACCESS_COARSE_LOCATION,
+                    Manifest.permission.ACCESS_FINE_LOCATION});
+        }
+    }
+
+    public static class AdminGrantedPermissionMicrophone extends AdminGrantedPermission {
+        public AdminGrantedPermissionMicrophone() {
+            super(new String[] {Manifest.permission.RECORD_AUDIO});
+        }
+    }
+
+    public static class EnterpriseInstalledPackages extends ApplicationListFragment {
+        public EnterpriseInstalledPackages() {
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.ENTERPRISE_PRIVACY_INSTALLED_APPS;
+        }
+
+        @Override
+        public void buildApplicationList(Context context,
+                ApplicationFeatureProvider.ListOfAppsCallback callback) {
+            FeatureFactory.getFactory(context).getApplicationFeatureProvider(context).
+                    listPolicyInstalledApps(callback);
+        }
+    }
+}
diff --git a/src/com/android/settings/enterprise/ApplicationListPreferenceController.java b/src/com/android/settings/enterprise/ApplicationListPreferenceController.java
new file mode 100644
index 0000000..f9fefa1
--- /dev/null
+++ b/src/com/android/settings/enterprise/ApplicationListPreferenceController.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.enterprise;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.UserAppInfo;
+import com.android.settings.core.PreferenceController;
+
+import java.util.List;
+
+/**
+ * PreferenceController that builds a dynamic list of applications provided by
+ * {@link ApplicationListBuilder} instance.
+ */
+public class ApplicationListPreferenceController extends PreferenceController
+        implements ApplicationFeatureProvider.ListOfAppsCallback {
+    private final PackageManager mPm;
+    private SettingsPreferenceFragment mParent;
+
+    public ApplicationListPreferenceController(Context context, ApplicationListBuilder builder,
+            PackageManager packageManager, SettingsPreferenceFragment parent) {
+        super(context);
+        mPm = packageManager;
+        mParent = parent;
+        builder.buildApplicationList(context, this);
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return null;
+    }
+
+    @Override
+    public void onListOfAppsResult(List<UserAppInfo> result) {
+        final PreferenceScreen screen = mParent.getPreferenceScreen();
+        if (screen == null) {
+            return;
+        }
+        final Context prefContext = mParent.getPreferenceManager().getContext();
+        for (int position = 0; position < result.size(); position++) {
+            final UserAppInfo item = result.get(position);
+            final Preference preference = new Preference(prefContext);
+            preference.setLayoutResource(R.layout.preference_app);
+            preference.setTitle(item.appInfo.loadLabel(mPm));
+            preference.setIcon(item.appInfo.loadIcon(mPm));
+            preference.setOrder(position);
+            preference.setSelectable(false);
+            screen.addPreference(preference);
+        }
+    }
+
+    /**
+     * Simple interface for building application list within {
+     * @link ApplicationListPreferenceController}
+     */
+    public interface ApplicationListBuilder {
+        void buildApplicationList(Context context,
+                ApplicationFeatureProvider.ListOfAppsCallback callback);
+    }
+}
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
index 5817cf2..46ecb7e 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyFeatureProviderImpl.java
@@ -17,10 +17,8 @@
 package com.android.settings.enterprise;
 
 import android.content.ComponentName;
-import android.content.ContentResolver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.content.res.Resources;
diff --git a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
index 254940e..69e0416 100644
--- a/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterprisePrivacyPreferenceController.java
@@ -14,7 +14,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;
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
new file mode 100644
index 0000000..6f173f1
--- /dev/null
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java
@@ -0,0 +1,59 @@
+/*
+ * 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.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.core.PreferenceController;
+import com.android.settings.dashboard.DashboardFragment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Fragment for displaying a list of default applications set by profile or device admin.
+ */
+public class EnterpriseSetDefaultAppsListFragment extends DashboardFragment {
+    static final String TAG = "EnterprisePrivacySettings";
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.ENTERPRISE_PRIVACY_DEFAULT_APPS;
+    }
+
+    @Override
+    protected String getLogTag() {
+        return TAG;
+    }
+
+    @Override
+    protected int getPreferenceScreenResId() {
+        return R.xml.enterprise_set_default_apps_settings;
+    }
+
+    @Override
+    protected List<PreferenceController> getPreferenceControllers(Context context) {
+        final List controllers = new ArrayList<PreferenceController>();
+        final EnterpriseSetDefaultAppsListPreferenceController controller =
+                new EnterpriseSetDefaultAppsListPreferenceController(
+                        context, this, context.getPackageManager());
+        controllers.add(controller);
+        return controllers;
+    }
+}
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
new file mode 100644
index 0000000..51b60b8
--- /dev/null
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
@@ -0,0 +1,197 @@
+/*
+ * 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.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.Handler;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceCategory;
+import android.support.v7.preference.PreferenceGroup;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+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.overlay.FeatureFactory;
+import com.android.settings.users.UserFeatureProvider;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumMap;
+import java.util.List;
+
+
+/**
+ * PreferenceController that builds a dynamic list of default apps set by device or profile owner.
+ */
+public class EnterpriseSetDefaultAppsListPreferenceController extends PreferenceController {
+    private final PackageManager mPm;
+    private final SettingsPreferenceFragment mParent;
+    private final ApplicationFeatureProvider mApplicationFeatureProvider;
+    private final EnterprisePrivacyFeatureProvider mEnterprisePrivacyFeatureProvider;
+    private final UserFeatureProvider mUserFeatureProvider;
+
+    private List<UserInfo> mUsers = Collections.emptyList();
+    private List<EnumMap<EnterpriseDefaultApps, List<ApplicationInfo>>> mApps =
+            Collections.emptyList();
+
+    public EnterpriseSetDefaultAppsListPreferenceController(Context context,
+            SettingsPreferenceFragment parent, PackageManager packageManager) {
+        super(context);
+        mPm = packageManager;
+        mParent = parent;
+        final FeatureFactory factory = FeatureFactory.getFactory(context);
+        mApplicationFeatureProvider = factory.getApplicationFeatureProvider(context);
+        mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider(context);
+        mUserFeatureProvider = factory.getUserFeatureProvider(context);
+        buildAppList();
+    }
+
+    /**
+     * Builds data for UI. Updates mUsers and mApps so that they contain non-empty list.
+     */
+    private void buildAppList() {
+        mUsers = new ArrayList<>();
+        mApps = new ArrayList<>();
+        for (UserHandle user : mUserFeatureProvider.getUserProfiles()) {
+            boolean hasDefaultsForUser = false;
+            EnumMap<EnterpriseDefaultApps, List<ApplicationInfo>> userMap = null;
+
+            for (EnterpriseDefaultApps typeOfDefault : EnterpriseDefaultApps.values()) {
+                List<UserAppInfo> apps = mApplicationFeatureProvider.
+                        findPersistentPreferredActivities(user.getIdentifier(),
+                                typeOfDefault.getIntents());
+                if (apps.isEmpty()) {
+                    continue;
+                }
+                if (!hasDefaultsForUser) {
+                    hasDefaultsForUser = true;
+                    mUsers.add(apps.get(0).userInfo);
+                    userMap = new EnumMap<>(EnterpriseDefaultApps.class);
+                    mApps.add(userMap);
+                }
+                ArrayList<ApplicationInfo> applicationInfos = new ArrayList<>();
+                for (UserAppInfo userAppInfo : apps) {
+                    applicationInfos.add(userAppInfo.appInfo);
+                }
+                userMap.put(typeOfDefault, applicationInfos);
+            }
+        }
+        new Handler(mContext.getMainLooper()).post(() -> { updateUi(); });
+    }
+
+    @Override
+    public boolean isAvailable() {
+        return true;
+    }
+
+    @Override
+    public String getPreferenceKey() {
+        return null;
+    }
+
+    private void updateUi() {
+        final Context prefContext = mParent.getPreferenceManager().getContext();
+        final PreferenceScreen screen = mParent.getPreferenceScreen();
+        if (screen == null) {
+            return;
+        }
+        if (!mEnterprisePrivacyFeatureProvider.isInCompMode() && mUsers.size() == 1) {
+            createPreferences(prefContext, screen, mApps.get(0));
+        } else {
+            for (int i = 0; i < mUsers.size(); i++) {
+                final UserInfo userInfo = mUsers.get(i);
+                final PreferenceCategory category = new PreferenceCategory(prefContext);
+                screen.addPreference(category);
+                if (userInfo.isManagedProfile()) {
+                    category.setTitle(R.string.managed_device_admin_title);
+                } else {
+                    category.setTitle(R.string.personal_device_admin_title);
+                }
+                category.setOrder(i);
+                createPreferences(prefContext, category, mApps.get(i));
+            }
+        }
+    }
+
+    private void createPreferences(Context prefContext, PreferenceGroup group,
+            EnumMap<EnterpriseDefaultApps, List<ApplicationInfo>> apps) {
+        if (group == null) {
+            return;
+        }
+        for (EnterpriseDefaultApps typeOfDefault : EnterpriseDefaultApps.values()) {
+            final List<ApplicationInfo> appsForCategory = apps.get(typeOfDefault);
+            if (appsForCategory == null || appsForCategory.isEmpty()) {
+                continue;
+            }
+            final Preference preference = new Preference(prefContext);
+            preference.setTitle(getTitle(prefContext, typeOfDefault, appsForCategory.size()));
+            preference.setSummary(buildSummaryString(prefContext, appsForCategory));
+            preference.setOrder(typeOfDefault.ordinal());
+            preference.setSelectable(false);
+            group.addPreference(preference);
+        }
+    }
+
+    private CharSequence buildSummaryString(Context context, List<ApplicationInfo> apps) {
+        final CharSequence[] appNames = new String[apps.size()];
+        for (int i = 0; i < apps.size(); i++) {
+            appNames[i] = apps.get(i).loadLabel(mPm);
+        }
+        if (apps.size() == 1) {
+            return appNames[0];
+        } else if (apps.size() == 2) {
+            return context.getString(R.string.app_names_concatenation_template_2, appNames[0],
+                    appNames[1]);
+        } else {
+            return context.getString(R.string.app_names_concatenation_template_3, appNames[0],
+                    appNames[1], appNames[2]);
+        }
+    }
+
+    private String getTitle(Context context, EnterpriseDefaultApps typeOfDefault, int appCount) {
+        switch (typeOfDefault) {
+            case BROWSER:
+                return context.getString(R.string.default_browser_title);
+            case CALENDAR:
+                return context.getString(R.string.default_calendar_app_title);
+            case CONTACTS:
+                return context.getString(R.string.default_contacts_app_title);
+            case PHONE:
+                return context.getResources()
+                        .getQuantityString(R.plurals.default_phone_app_title, appCount);
+            case MAP:
+                return context.getString(R.string.default_map_app_title);
+            case EMAIL:
+                return context.getResources()
+                        .getQuantityString(R.plurals.default_email_app_title, appCount);
+            case CAMERA:
+                return context.getResources()
+                        .getQuantityString(R.plurals.default_camera_app_title, appCount);
+            default:
+                throw new IllegalStateException("Unknown type of default " + typeOfDefault);
+        }
+    }
+
+}
diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
index ae76d63..2f43a61 100644
--- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
+++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
@@ -14,28 +14,29 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.MediaStore;
+import android.os.UserHandle;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.EnterpriseDefaultApps;
 import com.android.settings.core.DynamicAvailabilityPreferenceController;
 import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.users.UserFeatureProvider;
 
 public class EnterpriseSetDefaultAppsPreferenceController
         extends DynamicAvailabilityPreferenceController {
 
     private static final String KEY_DEFAULT_APPS = "number_enterprise_set_default_apps";
-    private final ApplicationFeatureProvider mFeatureProvider;
+    private final ApplicationFeatureProvider mApplicationFeatureProvider;
+    private final UserFeatureProvider mUserFeatureProvider;
 
     public EnterpriseSetDefaultAppsPreferenceController(Context context, Lifecycle lifecycle) {
         super(context, lifecycle);
-        mFeatureProvider = FeatureFactory.getFactory(context)
-                .getApplicationFeatureProvider(context);
+        final FeatureFactory factory = FeatureFactory.getFactory(context);
+        mApplicationFeatureProvider = factory.getApplicationFeatureProvider(context);
+        mUserFeatureProvider = factory.getUserFeatureProvider(context);
     }
 
     @Override
@@ -56,47 +57,14 @@
     }
 
     private int getNumberOfEnterpriseSetDefaultApps() {
-        // Browser
-        int num = mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
-                buildIntent(Intent.ACTION_VIEW, Intent.CATEGORY_BROWSABLE, "http:", null)}).size();
-        // Camera
-        num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
-                new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
-                new Intent(MediaStore.ACTION_VIDEO_CAPTURE)}).size();
-        // Map
-        num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
-                buildIntent(Intent.ACTION_VIEW, null, "geo:", null)}).size();
-        // E-mail
-        num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
-                new Intent(Intent.ACTION_SENDTO), new Intent(Intent.ACTION_SEND),
-                new Intent(Intent.ACTION_SEND_MULTIPLE)}).size();
-        // Calendar
-        num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
-                buildIntent(Intent.ACTION_INSERT, null, null, "vnd.android.cursor.dir/event")})
-                .size();
-        // Contacts
-        num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
-                buildIntent(Intent.ACTION_PICK, null, null,
-                        ContactsContract.Contacts.CONTENT_TYPE)}).size();
-        // Dialer
-        num += mFeatureProvider.findPersistentPreferredActivities(new Intent[] {
-                new Intent(Intent.ACTION_DIAL), new Intent(Intent.ACTION_CALL)}).size();
-
+        int num = 0;
+        for (UserHandle user : mUserFeatureProvider.getUserProfiles()) {
+            for (EnterpriseDefaultApps app : EnterpriseDefaultApps.values()) {
+                num += mApplicationFeatureProvider
+                        .findPersistentPreferredActivities(user.getIdentifier(),
+                                app.getIntents()).size();
+            }
+        }
         return num;
     }
-
-    private static Intent buildIntent(String action, String category, String protocol,
-            String type) {
-        final Intent intent = new Intent(action);
-        if (category != null) {
-            intent.addCategory(category);
-        }
-        if (protocol != null) {
-            intent.setData(Uri.parse(protocol));
-        }
-        if (type != null) {
-            intent.setType(type);
-        }
-        return intent;
-    }
 }
diff --git a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
index f7cb191..49a0179 100644
--- a/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
+++ b/src/com/android/settings/fuelgauge/AppButtonsPreferenceController.java
@@ -60,6 +60,7 @@
 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 java.util.ArrayList;
@@ -155,7 +156,8 @@
 
     @Override
     public boolean isAvailable() {
-        return mAppEntry != null;
+        // TODO(b/37313605): Re-enable once this controller supports instant apps
+        return mAppEntry != null && !AppUtils.isInstant(mAppEntry.info);
     }
 
     @Override
diff --git a/src/com/android/settings/fuelgauge/BatteryUtils.java b/src/com/android/settings/fuelgauge/BatteryUtils.java
index dad7b59..86cb203 100644
--- a/src/com/android/settings/fuelgauge/BatteryUtils.java
+++ b/src/com/android/settings/fuelgauge/BatteryUtils.java
@@ -100,9 +100,7 @@
 
     private long getProcessForegroundTimeMs(BatteryStats.Uid uid, int which) {
         final long rawRealTimeUs = convertMsToUs(SystemClock.elapsedRealtime());
-        final int foregroundTypes[] = {BatteryStats.Uid.PROCESS_STATE_TOP,
-                BatteryStats.Uid.PROCESS_STATE_FOREGROUND_SERVICE,
-                BatteryStats.Uid.PROCESS_STATE_FOREGROUND};
+        final int foregroundTypes[] = {BatteryStats.Uid.PROCESS_STATE_TOP};
         Log.v(TAG, "package: " + mPackageManager.getNameForUid(uid.getUid()));
 
         long timeUs = 0;
diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
index 4ebff34..e85859a 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java
@@ -289,8 +289,8 @@
         if (usageData.usageList.size() <= 1) {
             CharSequence timeSequence = Utils.formatElapsedTime(getContext(),
                     usageData.totalUsageTimeMs, false);
-            usageData.summary = TextUtils.expandTemplate(getText(R.string.battery_used_for),
-                    timeSequence);
+            usageData.summary = usageData.usageType == UsageType.IDLE ? timeSequence
+                    : TextUtils.expandTemplate(getText(R.string.battery_used_for), timeSequence);
         } else {
             BatterySipper sipper = findBatterySipperWithMaxBatteryUsage(usageData.usageList);
             BatteryEntry batteryEntry = new BatteryEntry(getContext(), mHandler, mUserManager,
@@ -305,7 +305,9 @@
     boolean shouldHideSummary(PowerUsageData powerUsageData) {
         @UsageType final int usageType = powerUsageData.usageType;
 
-        return usageType == UsageType.CELL;
+        return usageType == UsageType.CELL
+                || usageType == UsageType.BLUETOOTH
+                || usageType == UsageType.WIFI;
     }
 
     @VisibleForTesting
diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java
index 86ce118..1999970 100644
--- a/src/com/android/settings/language/LanguageAndInputSettings.java
+++ b/src/com/android/settings/language/LanguageAndInputSettings.java
@@ -23,6 +23,8 @@
 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;
@@ -81,7 +83,16 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
-        final Lifecycle lifecycle = getLifecycle();
+        if (mAmbientDisplayConfig == null) {
+            mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);
+        }
+
+        return buildPreferenceControllers(context, getLifecycle(), mAmbientDisplayConfig);
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(@NonNull Context context,
+            @Nullable Lifecycle lifecycle,
+            @NonNull AmbientDisplayConfiguration ambientDisplayConfiguration) {
         final List<PreferenceController> controllers = new ArrayList<>();
         // Language
         controllers.add(new PhoneLanguagePreferenceController(context));
@@ -93,11 +104,10 @@
         controllers.add(new PhysicalKeyboardPreferenceController(context, lifecycle));
         final GameControllerPreferenceController gameControllerPreferenceController
                 = new GameControllerPreferenceController(context);
-        lifecycle.addObserver(gameControllerPreferenceController);
-
-        if (mAmbientDisplayConfig == null) {
-            mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);
+        if (lifecycle != null) {
+            lifecycle.addObserver(gameControllerPreferenceController);
         }
+
         controllers.add(gameControllerPreferenceController);
         // Gestures
         controllers.add(new AssistGesturePreferenceController(context, lifecycle));
@@ -105,9 +115,9 @@
         controllers.add(new DoubleTwistPreferenceController(context, lifecycle));
         controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle));
         controllers.add(new PickupGesturePreferenceController(
-                context, lifecycle, mAmbientDisplayConfig, UserHandle.myUserId()));
+                context, lifecycle, ambientDisplayConfiguration, UserHandle.myUserId()));
         controllers.add(new DoubleTapScreenPreferenceController(
-                context, lifecycle, mAmbientDisplayConfig, UserHandle.myUserId()));
+                context, lifecycle, ambientDisplayConfiguration, UserHandle.myUserId()));
         controllers.add(new DefaultAutofillPreferenceController(context));
         return controllers;
     }
@@ -163,5 +173,11 @@
                     sir.xmlResId = R.xml.language_and_input;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null,
+                            new AmbientDisplayConfiguration(context));
+                }
             };
 }
diff --git a/src/com/android/settings/language/TtsPreferenceController.java b/src/com/android/settings/language/TtsPreferenceController.java
index 9b40b6d..0d1c753 100644
--- a/src/com/android/settings/language/TtsPreferenceController.java
+++ b/src/com/android/settings/language/TtsPreferenceController.java
@@ -18,14 +18,11 @@
 
 import android.content.Context;
 import android.speech.tts.TtsEngines;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceScreen;
 
 import com.android.settings.core.PreferenceController;
 
 public class TtsPreferenceController extends PreferenceController {
 
-    private static final String KEY_VOICE_CATEGORY = "voice_category";
     private static final String KEY_TTS_SETTINGS = "tts_settings";
 
     private final TtsEngines mTtsEngines;
@@ -41,14 +38,6 @@
     }
 
     @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        if (!isAvailable()) {
-            removePreference(screen, KEY_VOICE_CATEGORY);
-        }
-    }
-
-    @Override
     public String getPreferenceKey() {
         return KEY_TTS_SETTINGS;
     }
diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java
index a0ccf20..a28a726 100644
--- a/src/com/android/settings/network/NetworkDashboardFragment.java
+++ b/src/com/android/settings/network/NetworkDashboardFragment.java
@@ -142,5 +142,13 @@
                     sir.xmlResId = R.xml.network_and_internet;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<String> getNonIndexableKeys(Context context) {
+                    List<String> keys = new ArrayList<>();
+                    // Remove master switch as a result
+                    keys.add(WifiMasterSwitchPreferenceController.KEY_TOGGLE_WIFI);
+                    return keys;
+                }
             };
 }
diff --git a/src/com/android/settings/network/NetworkResetPreferenceController.java b/src/com/android/settings/network/NetworkResetPreferenceController.java
index ce36a7f..d8f3217 100644
--- a/src/com/android/settings/network/NetworkResetPreferenceController.java
+++ b/src/com/android/settings/network/NetworkResetPreferenceController.java
@@ -31,7 +31,7 @@
 
     @Override
     public boolean isAvailable() {
-        return !mRestrictionChecker.hasRestriction();
+        return !mRestrictionChecker.hasUserRestriction();
     }
 
     @Override
diff --git a/src/com/android/settings/network/NetworkResetRestrictionChecker.java b/src/com/android/settings/network/NetworkResetRestrictionChecker.java
index 4fe9f59..2b630bd 100644
--- a/src/com/android/settings/network/NetworkResetRestrictionChecker.java
+++ b/src/com/android/settings/network/NetworkResetRestrictionChecker.java
@@ -45,9 +45,13 @@
                 mContext, UserManager.DISALLOW_NETWORK_RESET, UserHandle.myUserId()) != null;
     }
 
-    boolean hasRestriction() {
+    boolean hasUserRestriction() {
         return !mUserManager.isAdminUser()
-                || hasUserBaseRestriction()
+                || hasUserBaseRestriction();
+    }
+
+    boolean hasRestriction() {
+        return hasUserRestriction()
                 || isRestrictionEnforcedByAdmin();
     }
 }
diff --git a/src/com/android/settings/network/NetworkScorerPicker.java b/src/com/android/settings/network/NetworkScorerPicker.java
index 2d04e56..1280cf5 100644
--- a/src/com/android/settings/network/NetworkScorerPicker.java
+++ b/src/com/android/settings/network/NetworkScorerPicker.java
@@ -74,14 +74,19 @@
         screen.removeAll();
 
         final List<NetworkScorerAppData> scorers = mNetworkScoreManager.getAllValidScorers();
-        if (scorers.isEmpty()) {
-            final RadioButtonPreference nonePref = new RadioButtonPreference(getPrefContext());
-            nonePref.setTitle(R.string.network_scorer_picker_none_preference);
-            nonePref.setChecked(true);
-            screen.addPreference(nonePref);
-            return;
-        }
         final String defaultAppKey = getActiveScorerPackage();
+
+        final RadioButtonPreference nonePref = new RadioButtonPreference(getPrefContext());
+        nonePref.setTitle(R.string.network_scorer_picker_none_preference);
+        if (scorers.isEmpty()) {
+            nonePref.setChecked(true);
+        } else {
+            nonePref.setKey(null);
+            nonePref.setChecked(TextUtils.isEmpty(defaultAppKey));
+            nonePref.setOnClickListener(this);
+        }
+        screen.addPreference(nonePref);
+
         final int numScorers = scorers.size();
         for (int i = 0; i < numScorers; i++) {
             final RadioButtonPreference pref = new RadioButtonPreference(getPrefContext());
diff --git a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
index 6ff6edb..3e481a8 100644
--- a/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
+++ b/src/com/android/settings/network/NetworkScorerPickerPreferenceController.java
@@ -17,14 +17,16 @@
 
 import android.content.Context;
 import android.net.NetworkScorerAppData;
-import android.provider.Settings;
 import android.support.v7.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
 
+import java.util.List;
+
 /**
  * {@link PreferenceController} that shows the active network scorer and toggles the preference
- * based on {@link Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED}.
+ * based on whether or not there are valid scorers installed.
  */
 public class NetworkScorerPickerPreferenceController extends PreferenceController {
 
@@ -45,8 +47,9 @@
 
     @Override
     public void updateState(Preference preference) {
-        boolean enabled = Settings.Global.getInt(mContext.getContentResolver(),
-                Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED, 0) == 1;
+        final List<NetworkScorerAppData> allValidScorers =
+                mNetworkScoreManager.getAllValidScorers();
+        boolean enabled = !allValidScorers.isEmpty();
         preference.setEnabled(enabled);
         if (!enabled) {
             preference.setSummary(null);
diff --git a/src/com/android/settings/network/TetherPreferenceController.java b/src/com/android/settings/network/TetherPreferenceController.java
index f23118a..19a22ba 100644
--- a/src/com/android/settings/network/TetherPreferenceController.java
+++ b/src/com/android/settings/network/TetherPreferenceController.java
@@ -19,8 +19,12 @@
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.database.ContentObserver;
 import android.net.ConnectivityManager;
+import android.net.Uri;
+import android.os.Handler;
 import android.os.UserHandle;
+import android.provider.Settings;
 import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceScreen;
@@ -31,6 +35,8 @@
 import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.core.lifecycle.LifecycleObserver;
 import com.android.settings.core.lifecycle.events.OnDestroy;
+import com.android.settings.core.lifecycle.events.OnPause;
+import com.android.settings.core.lifecycle.events.OnResume;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -39,7 +45,7 @@
 import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
 
 public class TetherPreferenceController extends PreferenceController
-        implements LifecycleObserver, OnDestroy {
+        implements LifecycleObserver, OnResume, OnPause, OnDestroy {
 
     private static final String KEY_TETHER_SETTINGS = "tether_settings";
 
@@ -47,7 +53,6 @@
     private final AtomicReference<BluetoothPan> mBluetoothPan;
     private final ConnectivityManager mConnectivityManager;
     private final BluetoothAdapter mBluetoothAdapter;
-
     private final BluetoothProfile.ServiceListener mBtProfileServiceListener =
             new android.bluetooth.BluetoothProfile.ServiceListener() {
                 public void onServiceConnected(int profile, BluetoothProfile proxy) {
@@ -60,6 +65,7 @@
                 }
             };
 
+    private SettingObserver mAirplaneModeObserver;
     private Preference mPreference;
 
     @VisibleForTesting(otherwise = VisibleForTesting.NONE)
@@ -121,6 +127,22 @@
     }
 
     @Override
+    public void onResume() {
+        if (mAirplaneModeObserver == null) {
+            mAirplaneModeObserver = new SettingObserver();
+        }
+        mContext.getContentResolver()
+                .registerContentObserver(mAirplaneModeObserver.uri, false, mAirplaneModeObserver);
+    }
+
+    @Override
+    public void onPause() {
+        if (mAirplaneModeObserver != null) {
+            mContext.getContentResolver().unregisterContentObserver(mAirplaneModeObserver);
+        }
+    }
+
+    @Override
     public void onDestroy() {
         final BluetoothProfile profile = mBluetoothPan.getAndSet(null);
         if (profile != null && mBluetoothAdapter != null) {
@@ -128,7 +150,7 @@
         }
     }
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     void updateSummary() {
         if (mPreference == null) {
             // Preference is not ready yet.
@@ -183,4 +205,37 @@
             mPreference.setSummary(R.string.tether_settings_summary_hotspot_off_tether_on);
         }
     }
+
+    private void updateSummaryToOff() {
+        if (mPreference == null) {
+            // Preference is not ready yet.
+            return;
+        }
+        mPreference.setSummary(R.string.switch_off_text);
+    }
+
+    class SettingObserver extends ContentObserver {
+
+        public final Uri uri;
+
+        public SettingObserver() {
+            super(new Handler());
+            uri = Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON);
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            super.onChange(selfChange, uri);
+            if (this.uri.equals(uri)) {
+                boolean isAirplaneMode = Settings.Global.getInt(mContext.getContentResolver(),
+                        Settings.Global.AIRPLANE_MODE_ON, 0) != 0;
+                if (isAirplaneMode) {
+                    // Airplane mode is on. Update summary to say tether is OFF directly. We cannot
+                    // go through updateSummary() because turning off tether takes time, and we
+                    // might still get "ON" status when rerun updateSummary(). So, just say it's off
+                    updateSummaryToOff();
+                }
+            }
+        }
+    }
 }
diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java
index db5cf2f..2048384 100644
--- a/src/com/android/settings/notification/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/AppNotificationSettings.java
@@ -24,6 +24,7 @@
 import android.app.Activity;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
+import android.app.NotificationManager;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -33,17 +34,22 @@
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.AppHeader;
-import com.android.settings.DimmableIconPreference;
 import com.android.settings.R;
 import com.android.settings.Utils;
 import com.android.settings.applications.AppHeaderController;
 import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.LayoutPreference;
 import com.android.settings.notification.NotificationBackend.AppRow;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.FooterPreference;
 import com.android.settings.widget.MasterSwitchPreference;
+import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedSwitchPreference;
 
 import java.text.Collator;
@@ -57,12 +63,14 @@
     private static final String TAG = "AppNotificationSettings";
     private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
 
-    private static final String KEY_BLOCK = "block";
     private static final String KEY_IMPORTANCE = "allow_sound";
 
     private List<NotificationChannelGroup> mChannelGroupList;
     private List<PreferenceCategory> mChannelGroups = new ArrayList();
     private RestrictedSwitchPreference mImportanceToggle;
+    private LayoutPreference mBlockBar;
+    private FooterPreference mDeletedChannels;
+    private SwitchBar mSwitchBar;
 
     private boolean mShowLegacyChannelConfig = false;
 
@@ -83,13 +91,15 @@
 
         if (getPreferenceScreen() != null) {
             getPreferenceScreen().removeAll();
+            mChannelGroups.clear();
+            mShowLegacyChannelConfig = false;
         }
 
         addPreferencesFromResource(R.xml.app_notification_settings);
         getPreferenceScreen().setOrderingAsAdded(true);
 
-        mBlock = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BLOCK);
         mBadge = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BADGE);
+        mBlockedDesc = (FooterPreference) getPreferenceScreen().findPreference(KEY_BLOCKED_DESC);
 
         setupBlock();
         setupBadge();
@@ -127,11 +137,7 @@
                 .done(activity, getPrefContext());
         getPreferenceScreen().addPreference(pref);
 
-        if (mUid < 0 || TextUtils.isEmpty(mPkg) || mPkgInfo == null) {
-            Log.w(TAG, "Missing package or uid or packageinfo");
-            finish();
-            return;
-        }
+        updateDependents(mAppRow.banned);
     }
 
     private void populateChannelList() {
@@ -187,12 +193,12 @@
 
             int deletedChannelCount = mBackend.getDeletedChannelCount(mAppRow.pkg, mAppRow.uid);
             if (deletedChannelCount > 0) {
-                DimmableIconPreference deletedPref = new DimmableIconPreference(getPrefContext());
-                deletedPref.setSelectable(false);
-                deletedPref.setTitle(getResources().getQuantityString(
+                mDeletedChannels = new FooterPreference(getPrefContext());
+                mDeletedChannels.setSelectable(false);
+                mDeletedChannels.setTitle(getResources().getQuantityString(
                         R.plurals.deleted_channels, deletedChannelCount, deletedChannelCount));
-                deletedPref.setIcon(R.drawable.ic_info);
-                getPreferenceScreen().addPreference(deletedPref);
+                mDeletedChannels.setEnabled(false);
+                getPreferenceScreen().addPreference(mDeletedChannels);
             }
         }
         updateDependents(mAppRow.banned);
@@ -214,7 +220,8 @@
         channelArgs.putString(Settings.EXTRA_CHANNEL_ID, channel.getId());
         Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
                 ChannelNotificationSettings.class.getName(),
-                channelArgs, null, 0, null, false, getMetricsCategory());
+                channelArgs, null, R.string.notification_channel_title, null, false,
+                getMetricsCategory());
         channelPref.setIntent(channelIntent);
 
         channelPref.setOnPreferenceChangeListener(
@@ -227,6 +234,7 @@
                         channel.setImportance(importance);
                         channel.lockFields(
                                 NotificationChannel.USER_LOCKED_IMPORTANCE);
+                        channelPref.setSummary(getImportanceSummary(channel.getImportance()));
                         mBackend.updateChannel(mPkg, mUid, channel);
 
                         return true;
@@ -237,8 +245,7 @@
 
     private void populateDefaultChannelPrefs() {
         addPreferencesFromResource(R.xml.legacy_channel_notification_settings);
-        mPriority =
-                (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
+        mPriority = (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
         mVisibilityOverride =
                 (RestrictedDropDownPreference) findPreference(KEY_VISIBILITY_OVERRIDE);
         mImportanceToggle = (RestrictedSwitchPreference) findPreference(KEY_IMPORTANCE);
@@ -248,8 +255,11 @@
             setupVisOverridePref(mChannel.getLockscreenVisibility());
             setupImportanceToggle();
         }
+        mSwitchBar.setChecked(!mAppRow.banned
+                && mChannel.getImportance() != NotificationManager.IMPORTANCE_NONE);
     }
 
+    // 'allow sound'
     private void setupImportanceToggle() {
         mImportanceToggle.setDisabledByAdmin(mSuspendedAppsAdmin);
         mImportanceToggle.setChecked(mChannel.getImportance() >= IMPORTANCE_DEFAULT
@@ -268,6 +278,40 @@
         });
     }
 
+    protected void setupBlock() {
+        View switchBarContainer = LayoutInflater.from(
+                getPrefContext()).inflate(R.layout.styled_switch_bar, null);
+        mSwitchBar = switchBarContainer.findViewById(R.id.switch_bar);
+        mSwitchBar.show();
+        mSwitchBar.setDisabledByAdmin(mSuspendedAppsAdmin);
+        mSwitchBar.setChecked(!mAppRow.banned);
+        mSwitchBar.addOnSwitchChangeListener(new SwitchBar.OnSwitchChangeListener() {
+            @Override
+            public void onSwitchChanged(Switch switchView, boolean isChecked) {
+                if (mShowLegacyChannelConfig && mChannel != null) {
+                    final int importance = isChecked ? IMPORTANCE_UNSPECIFIED : IMPORTANCE_NONE;
+                    mImportanceToggle.setChecked(importance == IMPORTANCE_UNSPECIFIED);
+                    mChannel.setImportance(importance);
+                    mChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
+                    mBackend.updateChannel(mPkg, mUid, mChannel);
+                }
+                mBackend.setNotificationsEnabledForPackage(mPkgInfo.packageName, mUid, isChecked);
+                updateDependents(!isChecked);
+            }
+        });
+
+        mBlockBar = new LayoutPreference(getPrefContext(), switchBarContainer);
+        mBlockBar.setOrder(-500);
+        mBlockBar.setKey(KEY_BLOCK);
+        getPreferenceScreen().addPreference(mBlockBar);
+
+        if (mAppRow.systemApp && !mAppRow.banned) {
+            setVisible(mBlockBar, false);
+        }
+
+        setupBlockDesc(R.string.app_notifications_off_desc);
+    }
+
     private void setupBadge() {
         mBadge.setDisabledByAdmin(mSuspendedAppsAdmin);
         mBadge.setChecked(mAppRow.showBadge);
@@ -281,31 +325,14 @@
         });
     }
 
-    private void setupBlock() {
-        if (mAppRow.systemApp && !mAppRow.banned) {
-            setVisible(mBlock, false);
-        } else {
-            mBlock.setDisabledByAdmin(mSuspendedAppsAdmin);
-            mBlock.setChecked(mAppRow.banned);
-            mBlock.setOnPreferenceChangeListener(
-                    new Preference.OnPreferenceChangeListener() {
-                        @Override
-                        public boolean onPreferenceChange(Preference preference,
-                                Object newValue) {
-                            final boolean blocked = (Boolean) newValue;
-                            mBackend.setNotificationsEnabledForPackage(mPkgInfo.packageName, mUid,
-                                    !blocked);
-                            updateDependents(blocked);
-                            return true;
-                        }
-                    });
-        }
-    }
-
     private void updateDependents(boolean banned) {
         for (PreferenceCategory category : mChannelGroups) {
             setVisible(category, !banned);
         }
+        if (mDeletedChannels != null) {
+            setVisible(mDeletedChannels, !banned);
+        }
+        setVisible(mBlockedDesc, banned);
         setVisible(mBadge, !banned);
         if (mShowLegacyChannelConfig) {
             setVisible(mImportanceToggle, !banned);
@@ -313,7 +340,7 @@
             setVisible(mVisibilityOverride, !banned);
         }
         if (mAppRow.systemApp && !mAppRow.banned) {
-            setVisible(mBlock, false);
+            setVisible(mBlockBar, false);
         }
     }
 
diff --git a/src/com/android/settings/notification/ChannelImportanceSettings.java b/src/com/android/settings/notification/ChannelImportanceSettings.java
new file mode 100644
index 0000000..b396b20
--- /dev/null
+++ b/src/com/android/settings/notification/ChannelImportanceSettings.java
@@ -0,0 +1,151 @@
+/*
+ * 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 android.app.NotificationChannel.USER_LOCKED_IMPORTANCE;
+import static android.app.NotificationManager.IMPORTANCE_DEFAULT;
+import static android.app.NotificationManager.IMPORTANCE_HIGH;
+import static android.app.NotificationManager.IMPORTANCE_LOW;
+import static android.app.NotificationManager.IMPORTANCE_MAX;
+import static android.app.NotificationManager.IMPORTANCE_MIN;
+
+import android.content.Context;
+import android.provider.SearchIndexableResource;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+import android.text.TextUtils;
+import android.util.Log;
+
+import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
+import com.android.settings.R;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.widget.RadioButtonPreference;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ChannelImportanceSettings extends NotificationSettingsBase
+        implements RadioButtonPreference.OnClickListener, Indexable {
+    private static final String TAG = "NotiImportance";
+
+    private static final String KEY_IMPORTANCE_HIGH = "importance_high";
+    private static final String KEY_IMPORTANCE_DEFAULT = "importance_default";
+    private static final String KEY_IMPORTANCE_LOW = "importance_low";
+    private static final String KEY_IMPORTANCE_MIN = "importance_min";
+
+    List<RadioButtonPreference> mImportances = new ArrayList<>();
+
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.NOTIFICATION_CHANNEL_IMPORTANCE;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (mUid < 0 || TextUtils.isEmpty(mPkg) || mPkgInfo == null || mChannel == null) {
+            Log.w(TAG, "Missing package or uid or packageinfo or channel");
+            finish();
+            return;
+        }
+        createPreferenceHierarchy();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+    }
+
+    private PreferenceScreen createPreferenceHierarchy() {
+        PreferenceScreen root = getPreferenceScreen();
+        if (root != null) {
+            root.removeAll();
+        }
+        addPreferencesFromResource(R.xml.notification_importance);
+        root = getPreferenceScreen();
+
+        for (int i = 0; i < root.getPreferenceCount(); i++) {
+            Preference pref = root.getPreference(i);
+            if (pref instanceof RadioButtonPreference) {
+                RadioButtonPreference radioPref = (RadioButtonPreference) pref;
+                radioPref.setOnClickListener(this);
+                mImportances.add(radioPref);
+            }
+        }
+
+        switch (mChannel.getImportance()) {
+            case IMPORTANCE_MIN:
+                updateRadioButtons(KEY_IMPORTANCE_MIN);
+                break;
+            case IMPORTANCE_LOW:
+                updateRadioButtons(KEY_IMPORTANCE_LOW);
+                break;
+            case IMPORTANCE_DEFAULT:
+                updateRadioButtons(KEY_IMPORTANCE_DEFAULT);
+                break;
+            case IMPORTANCE_HIGH:
+            case IMPORTANCE_MAX:
+                updateRadioButtons(KEY_IMPORTANCE_HIGH);
+                break;
+        }
+
+        return root;
+    }
+
+    private void updateRadioButtons(String selectionKey) {
+        for (RadioButtonPreference pref : mImportances) {
+            if (selectionKey.equals(pref.getKey())) {
+                pref.setChecked(true);
+            } else {
+                pref.setChecked(false);
+            }
+        }
+    }
+
+    @Override
+    public void onRadioButtonClicked(RadioButtonPreference clicked) {
+        switch (clicked.getKey()) {
+            case KEY_IMPORTANCE_HIGH:
+                mChannel.setImportance(IMPORTANCE_HIGH);
+                break;
+            case KEY_IMPORTANCE_DEFAULT:
+                mChannel.setImportance(IMPORTANCE_DEFAULT);
+                break;
+            case KEY_IMPORTANCE_LOW:
+                mChannel.setImportance(IMPORTANCE_LOW);
+                break;
+            case KEY_IMPORTANCE_MIN:
+                mChannel.setImportance(IMPORTANCE_MIN);
+                break;
+        }
+        updateRadioButtons(clicked.getKey());
+        mChannel.lockFields(USER_LOCKED_IMPORTANCE);
+        mBackend.updateChannel(mAppRow.pkg, mAppRow.uid, mChannel);
+    }
+
+    // This page exists per notification channel; should not be included
+    // in search
+    public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+            new BaseSearchIndexProvider() {
+                @Override
+                public List<SearchIndexableResource> getXmlResourcesToIndex(
+                        Context context, boolean enabled) {
+                    return null;
+                }
+            };
+}
diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java
index f6a7b42..0fb42d2 100644
--- a/src/com/android/settings/notification/ChannelNotificationSettings.java
+++ b/src/com/android/settings/notification/ChannelNotificationSettings.java
@@ -16,9 +16,7 @@
 
 package com.android.settings.notification;
 
-import static android.app.NotificationManager.IMPORTANCE_HIGH;
 import static android.app.NotificationManager.IMPORTANCE_LOW;
-import static android.app.NotificationManager.IMPORTANCE_MIN;
 import static android.app.NotificationManager.IMPORTANCE_NONE;
 
 import android.app.Activity;
@@ -27,25 +25,31 @@
 import android.content.Intent;
 import android.content.pm.UserInfo;
 import android.net.Uri;
+import android.os.Bundle;
 import android.os.UserHandle;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.ArrayMap;
 import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Switch;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.internal.widget.LockPatternUtils;
-import com.android.settings.DimmableIconPreference;
+import com.android.settings.AppHeader;
 import com.android.settings.R;
 import com.android.settings.RingtonePreference;
+import com.android.settings.Utils;
 import com.android.settings.applications.AppHeaderController;
+import com.android.settings.applications.AppInfoBase;
+import com.android.settings.applications.LayoutPreference;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.widget.FooterPreference;
+import com.android.settings.widget.SwitchBar;
 import com.android.settingslib.RestrictedSwitchPreference;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class ChannelNotificationSettings extends NotificationSettingsBase {
     private static final String TAG = "ChannelSettings";
 
@@ -53,10 +57,13 @@
     protected static final String KEY_VIBRATE = "vibrate";
     protected static final String KEY_RINGTONE = "ringtone";
 
+    protected Preference mImportance;
     protected RestrictedSwitchPreference mLights;
     protected RestrictedSwitchPreference mVibrate;
     protected NotificationSoundPreference mRingtone;
 
+    protected LayoutPreference mBlockBar;
+
     @Override
     public int getMetricsCategory() {
         return MetricsEvent.NOTIFICATION_TOPIC_NOTIFICATION;
@@ -75,33 +82,33 @@
             getPreferenceScreen().removeAll();
         }
         addPreferencesFromResource(R.xml.channel_notification_settings);
-        getPreferenceScreen().setOrderingAsAdded(true);
 
         // load settings intent
         ArrayMap<String, NotificationBackend.AppRow> rows = new ArrayMap<String, NotificationBackend.AppRow>();
         rows.put(mAppRow.pkg, mAppRow);
         collectConfigActivities(rows);
 
-        mBlock = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BLOCK);
+        mBlockedDesc = (FooterPreference) getPreferenceScreen().findPreference(KEY_BLOCKED_DESC);
         mBadge = (RestrictedSwitchPreference) getPreferenceScreen().findPreference(KEY_BADGE);
-        mImportance = (RestrictedDropDownPreference) findPreference(KEY_IMPORTANCE);
-        mPriority =
-                (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
+        mImportance = findPreference(KEY_IMPORTANCE);
+        mPriority = (RestrictedSwitchPreference) findPreference(KEY_BYPASS_DND);
         mVisibilityOverride =
                 (RestrictedDropDownPreference) findPreference(KEY_VISIBILITY_OVERRIDE);
         mLights = (RestrictedSwitchPreference) findPreference(KEY_LIGHTS);
         mVibrate = (RestrictedSwitchPreference) findPreference(KEY_VIBRATE);
         mRingtone = (NotificationSoundPreference) findPreference(KEY_RINGTONE);
 
-        if (mPkgInfo != null && mChannel != null) {
-            setupPriorityPref(mChannel.canBypassDnd());
-            setupVisOverridePref(mChannel.getLockscreenVisibility());
-            setupLights();
-            setupVibrate();
-            setupRingtone();
-            setupBlockAndImportance();
-            updateDependents();
-        }
+
+        setupPriorityPref(mChannel.canBypassDnd());
+        setupVisOverridePref(mChannel.getLockscreenVisibility());
+        setupLights();
+        setupVibrate();
+        setupRingtone();
+        setupBadge();
+        setupBlock();
+        setupImportance();
+        updateDependents();
+
         final Activity activity = getActivity();
         final Preference pref = FeatureFactory.getFactory(activity)
                 .getApplicationFeatureProvider(activity)
@@ -124,12 +131,13 @@
         }
 
         if (!TextUtils.isEmpty(mChannel.getDescription())) {
-            DimmableIconPreference descPref = new DimmableIconPreference(getPrefContext());
+            FooterPreference descPref = new FooterPreference(getPrefContext());
             descPref.setSelectable(false);
             descPref.setSummary(mChannel.getDescription());
-            descPref.setIcon(R.drawable.ic_info);
+            descPref.setEnabled(false);
             getPreferenceScreen().addPreference(descPref);
         }
+
     }
 
     private void setupLights() {
@@ -175,27 +183,38 @@
         });
     }
 
-    protected void setupBlockAndImportance() {
+    protected void setupBlock() {
+        View switchBarContainer = LayoutInflater.from(
+                getPrefContext()).inflate(R.layout.styled_switch_bar, null);
+        SwitchBar switchBar = switchBarContainer.findViewById(R.id.switch_bar);
+        switchBar.show();
+        switchBar.setDisabledByAdmin(mSuspendedAppsAdmin);
+        switchBar.setChecked(mChannel.getImportance() != NotificationManager.IMPORTANCE_NONE);
+        switchBar.addOnSwitchChangeListener(new SwitchBar.OnSwitchChangeListener() {
+            @Override
+            public void onSwitchChanged(Switch switchView, boolean isChecked) {
+                int importance = isChecked ? IMPORTANCE_LOW : IMPORTANCE_NONE;
+                mImportance.setSummary(getImportanceSummary(importance));
+                mChannel.setImportance(importance);
+                mChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
+                mBackend.updateChannel(mPkg, mUid, mChannel);
+                updateDependents();
+            }
+        });
+
+        mBlockBar = new LayoutPreference(getPrefContext(), switchBarContainer);
+        mBlockBar.setOrder(-500);
+        mBlockBar.setKey(KEY_BLOCK);
+        getPreferenceScreen().addPreference(mBlockBar);
+
         if (mAppRow.systemApp && mChannel.getImportance() != NotificationManager.IMPORTANCE_NONE) {
-            setVisible(mBlock, false);
-        } else {
-            mBlock.setEnabled(mAppRow.systemApp);
-            mBlock.setDisabledByAdmin(mSuspendedAppsAdmin);
-            mBlock.setChecked(mChannel.getImportance() == NotificationManager.IMPORTANCE_NONE);
-            mBlock.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    final boolean value = (Boolean) newValue;
-                    int importance = value ? IMPORTANCE_NONE : IMPORTANCE_LOW;
-                    mImportance.setValue(String.valueOf(importance));
-                    mChannel.setImportance(importance);
-                    mChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
-                    mBackend.updateChannel(mPkg, mUid, mChannel);
-                    updateDependents();
-                    return true;
-                }
-            });
+            setVisible(mBlockBar, false);
         }
+
+        setupBlockDesc(R.string.channel_notifications_off_desc);
+    }
+
+    protected void setupBadge() {
         mBadge.setDisabledByAdmin(mSuspendedAppsAdmin);
         mBadge.setEnabled(mAppRow.showBadge);
         mBadge.setChecked(mChannel.canShowBadge());
@@ -209,41 +228,21 @@
                 return true;
             }
         });
+    }
 
-        mImportance.setDisabledByAdmin(mSuspendedAppsAdmin);
-        final int numImportances = IMPORTANCE_HIGH - IMPORTANCE_MIN + 1;
-        List<String> summaries = new ArrayList<>();
-        List<String> values = new ArrayList<>();
-
-        for (int i = 0; i < numImportances; i++) {
-            int importance = i + 1;
-            summaries.add(getImportanceSummary(importance));
-            values.add(String.valueOf(importance));
-        }
-        if (NotificationChannel.DEFAULT_CHANNEL_ID.equals(mChannel.getId())) {
-            // Add option to reset to letting the app decide
-            summaries.add(getImportanceSummary(NotificationManager.IMPORTANCE_UNSPECIFIED));
-            values.add(String.valueOf(NotificationManager.IMPORTANCE_UNSPECIFIED));
-        }
-        mImportance.setEntryValues(values.toArray(new String[0]));
-        mImportance.setEntries(summaries.toArray(new String[0]));
-        mImportance.setValue(String.valueOf(mChannel.getImportance()));
+    protected void setupImportance() {
+        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());
+        Intent channelIntent = Utils.onBuildStartFragmentIntent(getActivity(),
+                ChannelImportanceSettings.class.getName(),
+                channelArgs, null, R.string.notification_importance_title, null,
+                false, getMetricsCategory());
+        mImportance.setIntent(channelIntent);
+        mImportance.setEnabled(mSuspendedAppsAdmin == null);
         mImportance.setSummary(getImportanceSummary(mChannel.getImportance()));
-        if (mAppRow.lockedImportance) {
-            mImportance.setEnabled(false);
-        } else {
-            mImportance.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    int importance = Integer.parseInt((String) newValue);
-                    mChannel.setImportance(importance);
-                    mChannel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
-                    mBackend.updateChannel(mPkg, mUid, mChannel);
-                    updateDependents();
-                    return true;
-                }
-            });
-        }
     }
 
     private boolean isLockScreenSecure() {
@@ -292,6 +291,7 @@
     }
 
     private void updateDependents() {
+        setVisible(mBlockedDesc, mChannel.getImportance() == IMPORTANCE_NONE);
         setVisible(mBadge, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
         setVisible(mImportance, checkCanBeVisible(NotificationManager.IMPORTANCE_MIN));
         setVisible(mLights, checkCanBeVisible(
diff --git a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
index 8f26ed8..39250c6 100644
--- a/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
+++ b/src/com/android/settings/notification/EmergencyBroadcastPreferenceController.java
@@ -20,9 +20,9 @@
 import android.content.pm.PackageManager;
 import android.os.UserHandle;
 import android.os.UserManager;
+import android.support.annotation.VisibleForTesting;
 import android.support.v7.preference.Preference;
 
-import com.android.internal.annotations.VisibleForTesting;
 import com.android.settings.accounts.AccountRestrictionHelper;
 import com.android.settings.core.PreferenceController;
 import com.android.settingslib.RestrictedPreference;
@@ -33,20 +33,22 @@
  */
 public class EmergencyBroadcastPreferenceController extends PreferenceController {
 
-    private static final String KEY_CELL_BROADCAST_SETTINGS = "cell_broadcast_settings";
+    private final String mPrefKey;
 
     private AccountRestrictionHelper mHelper;
     private UserManager mUserManager;
     private PackageManager mPm;
     private boolean mCellBroadcastAppLinkEnabled;
 
-    public EmergencyBroadcastPreferenceController(Context context) {
-        this(context, new AccountRestrictionHelper(context));
+    public EmergencyBroadcastPreferenceController(Context context, String prefKey) {
+        this(context, new AccountRestrictionHelper(context), prefKey);
     }
 
-    @VisibleForTesting
-    EmergencyBroadcastPreferenceController(Context context, AccountRestrictionHelper helper) {
+    @VisibleForTesting(otherwise = VisibleForTesting.NONE)
+    EmergencyBroadcastPreferenceController(Context context, AccountRestrictionHelper helper,
+            String prefKey) {
         super(context);
+        mPrefKey = prefKey;
         mHelper = helper;
         mUserManager = (UserManager) context.getSystemService(Context.USER_SERVICE);
         mPm = mContext.getPackageManager();
@@ -60,7 +62,7 @@
             return;
         }
         ((RestrictedPreference) preference).checkRestrictionAndSetDisabled(
-            UserManager.DISALLOW_CONFIG_CELL_BROADCASTS);
+                UserManager.DISALLOW_CONFIG_CELL_BROADCASTS);
     }
 
     @Override
@@ -70,23 +72,23 @@
 
     @Override
     public String getPreferenceKey() {
-        return KEY_CELL_BROADCAST_SETTINGS;
+        return mPrefKey;
     }
 
     @Override
     public boolean isAvailable() {
         return mUserManager.isAdminUser() && mCellBroadcastAppLinkEnabled
-            && !mHelper.hasBaseUserRestriction(
+                && !mHelper.hasBaseUserRestriction(
                 UserManager.DISALLOW_CONFIG_CELL_BROADCASTS, UserHandle.myUserId());
     }
 
     private boolean isCellBroadcastAppLinkEnabled() {
         boolean enabled = mContext.getResources().getBoolean(
-            com.android.internal.R.bool.config_cellBroadcastAppLinks);
+                com.android.internal.R.bool.config_cellBroadcastAppLinks);
         if (enabled) {
             try {
                 if (mPm.getApplicationEnabledSetting("com.android.cellbroadcastreceiver")
-                    == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
+                        == PackageManager.COMPONENT_ENABLED_STATE_DISABLED) {
                     enabled = false;  // CMAS app disabled
                 }
             } catch (IllegalArgumentException ignored) {
diff --git a/src/com/android/settings/notification/NotificationSettingsBase.java b/src/com/android/settings/notification/NotificationSettingsBase.java
index ff0a512..c08f161 100644
--- a/src/com/android/settings/notification/NotificationSettingsBase.java
+++ b/src/com/android/settings/notification/NotificationSettingsBase.java
@@ -19,6 +19,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsPreferenceFragment;
 import com.android.settings.applications.AppInfoBase;
+import com.android.settings.widget.FooterPreference;
 import com.android.settingslib.RestrictedLockUtils;
 import com.android.settingslib.RestrictedSwitchPreference;
 
@@ -39,6 +40,7 @@
 import android.os.UserManager;
 import android.provider.Settings;
 import android.service.notification.NotificationListenerService;
+import android.support.v7.preference.DropDownPreference;
 import android.support.v7.preference.Preference;
 import android.text.TextUtils;
 import android.util.ArrayMap;
@@ -63,6 +65,7 @@
     protected static final String KEY_BYPASS_DND = "bypass_dnd";
     protected static final String KEY_VISIBILITY_OVERRIDE = "visibility_override";
     protected static final String KEY_IMPORTANCE = "importance";
+    protected static final String KEY_BLOCKED_DESC = "block_desc";
 
     protected PackageManager mPm;
     protected UserManager mUm;
@@ -73,11 +76,10 @@
     protected int mUserId;
     protected String mPkg;
     protected PackageInfo mPkgInfo;
-    protected RestrictedSwitchPreference mBlock;
     protected RestrictedSwitchPreference mBadge;
-    protected RestrictedDropDownPreference mImportance;
     protected RestrictedSwitchPreference mPriority;
     protected RestrictedDropDownPreference mVisibilityOverride;
+    protected FooterPreference mBlockedDesc;
 
     protected EnforcedAdmin mSuspendedAppsAdmin;
     protected boolean mDndVisualEffectsSuppressed;
@@ -325,6 +327,15 @@
         mVisibilityOverride.setDisabledByAdmin(mSuspendedAppsAdmin);
     }
 
+    protected void setupBlockDesc(int summaryResId) {
+        mBlockedDesc = new FooterPreference(getPrefContext());
+        mBlockedDesc.setSelectable(false);
+        mBlockedDesc.setTitle(summaryResId);
+        mBlockedDesc.setEnabled(false);
+        mBlockedDesc.setOrder(50);
+        getPreferenceScreen().addPreference(mBlockedDesc);
+    }
+
 
     private void setRestrictedIfNotificationFeaturesDisabled(CharSequence entry,
             CharSequence entryValue, int keyguardNotificationFeatures) {
diff --git a/src/com/android/settings/notification/NotificationSoundPreference.java b/src/com/android/settings/notification/NotificationSoundPreference.java
index c007485..71684d5 100644
--- a/src/com/android/settings/notification/NotificationSoundPreference.java
+++ b/src/com/android/settings/notification/NotificationSoundPreference.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.notification;
 
 import android.content.ContentResolver;
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index a357846..8850beb 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -72,6 +72,8 @@
     private Handler mHandler;
 
     private static class HistoricalNotificationInfo {
+        public String key;
+        public String channel;
         public String pkg;
         public Drawable pkgicon;
         public CharSequence pkgname;
@@ -271,8 +273,6 @@
             List<HistoricalNotificationInfo> list
                     = new ArrayList<HistoricalNotificationInfo>(active.length + dismissed.length);
 
-            final Ranking rank = new Ranking();
-
             for (StatusBarNotification[] resultset
                     : new StatusBarNotification[][] { active, dismissed }) {
                 for (StatusBarNotification sbn : resultset) {
@@ -293,184 +293,12 @@
                     }
                     info.timestamp = sbn.getPostTime();
                     info.priority = n.priority;
+                    info.channel = n.getChannelId();
+                    info.key = sbn.getKey();
 
                     info.active = (resultset == active);
 
-                    final SpannableStringBuilder sb = new SpannableStringBuilder();
-                    final String delim = getString(R.string.notification_log_details_delimiter);
-                    sb.append(bold(getString(R.string.notification_log_details_package)))
-                            .append(delim)
-                            .append(info.pkg)
-                            .append("\n")
-                            .append(bold(getString(R.string.notification_log_details_key)))
-                            .append(delim)
-                            .append(sbn.getKey());
-                    sb.append("\n")
-                            .append(bold(getString(R.string.notification_log_details_icon)))
-                            .append(delim)
-                            .append(n.getSmallIcon().toString());
-                    if (sbn.isGroup()) {
-                        sb.append("\n")
-                                .append(bold(getString(R.string.notification_log_details_group)))
-                                .append(delim)
-                                .append(sbn.getGroupKey());
-                        if (n.isGroupSummary()) {
-                            sb.append(bold(
-                                    getString(R.string.notification_log_details_group_summary)));
-                        }
-                    }
-                    sb.append("\n")
-                            .append(bold(getString(R.string.notification_log_details_sound)))
-                            .append(delim);
-                    if (0 != (n.defaults & Notification.DEFAULT_SOUND)) {
-                        sb.append(getString(R.string.notification_log_details_default));
-                    } else if (n.sound != null) {
-                        sb.append(n.sound.toString());
-                    } else {
-                        sb.append(getString(R.string.notification_log_details_none));
-                    }
-                    sb.append("\n")
-                            .append(bold(getString(R.string.notification_log_details_vibrate)))
-                            .append(delim);
-                    if (0 != (n.defaults & Notification.DEFAULT_VIBRATE)) {
-                        sb.append(getString(R.string.notification_log_details_default));
-                    } else if (n.vibrate != null) {
-                        for (int vi=0;vi<n.vibrate.length;vi++) {
-                            if (vi > 0) sb.append(',');
-                            sb.append(String.valueOf(n.vibrate[vi]));
-                        }
-                    } else {
-                        sb.append(getString(R.string.notification_log_details_none));
-                    }
-                    sb.append("\n")
-                            .append(bold(getString(R.string.notification_log_details_visibility)))
-                            .append(delim)
-                            .append(Notification.visibilityToString(n.visibility));
-                    if (n.publicVersion != null) {
-                        sb.append("\n")
-                                .append(bold(getString(
-                                        R.string.notification_log_details_public_version)))
-                                .append(delim)
-                                .append(getTitleString(n.publicVersion));
-                    }
-                    sb.append("\n")
-                            .append(bold(getString(R.string.notification_log_details_priority)))
-                            .append(delim)
-                            .append(Notification.priorityToString(n.priority));
-                    if (resultset == active) {
-                        // mRanking only applies to active notifications
-                        if (mRanking != null && mRanking.getRanking(sbn.getKey(), rank)) {
-                            sb.append("\n")
-                                    .append(bold(getString(
-                                            R.string.notification_log_details_importance)))
-                                    .append(delim)
-                                    .append(Ranking.importanceToString(rank.getImportance()));
-                            if (rank.getImportanceExplanation() != null) {
-                                sb.append("\n")
-                                        .append(bold(getString(
-                                                R.string.notification_log_details_explanation)))
-                                        .append(delim)
-                                        .append(rank.getImportanceExplanation());
-                            }
-                            sb.append("\n")
-                                    .append(bold(getString(
-                                            R.string.notification_log_details_badge)))
-                                    .append(delim)
-                                    .append(Boolean.toString(rank.canShowBadge()));
-                        } else {
-                            if (mRanking == null) {
-                                sb.append("\n")
-                                        .append(bold(getString(
-                                                R.string.notification_log_details_ranking_null)));
-                            } else {
-                                sb.append("\n")
-                                        .append(bold(getString(
-                                                R.string.notification_log_details_ranking_none)));
-                            }
-                        }
-                    }
-                    if (n.contentIntent != null) {
-                        sb.append("\n")
-                                .append(bold(getString(
-                                        R.string.notification_log_details_content_intent)))
-                                .append(delim)
-                                .append(formatPendingIntent(n.contentIntent));
-                    }
-                    if (n.deleteIntent != null) {
-                        sb.append("\n")
-                                .append(bold(getString(
-                                        R.string.notification_log_details_delete_intent)))
-                                .append(delim)
-                                .append(formatPendingIntent(n.deleteIntent));
-                    }
-                    if (n.fullScreenIntent != null) {
-                        sb.append("\n")
-                                .append(bold(getString(
-                                        R.string.notification_log_details_full_screen_intent)))
-                                .append(delim)
-                                .append(formatPendingIntent(n.fullScreenIntent));
-                    }
-                    if (n.actions != null && n.actions.length > 0) {
-                        sb.append("\n")
-                                .append(bold(getString(R.string.notification_log_details_actions)));
-                        for (int ai=0; ai<n.actions.length; ai++) {
-                            final Notification.Action action = n.actions[ai];
-                            sb.append("\n  ").append(String.valueOf(ai)).append(' ')
-                                    .append(bold(getString(
-                                            R.string.notification_log_details_title)))
-                                    .append(delim)
-                                    .append(action.title);
-                            if (action.actionIntent != null) {
-                                sb.append("\n    ")
-                                        .append(bold(getString(
-                                                R.string.notification_log_details_content_intent)))
-                                        .append(delim)
-                                        .append(formatPendingIntent(action.actionIntent));
-                            }
-                            if (action.getRemoteInputs() != null) {
-                                sb.append("\n    ")
-                                        .append(bold(getString(
-                                                R.string.notification_log_details_remoteinput)))
-                                        .append(delim)
-                                        .append(String.valueOf(action.getRemoteInputs().length));
-                            }
-                        }
-                    }
-                    if (n.contentView != null) {
-                        sb.append("\n")
-                                .append(bold(getString(
-                                        R.string.notification_log_details_content_view)))
-                                .append(delim)
-                                .append(n.contentView.toString());
-                    }
-
-                    if (DUMP_EXTRAS) {
-                        if (n.extras != null && n.extras.size() > 0) {
-                            sb.append("\n")
-                                    .append(bold(getString(
-                                            R.string.notification_log_details_extras)));
-                            for (String extraKey : n.extras.keySet()) {
-                                String val = String.valueOf(n.extras.get(extraKey));
-                                if (val.length() > 100) val = val.substring(0, 100) + "...";
-                                sb.append("\n  ").append(extraKey).append(delim).append(val);
-                            }
-                        }
-                    }
-                    if (DUMP_PARCEL) {
-                        final Parcel p = Parcel.obtain();
-                        n.writeToParcel(p, 0);
-                        sb.append("\n")
-                                .append(bold(getString(R.string.notification_log_details_parcel)))
-                                .append(delim)
-                                .append(String.valueOf(p.dataPosition()))
-                                .append(' ')
-                                .append(bold(getString(R.string.notification_log_details_ashmem)))
-                                .append(delim)
-                                .append(String.valueOf(p.getBlobAshmemSize()))
-                                .append("\n");
-                    }
-
-                    info.extra = sb;
+                    info.extra = generateExtraText(sbn, info);
 
                     logd("   [%d] %s: %s", info.timestamp, info.pkg, info.title);
                     list.add(info);
@@ -484,6 +312,201 @@
         return null;
     }
 
+    private CharSequence generateExtraText(StatusBarNotification sbn,
+                                           HistoricalNotificationInfo info) {
+        final Ranking rank = new Ranking();
+
+        final Notification n = sbn.getNotification();
+        final SpannableStringBuilder sb = new SpannableStringBuilder();
+        final String delim = getString(R.string.notification_log_details_delimiter);
+        sb.append(bold(getString(R.string.notification_log_details_package)))
+                .append(delim)
+                .append(info.pkg)
+                .append("\n")
+                .append(bold(getString(R.string.notification_log_details_key)))
+                .append(delim)
+                .append(sbn.getKey());
+        sb.append("\n")
+                .append(bold(getString(R.string.notification_log_details_icon)))
+                .append(delim)
+                .append(String.valueOf(n.getSmallIcon()));
+        sb.append("\n")
+                .append(bold("channelId"))
+                .append(delim)
+                .append(String.valueOf(n.getChannelId()));
+        sb.append("\n")
+                .append(bold("postTime"))
+                .append(delim)
+                .append(String.valueOf(sbn.getPostTime()));
+        if (n.getTimeoutAfter() != 0) {
+            sb.append("\n")
+                    .append(bold("timeoutAfter"))
+                    .append(delim)
+                    .append(String.valueOf(n.getTimeoutAfter()));
+        }
+        if (sbn.isGroup()) {
+            sb.append("\n")
+                    .append(bold(getString(R.string.notification_log_details_group)))
+                    .append(delim)
+                    .append(String.valueOf(sbn.getGroupKey()));
+            if (n.isGroupSummary()) {
+                sb.append(bold(
+                        getString(R.string.notification_log_details_group_summary)));
+            }
+        }
+        sb.append("\n")
+                .append(bold(getString(R.string.notification_log_details_sound)))
+                .append(delim);
+        if (0 != (n.defaults & Notification.DEFAULT_SOUND)) {
+            sb.append(getString(R.string.notification_log_details_default));
+        } else if (n.sound != null) {
+            sb.append(n.sound.toString());
+        } else {
+            sb.append(getString(R.string.notification_log_details_none));
+        }
+        sb.append("\n")
+                .append(bold(getString(R.string.notification_log_details_vibrate)))
+                .append(delim);
+        if (0 != (n.defaults & Notification.DEFAULT_VIBRATE)) {
+            sb.append(getString(R.string.notification_log_details_default));
+        } else if (n.vibrate != null) {
+            for (int vi=0;vi<n.vibrate.length;vi++) {
+                if (vi > 0) sb.append(',');
+                sb.append(String.valueOf(n.vibrate[vi]));
+            }
+        } else {
+            sb.append(getString(R.string.notification_log_details_none));
+        }
+        sb.append("\n")
+                .append(bold(getString(R.string.notification_log_details_visibility)))
+                .append(delim)
+                .append(Notification.visibilityToString(n.visibility));
+        if (n.publicVersion != null) {
+            sb.append("\n")
+                    .append(bold(getString(
+                            R.string.notification_log_details_public_version)))
+                    .append(delim)
+                    .append(getTitleString(n.publicVersion));
+        }
+        sb.append("\n")
+                .append(bold(getString(R.string.notification_log_details_priority)))
+                .append(delim)
+                .append(Notification.priorityToString(n.priority));
+        if (info.active) {
+            // mRanking only applies to active notifications
+            if (mRanking != null && mRanking.getRanking(sbn.getKey(), rank)) {
+                sb.append("\n")
+                        .append(bold(getString(
+                                R.string.notification_log_details_importance)))
+                        .append(delim)
+                        .append(Ranking.importanceToString(rank.getImportance()));
+                if (rank.getImportanceExplanation() != null) {
+                    sb.append("\n")
+                            .append(bold(getString(
+                                    R.string.notification_log_details_explanation)))
+                            .append(delim)
+                            .append(rank.getImportanceExplanation());
+                }
+                sb.append("\n")
+                        .append(bold(getString(
+                                R.string.notification_log_details_badge)))
+                        .append(delim)
+                        .append(Boolean.toString(rank.canShowBadge()));
+            } else {
+                if (mRanking == null) {
+                    sb.append("\n")
+                            .append(bold(getString(
+                                    R.string.notification_log_details_ranking_null)));
+                } else {
+                    sb.append("\n")
+                            .append(bold(getString(
+                                    R.string.notification_log_details_ranking_none)));
+                }
+            }
+        }
+        if (n.contentIntent != null) {
+            sb.append("\n")
+                    .append(bold(getString(
+                            R.string.notification_log_details_content_intent)))
+                    .append(delim)
+                    .append(formatPendingIntent(n.contentIntent));
+        }
+        if (n.deleteIntent != null) {
+            sb.append("\n")
+                    .append(bold(getString(
+                            R.string.notification_log_details_delete_intent)))
+                    .append(delim)
+                    .append(formatPendingIntent(n.deleteIntent));
+        }
+        if (n.fullScreenIntent != null) {
+            sb.append("\n")
+                    .append(bold(getString(
+                            R.string.notification_log_details_full_screen_intent)))
+                    .append(delim)
+                    .append(formatPendingIntent(n.fullScreenIntent));
+        }
+        if (n.actions != null && n.actions.length > 0) {
+            sb.append("\n")
+                    .append(bold(getString(R.string.notification_log_details_actions)));
+            for (int ai=0; ai<n.actions.length; ai++) {
+                final Notification.Action action = n.actions[ai];
+                sb.append("\n  ").append(String.valueOf(ai)).append(' ')
+                        .append(bold(getString(
+                                R.string.notification_log_details_title)))
+                        .append(delim)
+                        .append(action.title);
+                if (action.actionIntent != null) {
+                    sb.append("\n    ")
+                            .append(bold(getString(
+                                    R.string.notification_log_details_content_intent)))
+                            .append(delim)
+                            .append(formatPendingIntent(action.actionIntent));
+                }
+                if (action.getRemoteInputs() != null) {
+                    sb.append("\n    ")
+                            .append(bold(getString(
+                                    R.string.notification_log_details_remoteinput)))
+                            .append(delim)
+                            .append(String.valueOf(action.getRemoteInputs().length));
+                }
+            }
+        }
+        if (n.contentView != null) {
+            sb.append("\n")
+                    .append(bold(getString(
+                            R.string.notification_log_details_content_view)))
+                    .append(delim)
+                    .append(n.contentView.toString());
+        }
+
+        if (DUMP_EXTRAS) {
+            if (n.extras != null && n.extras.size() > 0) {
+                sb.append("\n")
+                        .append(bold(getString(
+                                R.string.notification_log_details_extras)));
+                for (String extraKey : n.extras.keySet()) {
+                    String val = String.valueOf(n.extras.get(extraKey));
+                    if (val.length() > 100) val = val.substring(0, 100) + "...";
+                    sb.append("\n  ").append(extraKey).append(delim).append(val);
+                }
+            }
+        }
+        if (DUMP_PARCEL) {
+            final Parcel p = Parcel.obtain();
+            n.writeToParcel(p, 0);
+            sb.append("\n")
+                    .append(bold(getString(R.string.notification_log_details_parcel)))
+                    .append(delim)
+                    .append(String.valueOf(p.dataPosition()))
+                    .append(' ')
+                    .append(bold(getString(R.string.notification_log_details_ashmem)))
+                    .append(delim)
+                    .append(String.valueOf(p.getBlobAshmemSize()))
+                    .append("\n");
+        }
+        return sb;
+    }
+
     private Resources getResourcesForUserPackage(String pkg, int userId) {
         Resources r = null;
 
@@ -545,6 +568,7 @@
 
     private static class HistoricalNotificationPreference extends Preference {
         private final HistoricalNotificationInfo mInfo;
+        private static long sLastExpandedTimestamp; // quick hack to keep things from collapsing
 
         public HistoricalNotificationPreference(Context context, HistoricalNotificationInfo info) {
             super(context);
@@ -569,7 +593,8 @@
 
             final TextView extra = (TextView) row.findViewById(R.id.extra);
             extra.setText(mInfo.extra);
-            extra.setVisibility(View.GONE);
+            extra.setVisibility(mInfo.timestamp == sLastExpandedTimestamp
+                    ? View.VISIBLE : View.GONE);
 
             row.itemView.setOnClickListener(
                     new View.OnClickListener() {
@@ -577,6 +602,7 @@
                         public void onClick(View view) {
                             extra.setVisibility(extra.getVisibility() == View.VISIBLE
                                     ? View.GONE : View.VISIBLE);
+                            sLastExpandedTimestamp = mInfo.timestamp;
                         }
                     });
 
diff --git a/src/com/android/settings/notification/NotificationSwitchBarPreference.java b/src/com/android/settings/notification/NotificationSwitchBarPreference.java
new file mode 100644
index 0000000..7729543
--- /dev/null
+++ b/src/com/android/settings/notification/NotificationSwitchBarPreference.java
@@ -0,0 +1,81 @@
+/*
+ * 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 android.content.Context;
+import android.support.v7.preference.PreferenceViewHolder;
+import android.util.AttributeSet;
+import android.view.View;
+
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.widget.ToggleSwitch;
+import com.android.settingslib.RestrictedLockUtils;
+
+public class NotificationSwitchBarPreference extends LayoutPreference {
+    private ToggleSwitch mSwitch;
+    private boolean mChecked;
+    private boolean mEnableSwitch = true;
+
+    public NotificationSwitchBarPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    @Override
+    public void onBindViewHolder(PreferenceViewHolder holder) {
+        super.onBindViewHolder(holder);
+        mSwitch = (ToggleSwitch) holder.findViewById(android.R.id.switch_widget);
+        if (mSwitch != null) {
+            mSwitch.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (!mSwitch.isEnabled()) {
+                        return;
+                    }
+                    mChecked = !mChecked;
+                    setChecked(mChecked);
+                    if (!callChangeListener(mChecked)) {
+                        setChecked(!mChecked);
+                    }
+                }
+            });
+            mSwitch.setChecked(mChecked);
+            mSwitch.setEnabled(mEnableSwitch);
+        }
+    }
+
+    public boolean isChecked() {
+        return mSwitch != null && mSwitch.isEnabled() && mChecked;
+    }
+
+    public void setChecked(boolean checked) {
+        mChecked = checked;
+        if (mSwitch != null) {
+            mSwitch.setChecked(checked);
+        }
+    }
+
+    public void setSwitchEnabled(boolean enabled) {
+        mEnableSwitch = enabled;
+        if (mSwitch != null) {
+            mSwitch.setEnabled(enabled);
+        }
+    }
+
+    public void setDisabledByAdmin(RestrictedLockUtils.EnforcedAdmin admin) {
+        setSwitchEnabled(admin == null);
+    }
+}
diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java
index 552c4d3..a92c5dd 100644
--- a/src/com/android/settings/notification/SoundSettings.java
+++ b/src/com/android/settings/notification/SoundSettings.java
@@ -76,6 +76,11 @@
     }
 
     @Override
+    protected int getHelpResource() {
+        return R.string.help_url_sound;
+    }
+
+    @Override
     public void onPause() {
         super.onPause();
         mVolumeCallback.stopSample();
@@ -181,7 +186,8 @@
             Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new ZenModePreferenceController(context));
-        controllers.add(new EmergencyBroadcastPreferenceController(context));
+        controllers.add(new EmergencyBroadcastPreferenceController(
+                context, "cell_broadcast_settings"));
         controllers.add(new VibrateWhenRingPreferenceController(context));
 
         // === Volumes ===
diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java
index dcd2b51..e7d5088 100644
--- a/src/com/android/settings/overlay/FeatureFactory.java
+++ b/src/com/android/settings/overlay/FeatureFactory.java
@@ -31,6 +31,7 @@
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.search2.SearchFeatureProvider;
+import com.android.settings.users.UserFeatureProvider;
 
 /**
  * Abstract class for creating feature controllers. Allows OEM implementations to define their own
@@ -94,6 +95,8 @@
 
     public abstract SecurityFeatureProvider getSecurityFeatureProvider();
 
+    public abstract UserFeatureProvider getUserFeatureProvider(Context context);
+
     public static final class FactoryNotFoundException extends RuntimeException {
         public FactoryNotFoundException(Throwable throwable) {
             super("Unable to create factory. Did you misconfigure Proguard?", throwable);
diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java
index 5b039b2..b39a2a0 100644
--- a/src/com/android/settings/overlay/FeatureFactoryImpl.java
+++ b/src/com/android/settings/overlay/FeatureFactoryImpl.java
@@ -45,6 +45,8 @@
 import com.android.settings.search2.SearchFeatureProviderImpl;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.security.SecurityFeatureProviderImpl;
+import com.android.settings.users.UserFeatureProvider;
+import com.android.settings.users.UserFeatureProviderImpl;
 import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
 
 /**
@@ -63,6 +65,7 @@
     private SuggestionFeatureProvider mSuggestionFeatureProvider;
     private PowerUsageFeatureProvider mPowerUsageFeatureProvider;
     private AssistGestureFeatureProvider mAssistGestureFeatureProvider;
+    private UserFeatureProvider mUserFeatureProvider;
 
     @Override
     public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -158,6 +161,14 @@
     }
 
     @Override
+    public UserFeatureProvider getUserFeatureProvider(Context context) {
+        if (mUserFeatureProvider == null) {
+            mUserFeatureProvider = new UserFeatureProviderImpl(context);
+        }
+        return mUserFeatureProvider;
+    }
+
+    @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         if (mAssistGestureFeatureProvider == null) {
             mAssistGestureFeatureProvider = new AssistGestureFeatureProviderImpl();
diff --git a/src/com/android/settings/search/IndexingCallback.java b/src/com/android/settings/search/IndexingCallback.java
new file mode 100644
index 0000000..b4b6eab
--- /dev/null
+++ b/src/com/android/settings/search/IndexingCallback.java
@@ -0,0 +1,12 @@
+package com.android.settings.search;
+
+/**
+ * Callback for Settings search indexing.
+ */
+public interface IndexingCallback {
+
+    /**
+     * Called when Indexing is finished.
+     */
+    void onIndexingFinished();
+}
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index f7882ae..d1d6945 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -65,6 +65,7 @@
 import com.android.settings.location.ScanningSettings;
 import com.android.settings.network.NetworkDashboardFragment;
 import com.android.settings.nfc.PaymentSettings;
+import com.android.settings.notification.ChannelImportanceSettings;
 import com.android.settings.notification.ConfigureNotificationSettings;
 import com.android.settings.notification.SoundSettings;
 import com.android.settings.notification.ZenModePrioritySettings;
@@ -179,6 +180,8 @@
                 R.drawable.ic_settings_accessibility);
         addIndex(AccessibilityShortcutPreferenceFragment.class, NO_DATA_RES_ID,
                 R.drawable.ic_settings_accessibility);
+        addIndex(ChannelImportanceSettings.class, NO_DATA_RES_ID,
+                R.drawable.ic_settings_notifications);
     }
 
     private SearchIndexableResources() {
diff --git a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
index b83f9fd..1bf0a15 100644
--- a/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
+++ b/src/com/android/settings/search/SettingsSearchIndexablesProvider.java
@@ -26,6 +26,7 @@
 import com.android.settings.search2.DatabaseIndexingUtils;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
@@ -102,12 +103,21 @@
             }
 
             List<String> providerNonIndexableKeys = provider.getNonIndexableKeys(context);
-            if (providerNonIndexableKeys != null && providerNonIndexableKeys.size() > 0) {
-                values.addAll(providerNonIndexableKeys);
+
+            if (providerNonIndexableKeys == null || providerNonIndexableKeys.isEmpty()) {
+                continue;
             }
+
+            if (providerNonIndexableKeys.removeAll(Collections.singleton(null))
+                    || providerNonIndexableKeys.removeAll(Collections.singleton(""))) {
+                Log.v(TAG, clazz.getName() + " tried to add an empty non-indexable key");
+            }
+
+            values.addAll(providerNonIndexableKeys);
         }
 
         for (String nik : values) {
+
             final Object[] ref = new Object[NON_INDEXABLES_KEYS_COLUMNS.length];
             ref[COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE] = nik;
             cursor.addRow(ref);
diff --git a/src/com/android/settings/search2/DatabaseIndexingManager.java b/src/com/android/settings/search2/DatabaseIndexingManager.java
index ccc5283..c627ea5 100644
--- a/src/com/android/settings/search2/DatabaseIndexingManager.java
+++ b/src/com/android/settings/search2/DatabaseIndexingManager.java
@@ -42,6 +42,7 @@
 import com.android.settings.core.PreferenceController;
 import com.android.settings.search.IndexDatabaseHelper;
 import com.android.settings.search.Indexable;
+import com.android.settings.search.IndexingCallback;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.search.SearchIndexableResources;
 
@@ -132,7 +133,8 @@
 
     private final String mBaseAuthority;
 
-    private final AtomicBoolean mIsAvailable = new AtomicBoolean(false);
+    @VisibleForTesting
+    final AtomicBoolean mIsIndexingComplete = new AtomicBoolean(false);
 
     @VisibleForTesting
     final UpdateData mDataToProcess = new UpdateData();
@@ -147,17 +149,13 @@
         mContext = context;
     }
 
-    public boolean isAvailable() {
-        return mIsAvailable.get();
+    public boolean isIndexingComplete() {
+        return mIsIndexingComplete.get();
     }
 
-    public void indexDatabase() {
-        AsyncTask.execute(new Runnable() {
-            @Override
-            public void run() {
-                performIndexing();
-            }
-        });
+    public void indexDatabase(IndexingCallback callback) {
+        IndexingTask task = new IndexingTask(callback);
+        task.execute();
     }
 
     /**
@@ -171,15 +169,12 @@
         final List<ResolveInfo> list =
                 mContext.getPackageManager().queryIntentContentProviders(intent, 0);
 
-        final String localeStr = Locale.getDefault().toString();
-        final String fingerprint = Build.FINGERPRINT;
+        String localeStr = Locale.getDefault().toString();
+        String fingerprint = Build.FINGERPRINT;
         final boolean isFullIndex = isFullIndex(localeStr, fingerprint);
 
-        // Drop the database when the locale or build has changed. This eliminates rows which are
-        // dynamically inserted in the old language, or deprecated settings.
         if (isFullIndex) {
-            final SQLiteDatabase db = getWritableDatabase();
-            IndexDatabaseHelper.getInstance(mContext).reconstruct(db);
+            rebuildDatabase();
         }
 
         for (final ResolveInfo info : list) {
@@ -218,6 +213,18 @@
     }
 
     /**
+     * Reconstruct the database in the following cases:
+     * - Language has changed
+     * - Build has changed
+     */
+    private void rebuildDatabase() {
+        // Drop the database when the locale or build has changed. This eliminates rows which are
+        // dynamically inserted in the old language, or deprecated settings.
+        final SQLiteDatabase db = getWritableDatabase();
+        IndexDatabaseHelper.getInstance(mContext).reconstruct(db);
+    }
+
+    /**
      * Adds new data to the database and verifies the correctness of the ENABLED column.
      * First, the data to be updated and all non-indexable keys are copied locally.
      * Then all new data to be added is inserted.
@@ -229,7 +236,6 @@
      */
     @VisibleForTesting
     void updateDatabase(boolean needsReindexing, String localeStr) {
-        mIsAvailable.set(false);
         final UpdateData copy;
 
         synchronized (mDataToProcess) {
@@ -264,8 +270,6 @@
         } finally {
             database.endTransaction();
         }
-
-        mIsAvailable.set(true);
     }
 
     /**
@@ -426,6 +430,13 @@
             if (count > 0) {
                 while (cursor.moveToNext()) {
                     final String key = cursor.getString(COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE);
+
+                    if (TextUtils.isEmpty(key) && Log.isLoggable(LOG_TAG, Log.VERBOSE)) {
+                        Log.v(LOG_TAG, "Empty non-indexable key from: "
+                                + packageContext.getPackageName());
+                        continue;
+                    }
+
                     result.add(key);
                 }
             }
@@ -1216,4 +1227,33 @@
             }
         }
     }
+
+    public class IndexingTask extends AsyncTask<Void, Void, Void> {
+
+        @VisibleForTesting
+        IndexingCallback mCallback;
+
+        public IndexingTask(IndexingCallback callback) {
+            mCallback = callback;
+        }
+
+        @Override
+        protected void onPreExecute() {
+            mIsIndexingComplete.set(false);
+        }
+
+        @Override
+        protected Void doInBackground(Void... voids) {
+            performIndexing();
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Void aVoid) {
+            mIsIndexingComplete.set(true);
+            if (mCallback != null) {
+                mCallback.onIndexingFinished();
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/com/android/settings/search2/SearchFeatureProvider.java b/src/com/android/settings/search2/SearchFeatureProvider.java
index d3dc24b..fa052fc 100644
--- a/src/com/android/settings/search2/SearchFeatureProvider.java
+++ b/src/com/android/settings/search2/SearchFeatureProvider.java
@@ -21,6 +21,7 @@
 
 import android.view.View;
 import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.search.IndexingCallback;
 
 /**
  * FeatureProvider for Settings Search
@@ -68,7 +69,12 @@
     /**
      * Updates the Settings indexes
      */
-    void updateIndex(Context context);
+    void updateIndex(Context context, IndexingCallback callback);
+
+    /**
+     * @returns true when indexing is complete.
+     */
+    boolean isIndexingComplete(Context context);
 
     /**
      * Initializes the feedback button in case it was dismissed.
diff --git a/src/com/android/settings/search2/SearchFeatureProviderImpl.java b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
index b180c98..4e47f9d 100644
--- a/src/com/android/settings/search2/SearchFeatureProviderImpl.java
+++ b/src/com/android/settings/search2/SearchFeatureProviderImpl.java
@@ -19,6 +19,7 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.VisibleForTesting;
 import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -26,6 +27,9 @@
 import com.android.settings.R;
 import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.dashboard.SiteMapManager;
+import com.android.settings.search.IndexingCallback;
+
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * FeatureProvider for the refactored search code.
@@ -88,6 +92,11 @@
         return mDatabaseIndexingManager;
     }
 
+    @Override
+    public boolean isIndexingComplete(Context context) {
+        return getIndexingManager(context).isIndexingComplete();
+    }
+
     public SiteMapManager getSiteMapManager() {
         if (mSiteMapManager == null) {
             mSiteMapManager = new SiteMapManager();
@@ -96,9 +105,9 @@
     }
 
     @Override
-    public void updateIndex(Context context) {
+    public void updateIndex(Context context, IndexingCallback callback) {
         long indexStartTime = System.currentTimeMillis();
-        getIndexingManager(context).indexDatabase();
+        getIndexingManager(context).indexDatabase(callback);
         Log.d(TAG, "IndexDatabase() took " +
                 (System.currentTimeMillis() - indexStartTime) + " ms");
     }
diff --git a/src/com/android/settings/search2/SearchFragment.java b/src/com/android/settings/search2/SearchFragment.java
index c5db08d..5ee22b5 100644
--- a/src/com/android/settings/search2/SearchFragment.java
+++ b/src/com/android/settings/search2/SearchFragment.java
@@ -41,12 +41,23 @@
 import com.android.settings.core.InstrumentedFragment;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.search.IndexingCallback;
 
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
+/**
+ * This fragment manages the lifecycle of indexing and searching.
+ *
+ * In onCreate, the indexing process is initiated in DatabaseIndexingManager.
+ * While the indexing is happening, loaders are blocked from accessing the database, but the user
+ * is free to start typing their query.
+ *
+ * When the indexing is complete, the fragment gets a callback to initialize the loaders and search
+ * the query if the user has entered text.
+ */
 public class SearchFragment extends InstrumentedFragment implements SearchView.OnQueryTextListener,
-        LoaderManager.LoaderCallbacks<List<? extends SearchResult>> {
+        LoaderManager.LoaderCallbacks<List<? extends SearchResult>>, IndexingCallback {
     private static final String TAG = "SearchFragment";
 
     @VisibleForTesting
@@ -59,26 +70,30 @@
     private static final String STATE_RESULT_CLICK_COUNT = "state_result_click_count";
 
     // Loader IDs
-    private static final int LOADER_ID_DATABASE = 1;
-    private static final int LOADER_ID_INSTALLED_APPS = 2;
+    @VisibleForTesting
+    static final int LOADER_ID_DATABASE = 1;
+    @VisibleForTesting
+    static final int LOADER_ID_INSTALLED_APPS = 2;
 
     private static final int NUM_QUERY_LOADERS = 2;
 
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     AtomicInteger mUnfinishedLoadersCount = new AtomicInteger(NUM_QUERY_LOADERS);
 
     // Logging
-    @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
+    @VisibleForTesting
     static final String RESULT_CLICK_COUNT = "settings_search_result_click_count";
 
     @VisibleForTesting
     String mQuery;
 
     private boolean mNeverEnteredQuery = true;
-    private boolean mShowingSavedQuery;
+    @VisibleForTesting
+    boolean mShowingSavedQuery;
     private int mResultClickCount;
     private MetricsFeatureProvider mMetricsFeatureProvider;
-    private SavedQueryController mSavedQueryController;
+    @VisibleForTesting
+    SavedQueryController mSavedQueryController;
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     SearchFeatureProvider mSearchFeatureProvider;
@@ -87,7 +102,8 @@
 
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     RecyclerView mResultsRecyclerView;
-    private SearchView mSearchView;
+    @VisibleForTesting
+    SearchView mSearchView;
     private LinearLayout mNoResultsView;
 
     @VisibleForTesting
@@ -116,6 +132,7 @@
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setHasOptionsMenu(true);
+
         final LoaderManager loaderManager = getLoaderManager();
         mSearchAdapter = new SearchResultsAdapter(this);
         mSavedQueryController = new SavedQueryController(
@@ -127,15 +144,8 @@
             mNeverEnteredQuery = savedInstanceState.getBoolean(STATE_NEVER_ENTERED_QUERY);
             mResultClickCount = savedInstanceState.getInt(STATE_RESULT_CLICK_COUNT);
             mShowingSavedQuery = savedInstanceState.getBoolean(STATE_SHOWING_SAVED_QUERY);
-            if (mShowingSavedQuery) {
-                mSavedQueryController.loadSavedQueries();
-            } else {
-                loaderManager.initLoader(LOADER_ID_DATABASE, null, this);
-                loaderManager.initLoader(LOADER_ID_INSTALLED_APPS, null, this);
-            }
         } else {
             mShowingSavedQuery = true;
-            mSavedQueryController.loadSavedQueries();
         }
 
         final Activity activity = getActivity();
@@ -148,7 +158,7 @@
 
         // Run the Index update only if we have some space
         if (!Utils.isLowStorage(activity)) {
-            mSearchFeatureProvider.updateIndex(activity);
+            mSearchFeatureProvider.updateIndex(activity, this /* indexingCallback */);
         } else {
             Log.w(TAG, "Cannot update the Indexer as we are running low on storage space!");
         }
@@ -170,12 +180,7 @@
     @Override
     public void onResume() {
         super.onResume();
-        if (TextUtils.isEmpty(mQuery)) {
-            return;
-        }
-        final String query = mQuery;
-        mQuery = "";
-        onQueryTextChange(query);
+        requery();
     }
 
     @Override
@@ -218,6 +223,11 @@
         mNeverEnteredQuery = false;
         mQuery = query;
 
+        // If indexing is not finished, register the query text, but don't search.
+        if (!mSearchFeatureProvider.isIndexingComplete(getActivity())) {
+            return true;
+        }
+
         if (isEmptyQuery) {
             final LoaderManager loaderManager = getLoaderManager();
             loaderManager.destroyLoader(LOADER_ID_DATABASE);
@@ -276,6 +286,22 @@
     public void onLoaderReset(Loader<List<? extends SearchResult>> loader) {
     }
 
+    /**
+     * Gets called when Indexing is completed.
+     */
+    @Override
+    public void onIndexingFinished() {
+        if (mShowingSavedQuery) {
+            mSavedQueryController.loadSavedQueries();
+        } else {
+            final LoaderManager loaderManager = getLoaderManager();
+            loaderManager.initLoader(LOADER_ID_DATABASE, null, this);
+            loaderManager.initLoader(LOADER_ID_INSTALLED_APPS, null, this);
+        }
+
+        requery();
+    }
+
     public void onSearchResultClicked() {
         mSavedQueryController.saveQuery(mQuery);
         mResultClickCount++;
@@ -309,6 +335,15 @@
         return mSearchAdapter.getSearchResults();
     }
 
+    private void requery() {
+        if (TextUtils.isEmpty(mQuery)) {
+            return;
+        }
+        final String query = mQuery;
+        mQuery = "";
+        onQueryTextChange(query);
+    }
+
     @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE)
     SearchView makeSearchView(ActionBar actionBar, String query) {
         final SearchView searchView = new SearchView(actionBar.getThemedContext());
diff --git a/src/com/android/settings/system/SystemDashboardFragment.java b/src/com/android/settings/system/SystemDashboardFragment.java
index 76ac4a6..4c4ed21 100644
--- a/src/com/android/settings/system/SystemDashboardFragment.java
+++ b/src/com/android/settings/system/SystemDashboardFragment.java
@@ -21,6 +21,7 @@
 
 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;
@@ -60,6 +61,7 @@
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new SystemUpdatePreferenceController(context, UserManager.get(context)));
         controllers.add(new AdditionalSystemUpdatePreferenceController(context));
+        controllers.add(new BackupSettingsActivityPreferenceController(context));
         return controllers;
     }
 
diff --git a/src/com/android/settings/users/UserFeatureProvider.java b/src/com/android/settings/users/UserFeatureProvider.java
new file mode 100644
index 0000000..9853255
--- /dev/null
+++ b/src/com/android/settings/users/UserFeatureProvider.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.users;
+
+import android.os.UserHandle;
+
+import java.util.List;
+
+public interface UserFeatureProvider {
+    /**
+     * Returns a list of UserHandles for profiles associated with the user that the calling process
+     * is running on, including the user itself.
+     *
+     * @return A non-empty list of UserHandles associated with the calling user.
+     */
+    List<UserHandle> getUserProfiles();
+}
diff --git a/src/com/android/settings/users/UserFeatureProviderImpl.java b/src/com/android/settings/users/UserFeatureProviderImpl.java
new file mode 100644
index 0000000..b88c831
--- /dev/null
+++ b/src/com/android/settings/users/UserFeatureProviderImpl.java
@@ -0,0 +1,36 @@
+/*
+ * 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.users;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import java.util.List;
+
+public class UserFeatureProviderImpl implements UserFeatureProvider {
+    UserManager mUm;
+
+    public UserFeatureProviderImpl(Context context) {
+        mUm = (UserManager) context.getSystemService(Context.USER_SERVICE);
+    }
+
+    @Override
+    public List<UserHandle> getUserProfiles() {
+        return mUm.getUserProfiles();
+    }
+}
diff --git a/src/com/android/settings/utils/FileSizeFormatter.java b/src/com/android/settings/utils/FileSizeFormatter.java
new file mode 100644
index 0000000..e56388a
--- /dev/null
+++ b/src/com/android/settings/utils/FileSizeFormatter.java
@@ -0,0 +1,116 @@
+/*
+ * 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.utils;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.content.res.Resources;
+import android.text.BidiFormatter;
+import android.text.format.Formatter;
+
+/**
+ * Utility class to aid in formatting file sizes always with the same unit. This is modified from
+ * android.text.format.Formatter to fit this purpose.
+ */
+public final class FileSizeFormatter {
+    public static final long KILOBYTE_IN_BYTES = 1000;
+    public static final long MEGABYTE_IN_BYTES = KILOBYTE_IN_BYTES * 1000;
+    public static final long GIGABYTE_IN_BYTES = MEGABYTE_IN_BYTES * 1000;
+
+    /**
+     * Formats a content size to be in the form of bytes, kilobytes, megabytes, etc.
+     *
+     * <p>As of O, the prefixes are used in their standard meanings in the SI system, so kB = 1000
+     * bytes, MB = 1,000,000 bytes, etc.
+     *
+     * <p class="note">In {@link android.os.Build.VERSION_CODES#N} and earlier, powers of 1024 are
+     * used instead, with KB = 1024 bytes, MB = 1,048,576 bytes, etc.
+     *
+     * <p>If the context has a right-to-left locale, the returned string is wrapped in bidi
+     * formatting characters to make sure it's displayed correctly if inserted inside a
+     * right-to-left string. (This is useful in cases where the unit strings, like "MB", are
+     * left-to-right, but the locale is right-to-left.)
+     *
+     * @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
+     */
+    public static String formatFileSize(
+            @Nullable Context context, long sizeBytes, int suffix, 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");
+    }
+
+    /**
+     * A simplified version of the SettingsLib file size formatter. The primary difference is that
+     * this version always assumes it is doing a "short file size" and allows for a suffix to be
+     * provided.
+     *
+     * @param res Resources to fetch strings with.
+     * @param sizeBytes File size in bytes to format.
+     * @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) {
+        final boolean isNegative = (sizeBytes < 0);
+        float result = isNegative ? -sizeBytes : sizeBytes;
+        result = result / mult;
+        // Note we calculate the rounded long by ourselves, but still let String.format()
+        // 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;
+        if (mult == 1) {
+            roundFactor = 1;
+            roundFormat = "%.0f";
+        } else if (result < 1) {
+            roundFactor = 100;
+            roundFormat = "%.2f";
+        } else if (result < 10) {
+            roundFactor = 10;
+            roundFormat = "%.1f";
+        } else { // 10 <= result < 100
+            roundFactor = 1;
+            roundFormat = "%.0f";
+        }
+
+        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);
+    }
+}
diff --git a/src/com/android/settings/utils/ManagedServiceSettings.java b/src/com/android/settings/utils/ManagedServiceSettings.java
index eccda79..1dc6ae5 100644
--- a/src/com/android/settings/utils/ManagedServiceSettings.java
+++ b/src/com/android/settings/utils/ManagedServiceSettings.java
@@ -19,8 +19,8 @@
 import android.annotation.Nullable;
 import android.app.AlertDialog;
 import android.app.Dialog;
-import android.app.DialogFragment;
 import android.app.Fragment;
+import android.app.admin.DevicePolicyManager;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -28,15 +28,17 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ServiceInfo;
 import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.support.v14.preference.SwitchPreference;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.Preference.OnPreferenceChangeListener;
 import android.support.v7.preference.PreferenceScreen;
 import android.view.View;
-import android.widget.TextView;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
+import com.android.settings.Utils;
 import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
 import com.android.settings.notification.EmptyTextSettings;
 
@@ -48,6 +50,7 @@
 
     protected Context mContext;
     private PackageManager mPM;
+    private DevicePolicyManager mDpm;
     protected ServiceListing mServiceListing;
 
     abstract protected Config getConfig();
@@ -62,6 +65,7 @@
 
         mContext = getActivity();
         mPM = mContext.getPackageManager();
+        mDpm = (DevicePolicyManager) mContext.getSystemService(Context.DEVICE_POLICY_SERVICE);
         mServiceListing = new ServiceListing(mContext, mConfig);
         mServiceListing.addCallback(new ServiceListing.Callback() {
             @Override
@@ -92,6 +96,9 @@
     }
 
     private void updateList(List<ServiceInfo> services) {
+        UserManager um = (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        final int managedProfileId = Utils.getManagedProfileId(um, UserHandle.myUserId());
+
         final PreferenceScreen screen = getPreferenceScreen();
         screen.removeAll();
         Collections.sort(services, new PackageItemInfo.DisplayNameComparator(mPM));
@@ -103,6 +110,11 @@
             pref.setIcon(service.loadIcon(mPM));
             pref.setTitle(title);
             pref.setChecked(mServiceListing.isEnabled(cn));
+            if (managedProfileId != UserHandle.USER_NULL
+                    && !mDpm.isNotificationListenerServicePermitted(
+                            service.packageName, managedProfileId)) {
+                pref.setSummary(R.string.work_profile_notification_access_blocked_summary);
+            }
             pref.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object newValue) {
diff --git a/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java b/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java
index 9424278..9e20c9d 100644
--- a/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java
+++ b/src/com/android/settings/vpn2/ConnectivityManagerWrapper.java
@@ -16,6 +16,11 @@
 
 package com.android.settings.vpn2;
 
+import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.net.NetworkRequest;
+import android.os.Handler;
 import android.net.ProxyInfo;
 
 /**
@@ -27,6 +32,11 @@
 public interface ConnectivityManagerWrapper {
 
     /**
+     * Returns the real ConnectivityManager object wrapped by this wrapper.
+     */
+    public ConnectivityManager getConnectivityManager();
+
+    /**
      * Calls {@code ConnectivityManager.getAlwaysOnVpnPackageForUser()}.
      *
      * @see android.net.ConnectivityManager#getAlwaysOnVpnPackageForUser
@@ -39,4 +49,27 @@
      * @see android.net.ConnectivityManager#getGlobalProxy
      */
    ProxyInfo getGlobalProxy();
+
+    /**
+     * Calls {@code ConnectivityManager.registerNetworkCallback()}.
+     *
+     * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
+     * to the robolectric tests, which currently build with SDK 23.
+     * TODO: delete this once the robolectric tests build with SDK 26 or above.
+     *
+     * @see android.net.ConnectivityManager#registerNetworkCallback(NetworkRequest,NetworkCallback,Handler)
+     */
+    public void registerNetworkCallback(NetworkRequest request, NetworkCallback callback,
+            Handler handler);
+
+    /**
+     * Calls {@code ConnectivityManager.startCaptivePortalApp()}.
+     *
+     * This is part of the ConnectivityManager public API in SDK 26 or above, but is not yet visible
+     * to the robolectric tests, which currently build with SDK 23.
+     * TODO: delete this once the robolectric tests build with SDK 26 or above.
+     *
+     * @see android.net.ConnectivityManager#startCaptivePortalApp(Network)
+     */
+    public void startCaptivePortalApp(Network network);
 }
diff --git a/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java b/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java
index d3c17f2..f742cd2 100644
--- a/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java
+++ b/src/com/android/settings/vpn2/ConnectivityManagerWrapperImpl.java
@@ -17,6 +17,10 @@
 package com.android.settings.vpn2;
 
 import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
+import android.net.Network;
+import android.net.NetworkRequest;
+import android.os.Handler;
 import android.net.ProxyInfo;
 
 public class ConnectivityManagerWrapperImpl implements ConnectivityManagerWrapper {
@@ -28,6 +32,11 @@
     }
 
     @Override
+    public ConnectivityManager getConnectivityManager() {
+        return mCm;
+    }
+
+    @Override
     public String getAlwaysOnVpnPackageForUser(int userId) {
         return mCm.getAlwaysOnVpnPackageForUser(userId);
     }
@@ -36,4 +45,15 @@
     public ProxyInfo getGlobalProxy() {
         return mCm.getGlobalProxy();
     }
+
+    @Override
+    public void registerNetworkCallback(NetworkRequest request, NetworkCallback callback,
+            Handler handler) {
+        mCm.registerNetworkCallback(request, callback, handler);
+    }
+
+    @Override
+    public void startCaptivePortalApp(Network network) {
+        mCm.startCaptivePortalApp(network);
+    }
 }
diff --git a/src/com/android/settings/vpn2/LegacyVpnPreference.java b/src/com/android/settings/vpn2/LegacyVpnPreference.java
index a4d7221..4ef2808 100644
--- a/src/com/android/settings/vpn2/LegacyVpnPreference.java
+++ b/src/com/android/settings/vpn2/LegacyVpnPreference.java
@@ -34,7 +34,7 @@
 
     LegacyVpnPreference(Context context) {
         super(context, null /* attrs */);
-        setIcon(R.drawable.ic_settings_24dp);
+        setIcon(R.drawable.ic_vpn_key);
     }
 
     public VpnProfile getProfile() {
diff --git a/src/com/android/settings/widget/MasterSwitchPreference.java b/src/com/android/settings/widget/MasterSwitchPreference.java
index 002cb77..29bc17b 100644
--- a/src/com/android/settings/widget/MasterSwitchPreference.java
+++ b/src/com/android/settings/widget/MasterSwitchPreference.java
@@ -83,6 +83,7 @@
 
         mSwitch = (Switch) holder.findViewById(R.id.switchWidget);
         if (mSwitch != null) {
+            mSwitch.setContentDescription(getTitle());
             mSwitch.setChecked(mChecked);
             mSwitch.setEnabled(mEnableSwitch);
         }
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index fe2bbb3..8590650 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -38,6 +38,7 @@
 import android.os.UserManager;
 import android.security.Credentials;
 import android.security.KeyStore;
+import android.support.annotation.VisibleForTesting;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.TextUtils;
@@ -54,7 +55,6 @@
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
-import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
@@ -348,9 +348,7 @@
             }
         }
 
-        final UserManager userManager =
-                (UserManager) mContext.getSystemService(Context.USER_SERVICE);
-        if (!userManager.isSplitSystemUser()) {
+        if (!isSplitSystemUser()) {
             mSharedCheckBox.setVisibility(View.GONE);
         }
 
@@ -360,6 +358,13 @@
         }
     }
 
+    @VisibleForTesting
+    boolean isSplitSystemUser() {
+        final UserManager userManager =
+                (UserManager) mContext.getSystemService(Context.USER_SERVICE);
+        return userManager.isSplitSystemUser();
+    }
+
     private void addRow(ViewGroup group, int name, String value) {
         View row = mConfigUi.getLayoutInflater().inflate(R.layout.wifi_dialog_row, group, false);
         ((TextView) row.findViewById(R.id.name)).setText(name);
@@ -403,12 +408,16 @@
                 && ((mAccessPointSecurity == AccessPoint.SECURITY_WEP
                         && mPasswordView.length() == 0)
                     || (mAccessPointSecurity == AccessPoint.SECURITY_PSK
-                           && mPasswordView.length() < 8))) {
+                           && (mPasswordView.length() < 8 || mPasswordView.length() > 63)))) {
             passwordInvalid = true;
         }
-
         if ((mSsidView != null && mSsidView.length() == 0)
-                || ((mAccessPoint == null || !mAccessPoint.isSaved()) && passwordInvalid)) {
+                // If Accesspoint is not saved, apply passwordInvalid check
+                || ((mAccessPoint == null || !mAccessPoint.isSaved()) && passwordInvalid
+                // If AccessPoint is saved (modifying network) and password is changed, apply
+                // Invalid password check
+                || mAccessPoint != null && mAccessPoint.isSaved() && passwordInvalid
+                    && mPasswordView.length() > 0)) {
             enabled = false;
         } else {
             enabled = ipAndProxyFieldsAreValid();
diff --git a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
index d72bb3e..09b3331 100644
--- a/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
+++ b/src/com/android/settings/wifi/WifiMasterSwitchPreferenceController.java
@@ -33,7 +33,7 @@
         implements SummaryUpdater.OnSummaryChangeListener,
         LifecycleObserver, OnResume, OnPause, OnStart, OnStop {
 
-    private static final String KEY_TOGGLE_WIFI = "toggle_wifi";
+    public static final String KEY_TOGGLE_WIFI = "toggle_wifi";
 
     private MasterSwitchPreference mWifiPreference;
     private WifiEnabler mWifiEnabler;
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index 66e8c54..9963da1 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -128,6 +128,13 @@
     private WifiManager.ActionListener mSaveListener;
     private WifiManager.ActionListener mForgetListener;
 
+    /**
+     * The state of {@link #isUiRestricted()} at {@link #onCreate(Bundle)}}. This is neccesary to
+     * ensure that behavior is consistent if {@link #isUiRestricted()} changes. It could be changed
+     * by the Test DPC tool in AFW mode.
+     */
+    private boolean mIsRestricted;
+
     private WifiEnabler mWifiEnabler;
     // An access point being editted is stored here.
     private AccessPoint mSelectedAccessPoint;
@@ -214,10 +221,7 @@
 
         mUserBadgeCache = new AccessPointPreference.UserBadgeCache(getPackageManager());
 
-        if (isUiRestricted()) {
-            getPreferenceScreen().removePreference(mAdditionalSettingsPreferenceCategory);
-            addMessagePreference(R.string.wifi_empty_list_user_restricted);
-        }
+        mIsRestricted = isUiRestricted();
 
         mBgThread = new HandlerThread(TAG, Process.THREAD_PRIORITY_BACKGROUND);
         mBgThread.start();
@@ -339,14 +343,26 @@
 
         mWifiTracker.startTracking();
 
-        if (!isUiRestricted() && mWifiManager.isWifiEnabled()) {
-            setProgressBarVisible(true);
-            mWifiTracker.forceUpdate();
-            if (DEBUG) Log.d(TAG, "WifiSettings onStart APs: " + mWifiTracker.getAccessPoints());
-
-            getView().removeCallbacks(mUpdateAccessPointsRunnable);
-            updateAccessPointPreferences();
+        if (mIsRestricted) {
+            if (!isUiRestrictedByOnlyAdmin()) {
+                getEmptyTextView().setText(R.string.wifi_empty_list_user_restricted);
+            }
+            getPreferenceScreen().removeAll();
+            return;
         }
+
+        onWifiStateChanged(mWifiManager.getWifiState());
+    }
+
+    private void forceUpdateAPs() {
+        setProgressBarVisible(true);
+        mWifiTracker.forceUpdate();
+        if (DEBUG) {
+            Log.d(TAG, "WifiSettings force update APs: " + mWifiTracker.getAccessPoints());
+        }
+
+        getView().removeCallbacks(mUpdateAccessPointsRunnable);
+        updateAccessPointPreferences();
     }
 
     /**
@@ -412,7 +428,9 @@
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         // If the user is not allowed to configure wifi, do not handle menu selections.
-        if (isUiRestricted()) return false;
+        if (mIsRestricted) {
+            return false;
+        }
 
         switch (item.getItemId()) {
             case MENU_ID_WPS_PBC:
@@ -645,7 +663,7 @@
      */
     private void updateAccessPointsDelayed() {
         // Safeguard from some delayed event handling
-        if (getActivity() != null && !isUiRestricted() && mWifiManager.isWifiEnabled()) {
+        if (getActivity() != null && !mIsRestricted && mWifiManager.isWifiEnabled()) {
             setProgressBarVisible(true);
             getView().postDelayed(mUpdateAccessPointsRunnable, 300 /* delay milliseconds */);
         }
@@ -654,14 +672,14 @@
     /** Called when the state of Wifi has changed. */
     @Override
     public void onWifiStateChanged(int state) {
-        if (isUiRestricted()) {
+        if (mIsRestricted) {
             return;
         }
 
         final int wifiState = mWifiManager.getWifiState();
         switch (wifiState) {
             case WifiManager.WIFI_STATE_ENABLED:
-                updateAccessPointsDelayed();
+                forceUpdateAPs();
                 break;
 
             case WifiManager.WIFI_STATE_ENABLING:
@@ -694,7 +712,6 @@
         changeNextButtonState(mWifiTracker.isConnected());
     }
 
-
     private void updateAccessPointPreferences() {
         // in case state has changed
         if (!mWifiManager.isWifiEnabled()) {
diff --git a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
index 21fda30..dd1e4a4 100644
--- a/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
+++ b/src/com/android/settings/wifi/details/WifiDetailPreferenceController.java
@@ -15,6 +15,9 @@
  */
 package com.android.settings.wifi.details;
 
+import static android.net.NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL;
+import static android.net.NetworkCapabilities.TRANSPORT_WIFI;
+
 import android.app.Fragment;
 import android.content.BroadcastReceiver;
 import android.content.Context;
@@ -22,29 +25,39 @@
 import android.content.IntentFilter;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
 import android.net.IpPrefix;
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.NetworkBadging;
+import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
+import android.net.NetworkRequest;
 import android.net.NetworkUtils;
 import android.net.RouteInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.Handler;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.View;
+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.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.core.lifecycle.LifecycleObserver;
 import com.android.settings.core.lifecycle.events.OnPause;
 import com.android.settings.core.lifecycle.events.OnResume;
+import com.android.settings.vpn2.ConnectivityManagerWrapper;
 import com.android.settings.wifi.WifiDetailPreference;
 import com.android.settingslib.wifi.AccessPoint;
 
@@ -67,6 +80,8 @@
     @VisibleForTesting
     static final String KEY_CONNECTION_DETAIL_PREF = "connection_detail";
     @VisibleForTesting
+    static final String KEY_BUTTONS_PREF = "buttons";
+    @VisibleForTesting
     static final String KEY_SIGNAL_STRENGTH_PREF = "signal_strength";
     @VisibleForTesting
     static final String KEY_LINK_SPEED = "link_speed";
@@ -88,18 +103,27 @@
     static final String KEY_IPV6_ADDRESS_CATEGORY = "ipv6_details_category";
 
     private AccessPoint mAccessPoint;
+    private final ConnectivityManagerWrapper mConnectivityManagerWrapper;
     private final ConnectivityManager mConnectivityManager;
     private final Fragment mFragment;
+    private final Handler mHandler;
+    private LinkProperties mLinkProperties;
+    private Network mNetwork;
     private NetworkInfo mNetworkInfo;
+    private NetworkCapabilities mNetworkCapabilities;
     private Context mPrefContext;
     private int mRssi;
     private String[] mSignalStr;
     private final WifiConfiguration mWifiConfig;
     private WifiInfo mWifiInfo;
     private final WifiManager mWifiManager;
+    private final MetricsFeatureProvider mMetricsFeatureProvider;
 
-    // Preferences - in order of appearance
+    // UI elements - in order of appearance
     private Preference mConnectionDetailPref;
+    private LayoutPreference mButtonsPref;
+    private Button mForgetButton;
+    private Button mSignInButton;
     private WifiDetailPreference mSignalStrengthPref;
     private WifiDetailPreference mLinkSpeedPref;
     private WifiDetailPreference mFrequencyPref;
@@ -109,8 +133,8 @@
     private WifiDetailPreference mGatewayPref;
     private WifiDetailPreference mSubnetPref;
     private WifiDetailPreference mDnsPref;
-    private PreferenceCategory mIpv6AddressCategory;
 
+    private PreferenceCategory mIpv6AddressCategory;
     private final IntentFilter mFilter;
     private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
         @Override
@@ -123,23 +147,55 @@
         }
     };
 
+    private final NetworkRequest mNetworkRequest = new NetworkRequest.Builder()
+            .clearCapabilities().addTransportType(TRANSPORT_WIFI).build();
+
+    // Must be run on the UI thread since it directly manipulates UI state.
+    private final NetworkCallback mNetworkCallback = new NetworkCallback() {
+        @Override
+        public void onLinkPropertiesChanged(Network network, LinkProperties lp) {
+            if (network.equals(mNetwork) && !lp.equals(mLinkProperties)) {
+                mLinkProperties = lp;
+                updateIpLayerInfo();
+            }
+        }
+
+        @Override
+        public void onCapabilitiesChanged(Network network, NetworkCapabilities nc) {
+            if (network.equals(mNetwork) && !nc.equals(mNetworkCapabilities)) {
+                mNetworkCapabilities = nc;
+                updateIpLayerInfo();
+            }
+        }
+
+        @Override
+        public void onLost(Network network) {
+            if (network.equals(mNetwork)) {
+                exitActivity();
+            }
+        }
+    };
+
     public WifiDetailPreferenceController(
             AccessPoint accessPoint,
-            ConnectivityManager connectivityManager,
+            ConnectivityManagerWrapper connectivityManagerWrapper,
             Context context,
             Fragment fragment,
+            Handler handler,
             Lifecycle lifecycle,
-            WifiManager wifiManager) {
+            WifiManager wifiManager,
+            MetricsFeatureProvider metricsFeatureProvider) {
         super(context);
 
         mAccessPoint = accessPoint;
-        mConnectivityManager = connectivityManager;
+        mConnectivityManager = connectivityManagerWrapper.getConnectivityManager();
+        mConnectivityManagerWrapper = connectivityManagerWrapper;
         mFragment = fragment;
-        mNetworkInfo = accessPoint.getNetworkInfo();
-        mRssi = accessPoint.getRssi();
+        mHandler = handler;
         mSignalStr = context.getResources().getStringArray(R.array.wifi_signal);
         mWifiConfig = accessPoint.getConfig();
         mWifiManager = wifiManager;
+        mMetricsFeatureProvider = metricsFeatureProvider;
 
         mFilter = new IntentFilter();
         mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
@@ -167,6 +223,12 @@
 
         mConnectionDetailPref = screen.findPreference(KEY_CONNECTION_DETAIL_PREF);
 
+        mButtonsPref = (LayoutPreference) screen.findPreference(KEY_BUTTONS_PREF);
+        mSignInButton = (Button) mButtonsPref.findViewById(R.id.right_button);
+        mSignInButton.setText(com.android.internal.R.string.network_available_sign_in);
+        mSignInButton.setOnClickListener(
+            view -> mConnectivityManagerWrapper.startCaptivePortalApp(mNetwork));
+
         mSignalStrengthPref =
                 (WifiDetailPreference) screen.findPreference(KEY_SIGNAL_STRENGTH_PREF);
         mLinkSpeedPref = (WifiDetailPreference) screen.findPreference(KEY_LINK_SPEED);
@@ -183,32 +245,46 @@
                 (PreferenceCategory) screen.findPreference(KEY_IPV6_ADDRESS_CATEGORY);
 
         mSecurityPref.setDetailText(mAccessPoint.getSecurityString(false /* concise */));
-    }
-
-    public WifiInfo getWifiInfo() {
-        return mWifiInfo;
+        mForgetButton = (Button) mButtonsPref.findViewById(R.id.left_button);
+        mForgetButton.setText(R.string.forget);
+        mForgetButton.setOnClickListener(view -> forgetNetwork());
+        updateInfo();
     }
 
     @Override
     public void onResume() {
-        updateInfo();
-
+        mConnectivityManagerWrapper.registerNetworkCallback(mNetworkRequest, mNetworkCallback,
+                mHandler);
+        // updateInfo() will be called during registration because NETWORK_STATE_CHANGED_ACTION is
+        // a sticky broadcast.
         mContext.registerReceiver(mReceiver, mFilter);
     }
 
     @Override
     public void onPause() {
+        mNetwork = null;
+        mLinkProperties = null;
+        mNetworkCapabilities = null;
+        mNetworkInfo = null;
+        mWifiInfo = null;
         mContext.unregisterReceiver(mReceiver);
+        mConnectivityManager.unregisterNetworkCallback(mNetworkCallback);
     }
 
     private void updateInfo() {
-        mNetworkInfo = mConnectivityManager.getNetworkInfo(mWifiManager.getCurrentNetwork());
+        mNetwork = mWifiManager.getCurrentNetwork();
+        mLinkProperties = mConnectivityManager.getLinkProperties(mNetwork);
+        mNetworkCapabilities = mConnectivityManager.getNetworkCapabilities(mNetwork);
+        mNetworkInfo = mConnectivityManager.getNetworkInfo(mNetwork);
         mWifiInfo = mWifiManager.getConnectionInfo();
-        if (mNetworkInfo == null || mWifiInfo == null) {
+        if (mNetwork == null || mNetworkInfo == null || mWifiInfo == null) {
             exitActivity();
             return;
         }
 
+        // Update whether the forgot button should be displayed.
+        mForgetButton.setVisibility(canForgetNetwork() ? View.VISIBLE : View.INVISIBLE);
+
         refreshNetworkState();
 
         // Update Connection Header icon and Signal Strength Preference
@@ -238,7 +314,9 @@
         }
         mFrequencyPref.setDetailText(band);
 
-        setIpText();
+        updateIpLayerInfo();
+        mButtonsPref.setVisible(mForgetButton.getVisibility() == View.VISIBLE
+                || mSignInButton.getVisibility() == View.VISIBLE);
     }
 
     private void exitActivity() {
@@ -270,7 +348,9 @@
         mSignalStrengthPref.setDetailText(mSignalStr[summarySignalLevel]);
     }
 
-    private void setIpText() {
+    private void updateIpLayerInfo() {
+        mSignInButton.setVisibility(canSignIntoNetwork() ? View.VISIBLE : View.INVISIBLE);
+
         // Reset all fields
         mIpv6AddressCategory.removeAll();
         mIpv6AddressCategory.setVisible(false);
@@ -279,18 +359,12 @@
         mGatewayPref.setVisible(false);
         mDnsPref.setVisible(false);
 
-        Network currentNetwork = mWifiManager.getCurrentNetwork();
-        if (currentNetwork == null) {
+        if (mNetwork == null || mLinkProperties == null) {
             return;
         }
+        List<InetAddress> addresses = mLinkProperties.getAddresses();
 
-        LinkProperties linkProperties = mConnectivityManager.getLinkProperties(currentNetwork);
-        if (linkProperties == null) {
-            return;
-        }
-        List<InetAddress> addresses = linkProperties.getAddresses();
-
-        // Set IPv4 and Ipv6 addresses
+        // Set IPv4 and IPv6 addresses
         for (int i = 0; i < addresses.size(); i++) {
             InetAddress addr = addresses.get(i);
             if (addr instanceof Inet4Address) {
@@ -310,7 +384,7 @@
         // Set up IPv4 gateway and subnet mask
         String gateway = null;
         String subnet = null;
-        for (RouteInfo routeInfo : linkProperties.getRoutes()) {
+        for (RouteInfo routeInfo : mLinkProperties.getRoutes()) {
             if (routeInfo.hasGateway() && routeInfo.getGateway() instanceof Inet4Address) {
                 gateway = routeInfo.getGateway().getHostAddress();
             }
@@ -333,7 +407,7 @@
 
         // Set IPv4 DNS addresses
         StringJoiner stringJoiner = new StringJoiner(",");
-        for (InetAddress dnsServer : linkProperties.getDnsServers()) {
+        for (InetAddress dnsServer : mLinkProperties.getDnsServers()) {
             if (dnsServer instanceof Inet4Address) {
                 stringJoiner.add(dnsServer.getHostAddress());
             }
@@ -358,14 +432,22 @@
     /**
      * Returns whether the network represented by this preference can be forgotten.
      */
-    public boolean canForgetNetwork() {
+    private boolean canForgetNetwork() {
         return mWifiInfo != null && mWifiInfo.isEphemeral() || mWifiConfig != null;
     }
 
     /**
+     * Returns whether the user can sign into the network represented by this preference.
+     */
+    private boolean canSignIntoNetwork() {
+        return mNetworkCapabilities != null && mNetworkCapabilities.hasCapability(
+                NET_CAPABILITY_CAPTIVE_PORTAL);
+    }
+
+    /**
      * Forgets the wifi network associated with this preference.
      */
-    public void forgetNetwork() {
+    private void forgetNetwork() {
         if (mWifiInfo != null && mWifiInfo.isEphemeral()) {
             mWifiManager.disableEphemeralNetwork(mWifiInfo.getSSID());
         } else if (mWifiConfig != null) {
@@ -375,6 +457,8 @@
                 mWifiManager.forget(mWifiConfig.networkId, null /* action listener */);
             }
         }
+        mMetricsFeatureProvider.action(
+                mFragment.getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
         mFragment.getActivity().finish();
     }
 }
diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
index adcfcc0..664ac7f 100644
--- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
+++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java
@@ -19,13 +19,14 @@
 import android.net.ConnectivityManager;
 import android.net.wifi.WifiManager;
 import android.os.Bundle;
-import android.widget.Button;
+import android.os.Handler;
+import android.os.Looper;
 
 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.dashboard.DashboardFragment;
+import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
 import com.android.settingslib.wifi.AccessPoint;
 
 import java.util.ArrayList;
@@ -40,11 +41,7 @@
 public class WifiNetworkDetailsFragment extends DashboardFragment {
     private static final String TAG = "WifiNetworkDetailsFrg";
 
-    // XML KEYS
-    private static final String KEY_FORGET_BUTTON = "forget_button";
-
     private AccessPoint mAccessPoint;
-    private Button mForgetButton;
     private WifiDetailPreferenceController mWifiDetailPreferenceController;
 
     @Override
@@ -54,24 +51,6 @@
     }
 
     @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Header Title set automatically from launching Preference
-
-        LayoutPreference forgetPreference = ((LayoutPreference) findPreference(KEY_FORGET_BUTTON));
-        forgetPreference.setVisible(mWifiDetailPreferenceController.canForgetNetwork());
-        mForgetButton = (Button) forgetPreference.findViewById(R.id.button);
-        mForgetButton.setText(R.string.forget);
-        mForgetButton.setOnClickListener(view -> forgetNetwork());
-    }
-
-    private void forgetNetwork() {
-        mMetricsFeatureProvider.action(getActivity(), MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
-        mWifiDetailPreferenceController.forgetNetwork();
-    }
-
-    @Override
     public int getMetricsCategory() {
         return MetricsProto.MetricsEvent.WIFI_NETWORK_DETAILS;
     }
@@ -88,13 +67,16 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
         mWifiDetailPreferenceController = new WifiDetailPreferenceController(
                 mAccessPoint,
-                context.getSystemService(ConnectivityManager.class),
+                new ConnectivityManagerWrapperImpl(cm),
                 context,
                 this,
+                new Handler(Looper.getMainLooper()),  // UI thread.
                 getLifecycle(),
-                context.getSystemService(WifiManager.class));
+                context.getSystemService(WifiManager.class),
+                mMetricsFeatureProvider);
 
         ArrayList<PreferenceController> controllers = new ArrayList(1);
         controllers.add(mWifiDetailPreferenceController);
diff --git a/tests/app/res/values-zh-rTW/strings.xml b/tests/app/res/values-zh-rTW/strings.xml
index 4ab16d3..d3a7279 100644
--- a/tests/app/res/values-zh-rTW/strings.xml
+++ b/tests/app/res/values-zh-rTW/strings.xml
@@ -19,10 +19,10 @@
     <string name="discoverable" msgid="5156521178072363663">"可供偵測"</string>
     <string name="start_scan" msgid="3834980997400324437">"開始掃描"</string>
     <string name="stop_scan" msgid="4195720269023182612">"停止掃描"</string>
-    <string name="operator_hello" msgid="5164036004953019483">"電信業者您好！"</string>
+    <string name="operator_hello" msgid="5164036004953019483">"電信業者你好！"</string>
     <string name="operator_settings_title" msgid="6484497120056200416">"電信業者"</string>
     <string name="operator_settings_summary" msgid="8356150829172002728">"可用來啟動所選活動的電信業者勾點"</string>
-    <string name="manufacturer_hello" msgid="5926168503597475062">"製造商您好！"</string>
+    <string name="manufacturer_hello" msgid="5926168503597475062">"製造商你好！"</string>
     <string name="manufacturer_settings_title" msgid="3516742885166545864">"製造商"</string>
     <string name="manufacturer_settings_summary" msgid="4436962417539186408">"可用來啟動所選活動的製造商勾點"</string>
 </resources>
diff --git a/tests/app/src/com/android/settings/EncryptionInterstitialTest.java b/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
index f30d511..eb61b00 100644
--- a/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
+++ b/tests/app/src/com/android/settings/EncryptionInterstitialTest.java
@@ -93,7 +93,7 @@
         Intent mMatchedIntent = null;
 
         @Override
-        public ActivityResult onMatchIntent(Intent intent) {
+        public ActivityResult onStartActivity(Intent intent) {
             if ("test.unlock.intent".equals(intent.getAction())) {
                 mMatchedIntent = intent;
                 return new ActivityResult(Activity.RESULT_OK, null);
diff --git a/tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java
deleted file mode 100644
index 11a49fc..0000000
--- a/tests/app/src/com/android/settings/wifi/WifiSettingsUiTest.java
+++ /dev/null
@@ -1,74 +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.wifi;
-
-import static android.support.test.espresso.Espresso.onView;
-import static android.support.test.espresso.action.ViewActions.click;
-import static android.support.test.espresso.matcher.ViewMatchers.withText;
-
-import android.app.Instrumentation;
-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.R;
-import com.android.settings.Settings.WifiSettingsActivity;
-import com.android.settingslib.wifi.WifiTracker;
-import com.android.settingslib.wifi.WifiTrackerFactory;
-
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-
-@RunWith(AndroidJUnit4.class)
-public class WifiSettingsUiTest {
-
-    // TODO(sghuman): Investigate why resource ids are not resolving correctly in the test apk,
-    // then remove this manual string entry
-    private static final String WIFI_PREFERENCES = "Wi\\u2011Fi preferences";
-
-    @Mock private WifiTracker mockWifiTracker;
-
-    @Rule
-    public ActivityTestRule<WifiSettingsActivity> mActivityRule =
-            new ActivityTestRule<>(WifiSettingsActivity.class, true);
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-        WifiTrackerFactory.setTestingWifiTracker(mockWifiTracker);
-    }
-
-    private void launchActivity() {
-        mActivityRule.launchActivity(new Intent("android.settings.WIFI_SETTINGS"));
-    }
-
-    @Test
-    public void launchActivityShouldSucceed() {
-        launchActivity();
-    }
-
-    @Test
-    public void shouldShowWifiPreferences() {
-        launchActivity();
-        onView(withText(WIFI_PREFERENCES)).perform(click());
-    }
-}
diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider
index f5462b0..767edf8 100644
--- a/tests/robotests/assets/grandfather_not_implementing_index_provider
+++ b/tests/robotests/assets/grandfather_not_implementing_index_provider
@@ -5,3 +5,8 @@
 com.android.settings.fuelgauge.AdvancedPowerUsageDetail
 com.android.settings.deviceinfo.StorageProfileFragment
 com.android.settings.wifi.details.WifiNetworkDetailsFragment
+com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionCamera
+com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionLocation
+com.android.settings.enterprise.ApplicationListFragment$AdminGrantedPermissionMicrophone
+com.android.settings.enterprise.ApplicationListFragment$EnterpriseInstalledPackages
+com.android.settings.enterprise.EnterpriseSetDefaultAppsListFragment
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.java
new file mode 100644
index 0000000..ef36e5f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlGeneratorFromXmlTest.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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+import org.xmlpull.v1.XmlPullParserException;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LicenseHtmlGeneratorFromXmlTest {
+    private static final String VAILD_XML_STRING =
+            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+            "<licenses>\n" +
+            "<file-name contentId=\"0\">/file0</file-name>\n" +
+            "<file-name contentId=\"0\">/file1</file-name>\n" +
+            "<file-content contentId=\"0\"><![CDATA[license content #0]]></file-content>\n" +
+            "</licenses>";
+
+    private static final String INVAILD_XML_STRING =
+            "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" +
+            "<licenses2>\n" +
+            "<file-name contentId=\"0\">/file0</file-name>\n" +
+            "<file-name contentId=\"0\">/file1</file-name>\n" +
+            "<file-content contentId=\"0\"><![CDATA[license content #0]]></file-content>\n" +
+            "</licenses2>";
+
+    private static final String EXPECTED_HTML_STRING =
+            "<html><head>\n" +
+            "<style type=\"text/css\">\n" +
+            "body { padding: 0; font-family: sans-serif; }\n" +
+            ".same-license { background-color: #eeeeee;\n" +
+            "                border-top: 20px solid white;\n" +
+            "                padding: 10px; }\n" +
+            ".label { font-weight: bold; }\n" +
+            ".file-list { margin-left: 1em; color: blue; }\n" +
+            "</style>\n" +
+            "</head>" +
+            "<body topmargin=\"0\" leftmargin=\"0\" rightmargin=\"0\" bottommargin=\"0\">\n" +
+            "<div class=\"toc\">\n" +
+            "<ul>\n" +
+            "<li><a href=\"#id0\">/file0</a></li>\n" +
+            "<li><a href=\"#id0\">/file1</a></li>\n" +
+            "</ul>\n" +
+            "</div><!-- table of contents -->\n" +
+            "<table cellpadding=\"0\" cellspacing=\"0\" border=\"0\">\n" +
+            "<tr id=\"id0\"><td class=\"same-license\">\n" +
+            "<div class=\"label\">Notices for file(s):</div>\n" +
+            "<div class=\"file-list\">\n" +
+            "/file0 <br/>\n" +
+            "/file1 <br/>\n" +
+            "</div><!-- file-list -->\n" +
+            "<pre class=\"license-text\">\n" +
+            "license content #0\n" +
+            "</pre><!-- license-text -->\n" +
+            "</td></tr><!-- same-license -->\n" +
+            "</table></body></html>\n";
+
+    @Test
+    public void testParseValidXmlStream() throws XmlPullParserException, IOException {
+        Map<String, String> fileNameToContentIdMap = new HashMap<String, String>();
+        Map<String, String> contentIdToFileContentMap = new HashMap<String, String>();
+
+        LicenseHtmlGeneratorFromXml.parse(
+                new InputStreamReader(new ByteArrayInputStream(VAILD_XML_STRING.getBytes())),
+                fileNameToContentIdMap, contentIdToFileContentMap);
+        assertThat(fileNameToContentIdMap.size()).isEqualTo(2);
+        assertThat(fileNameToContentIdMap.get("/file0")).isEqualTo("0");
+        assertThat(fileNameToContentIdMap.get("/file1")).isEqualTo("0");
+        assertThat(contentIdToFileContentMap.size()).isEqualTo(1);
+        assertThat(contentIdToFileContentMap.get("0")).isEqualTo("license content #0");
+    }
+
+    @Test(expected = XmlPullParserException.class)
+    public void testParseInvalidXmlStream() throws XmlPullParserException, IOException {
+        Map<String, String> fileNameToContentIdMap = new HashMap<String, String>();
+        Map<String, String> contentIdToFileContentMap = new HashMap<String, String>();
+
+        LicenseHtmlGeneratorFromXml.parse(
+                new InputStreamReader(new ByteArrayInputStream(INVAILD_XML_STRING.getBytes())),
+                fileNameToContentIdMap, contentIdToFileContentMap);
+    }
+
+    @Test
+    public void testGenerateHtml() {
+        Map<String, String> fileNameToContentIdMap = new HashMap<String, String>();
+        Map<String, String> contentIdToFileContentMap = new HashMap<String, String>();
+
+        fileNameToContentIdMap.put("/file0", "0");
+        fileNameToContentIdMap.put("/file1", "0");
+        contentIdToFileContentMap.put("0", "license content #0");
+
+        StringWriter output = new StringWriter();
+        LicenseHtmlGeneratorFromXml.generateHtml(
+                fileNameToContentIdMap, contentIdToFileContentMap, new PrintWriter(output));
+        assertThat(output.toString()).isEqualTo(EXPECTED_HTML_STRING);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
new file mode 100644
index 0000000..96e88c2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/LicenseHtmlLoaderTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+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 java.io.File;
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class LicenseHtmlLoaderTest {
+    @Mock
+    private Context mContext;
+
+    LicenseHtmlLoader newLicenseHtmlLoader(ArrayList<File> xmlFiles,
+            File cachedHtmlFile, boolean isCachedHtmlFileOutdated,
+            boolean generateHtmlFileSucceeded) {
+        LicenseHtmlLoader loader = spy(new LicenseHtmlLoader(mContext));
+        doReturn(xmlFiles).when(loader).getVaildXmlFiles();
+        doReturn(cachedHtmlFile).when(loader).getCachedHtmlFile();
+        doReturn(isCachedHtmlFileOutdated).when(loader).isCachedHtmlFileOutdated(any(), any());
+        doReturn(generateHtmlFileSucceeded).when(loader).generateHtmlFile(any(), any());
+        return loader;
+    }
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void testLoadInBackground() {
+        ArrayList<File> xmlFiles = new ArrayList();
+        xmlFiles.add(new File("test.xml"));
+        File cachedHtmlFile = new File("test.html");
+
+        LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, true);
+
+        assertThat(loader.loadInBackground()).isEqualTo(cachedHtmlFile);
+        verify(loader).generateHtmlFile(any(), any());
+    }
+
+    @Test
+    public void testLoadInBackgroundWithNoVaildXmlFiles() {
+        ArrayList<File> xmlFiles = new ArrayList();
+        File cachedHtmlFile = new File("test.html");
+
+        LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, true);
+
+        assertThat(loader.loadInBackground()).isNull();
+        verify(loader, never()).generateHtmlFile(any(), any());
+    }
+
+    @Test
+    public void testLoadInBackgroundWithNonOutdatedCachedHtmlFile() {
+        ArrayList<File> xmlFiles = new ArrayList();
+        xmlFiles.add(new File("test.xml"));
+        File cachedHtmlFile = new File("test.html");
+
+        LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, false, true);
+
+        assertThat(loader.loadInBackground()).isEqualTo(cachedHtmlFile);
+        verify(loader, never()).generateHtmlFile(any(), any());
+    }
+
+    @Test
+    public void testLoadInBackgroundWithGenerateHtmlFileFailed() {
+        ArrayList<File> xmlFiles = new ArrayList();
+        xmlFiles.add(new File("test.xml"));
+        File cachedHtmlFile = new File("test.html");
+
+        LicenseHtmlLoader loader = newLicenseHtmlLoader(xmlFiles, cachedHtmlFile, true, false);
+
+        assertThat(loader.loadInBackground()).isNull();
+        verify(loader).generateHtmlFile(any(), any());
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
new file mode 100644
index 0000000..3e28a2a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java
@@ -0,0 +1,116 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.robolectric.Shadows.shadowOf;
+
+import android.app.Application;
+import android.os.Bundle;
+import android.os.SystemProperties;
+import android.content.Context;
+import android.content.Intent;
+import android.content.Loader;
+import android.net.Uri;
+import android.os.Bundle;
+
+import java.io.File;
+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.Robolectric;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
+import org.robolectric.res.builder.RobolectricPackageManager;
+import org.robolectric.util.ActivityController;
+import org.robolectric.shadows.ShadowActivity;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class SettingsLicenseActivityTest {
+    private ActivityController<SettingsLicenseActivity> mActivityController;
+    private SettingsLicenseActivity mActivity;
+    private Application mApplication;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mApplication = RuntimeEnvironment.application;
+        mActivityController = Robolectric.buildActivity(SettingsLicenseActivity.class);
+        mActivity = spy(mActivityController.get());
+    }
+
+    void assertEqualIntents(Intent actual, Intent expected) {
+        assertThat(actual.getAction()).isEqualTo(expected.getAction());
+        assertThat(actual.getDataString()).isEqualTo(expected.getDataString());
+        assertThat(actual.getType()).isEqualTo(expected.getType());
+        assertThat(actual.getCategories()).isEqualTo(expected.getCategories());
+        assertThat(actual.getPackage()).isEqualTo(expected.getPackage());
+        assertThat(actual.getFlags()).isEqualTo(expected.getFlags());
+    }
+
+    @Test
+    public void testOnCreateWithValidHtmlFile() {
+        SystemProperties.set("ro.config.license_path", "/system/etc/NOTICE.html.gz");
+
+        doReturn(true).when(mActivity).isFileValid(any());
+        mActivity.onCreate(null);
+
+        final Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(Uri.parse("file:///system/etc/NOTICE.html.gz"), "text/html");
+        intent.putExtra(Intent.EXTRA_TITLE, mActivity.getString(
+                R.string.settings_license_activity_title));
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setPackage("com.android.htmlviewer");
+
+        assertEqualIntents(shadowOf(mApplication).getNextStartedActivity(), intent);
+    }
+
+    @Test
+    public void testOnCreateWithGeneratedHtmlFile() {
+        doReturn(null).when(mActivity).onCreateLoader(anyInt(), any());
+        doReturn(Uri.parse("content://com.android.settings.files/my_cache/generated_test.html"))
+                .when(mActivity).getUriFromGeneratedHtmlFile(any());
+
+        mActivity.onCreate(null);
+        mActivity.onLoadFinished(null, new File("/generated_test.html"));
+
+        final Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setDataAndType(
+                Uri.parse("content://com.android.settings.files/my_cache/generated_test.html"),
+                "text/html");
+        intent.putExtra(Intent.EXTRA_TITLE, mActivity.getString(
+                R.string.settings_license_activity_title));
+        intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        intent.addCategory(Intent.CATEGORY_DEFAULT);
+        intent.setPackage("com.android.htmlviewer");
+
+        assertEqualIntents(shadowOf(mApplication).getNextStartedActivity(), intent);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java b/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
index 668fc88..a991e7a 100644
--- a/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
+++ b/tests/robotests/src/com/android/settings/SettingsRobolectricTestRunner.java
@@ -77,6 +77,22 @@
                         getPackageName(),
                         Fs.fileFromPath("./frameworks/base/core/res/res"),
                         null));
+                paths.add(new ResourcePath(
+                        getPackageName(),
+                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/main/res"),
+                        null));
+                paths.add(new ResourcePath(
+                        getPackageName(),
+                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/eclair-mr1/res"),
+                        null));
+                paths.add(new ResourcePath(
+                        getPackageName(),
+                        Fs.fileFromPath("./frameworks/opt/setupwizard/library/full-support/res"),
+                        null));
+                paths.add(new ResourcePath(
+                        getPackageName(),
+                        Fs.fileFromPath("./frameworks/support/v7/appcompat/res"),
+                        null));
                 return paths;
             }
         };
diff --git a/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
new file mode 100644
index 0000000..4b78ee7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java
@@ -0,0 +1,89 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.robolectric.RuntimeEnvironment.application;
+
+import android.app.Activity;
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
+import android.os.UserHandle;
+
+import com.android.settings.ChooseLockPattern.ChooseLockPatternFragment;
+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 org.junit.Before;
+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.res.builder.RobolectricPackageManager.ComponentState;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(
+        manifest = TestConfig.MANIFEST_PATH,
+        sdk = TestConfig.SDK_VERSION,
+        shadows = {
+                SettingsShadowResources.class,
+                SettingsShadowResources.SettingsShadowTheme.class,
+                ShadowDynamicIndexableContentMonitor.class,
+                ShadowEventLogWriter.class,
+                ShadowUtils.class
+        })
+public class SetupChooseLockPatternTest {
+
+    private SetupChooseLockPattern mActivity;
+
+    @Before
+    public void setUp() {
+        RuntimeEnvironment.getRobolectricPackageManager().setComponentEnabledSetting(
+                new ComponentName(application, SetupRedactionInterstitial.class),
+                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+                PackageManager.DONT_KILL_APP);
+
+        mActivity =  Robolectric.buildActivity(
+                SetupChooseLockPattern.class,
+                SetupChooseLockPattern.createIntent(
+                        application,
+                        false, /* requirePassword */
+                        false, /* confirmCredentials */
+                        UserHandle.myUserId()))
+                .setup().get();
+    }
+
+    @Test
+    public void chooseLockSaved_shouldEnableRedactionInterstitial() {
+        findFragment(mActivity).onChosenLockSaveFinished(false, null);
+
+        ComponentState redactionComponentState =
+                RuntimeEnvironment.getRobolectricPackageManager().getComponentState(
+                        new ComponentName(application, SetupRedactionInterstitial.class));
+        assertThat(redactionComponentState.newState).named("Redaction component state")
+                .isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+    }
+
+    private ChooseLockPatternFragment findFragment(Activity activity) {
+        return (ChooseLockPatternFragment)
+                activity.getFragmentManager().findFragmentById(R.id.main_content);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.java
new file mode 100644
index 0000000..f17509a
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/AppStateAppOpsBridgeTest.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.applications;
+
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.when;
+
+import android.Manifest;
+import android.app.AppOpsManager;
+import android.content.Context;
+import android.os.RemoteException;
+import android.os.UserManager;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.applications.ApplicationsState.AppEntry;
+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;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class AppStateAppOpsBridgeTest {
+
+    @Mock private Context mContext;
+    @Mock private UserManager mUserManager;
+    @Mock private IPackageManagerWrapper mPackageManagerService;
+    @Mock private AppOpsManager mAppOpsManager;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        when(mContext.getSystemService(Context.APP_OPS_SERVICE)).thenReturn(mAppOpsManager);
+    }
+
+    @Test
+    public void getPermissionInfo_nullPackageInfo_shouldNotCrash() throws RemoteException {
+        when(mPackageManagerService.getPackageInfo(anyString(), anyInt(), anyInt()))
+            .thenReturn(null);
+        TestAppStateAppOpsBridge appStateAppOpsBridge = new TestAppStateAppOpsBridge();
+
+        appStateAppOpsBridge.getPermissionInfo("pkg1", 1);
+        // should not crash
+    }
+
+    private class TestAppStateAppOpsBridge extends AppStateAppOpsBridge {
+        public TestAppStateAppOpsBridge() {
+            super(mContext, null, null, AppOpsManager.OP_SYSTEM_ALERT_WINDOW,
+                new String[] {Manifest.permission.SYSTEM_ALERT_WINDOW},
+                mPackageManagerService);
+        }
+
+        @Override
+        protected void updateExtraInfo(AppEntry app, String pkg, int uid) {
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
index aeb3826..4a7dc8f 100644
--- a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsCounterTest.java
@@ -18,15 +18,18 @@
 
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.UserInfo;
 import android.os.Build;
+import android.os.RemoteException;
 import android.os.UserHandle;
 import android.os.UserManager;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -83,102 +86,31 @@
     @Mock private DevicePolicyManagerWrapper mDevicePolicyManager;
 
     private int mAppCount = -1;
+    private ApplicationInfo mApp1;
+    private ApplicationInfo mApp2;
+    private ApplicationInfo mApp3;
+    private ApplicationInfo mApp4;
+    private ApplicationInfo mApp5;
+    private ApplicationInfo mApp6;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+
+        mApp1 = buildInfo(APP_1_UID, APP_1, 0 /* flags */, Build.VERSION_CODES.M);
+        mApp2 = buildInfo(APP_2_UID, APP_2, 0 /* flags */, Build.VERSION_CODES.M);
+        mApp3 = buildInfo(APP_3_UID, APP_3, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP);
+        mApp4 = buildInfo(APP_4_UID, APP_4, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP);
+        mApp5 = buildInfo(APP_5_UID, APP_5, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP);
+        mApp6 = buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M);
     }
 
     private void verifyCountInstalledApps(boolean async) throws Exception {
-        // There are two users.
-        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
-                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
-                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
-
-        // The first user has five apps installed:
-        // * app1 uses run-time permissions. It has been granted one of the permissions by the
-        //        admin. It should be counted.
-        // * app2 uses run-time permissions. It has not been granted any of the permissions by the
-        //        admin. It should not be counted.
-        // * app3 uses install-time permissions. It was installed by the admin and requested one of
-        //        the permissions. It should be counted.
-        // * app4 uses install-time permissions. It was not installed by the admin but did request
-        //        one of the permissions. It should not be counted.
-        // * app5 uses install-time permissions. It was installed by the admin but did not request
-        //        any of the permissions. It should not be counted.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
-                | PackageManager.MATCH_ANY_USER,
-                MAIN_USER_ID)).thenReturn(Arrays.asList(
-                        buildInfo(APP_1_UID, APP_1, 0 /* flags */, Build.VERSION_CODES.M),
-                        buildInfo(APP_2_UID, APP_2, 0 /* flags */, Build.VERSION_CODES.M),
-                        buildInfo(APP_3_UID, APP_3, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP),
-                        buildInfo(APP_4_UID, APP_4, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP),
-                        buildInfo(APP_5_UID, APP_5, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP)));
-
-        // Grant run-time permissions as appropriate.
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_1))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
-        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
-
-        // Grant install-time permissions as appropriate.
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_3_UID))
-                .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_4_UID))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
-                .thenReturn(PackageManager.PERMISSION_GRANTED);
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-
-        // app3 and app5 were installed by enterprise policy.
-        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
-        when(mPackageManager.getInstallReason(APP_1, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_2, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_3, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_4, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_5, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        // The second user has one app installed. This app uses run-time permissions. It has been
-        // granted both permissions by the admin. It should be counted.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
-                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(
-                        buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M)));
-
-        // Grant run-time permissions as appropriate.
-        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
-                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
-
-        // Grant install-time permissions as appropriate.
-        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
-                .thenReturn(PackageManager.PERMISSION_DENIED);
-
-        // app6 was not installed by enterprise policy.
-        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
-        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        configureUserManager();
+        configurePackageManager();
+        configureRunTimePermissions();
+        configureInstallTimePermissions();
 
         // Count the number of all apps installed that were granted on or more permissions by the
         // admin.
@@ -201,6 +133,28 @@
     }
 
     @Test
+    public void testIncludeInCount() throws Exception {
+        configurePackageManager();
+        configureRunTimePermissions();
+        configureInstallTimePermissions();
+
+        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
+                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp1)).isTrue();
+
+        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
+                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp2)).isFalse();
+
+        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
+                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp3)).isTrue();
+
+        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
+                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp4)).isFalse();
+
+        assertThat(AppWithAdminGrantedPermissionsCounter.includeInCount(PERMISSIONS,
+                mDevicePolicyManager, mPackageManager, mPackageManagerService, mApp5)).isFalse();
+    }
+
+    @Test
     public void testCountInstalledAppsSync() throws Exception {
         verifyCountInstalledApps(false /* async */);
     }
@@ -210,6 +164,90 @@
         verifyCountInstalledApps(true /* async */);
     }
 
+    private void configureInstallTimePermissions() throws RemoteException {
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_3_UID))
+                .thenReturn(PackageManager.PERMISSION_GRANTED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_4_UID))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
+                .thenReturn(PackageManager.PERMISSION_GRANTED);
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+    }
+
+    private void configureRunTimePermissions() {
+        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_1))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
+        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
+    }
+
+    private void configurePackageManager() {
+        // The first user has five apps installed:
+        // * app1 uses run-time permissions. It has been granted one of the permissions by the
+        //        admin. It should be counted.
+        // * app2 uses run-time permissions. It has not been granted any of the permissions by the
+        //        admin. It should not be counted.
+        // * app3 uses install-time permissions. It was installed by the admin and requested one of
+        //        the permissions. It should be counted.
+        // * app4 uses install-time permissions. It was not installed by the admin but did request
+        //        one of the permissions. It should not be counted.
+        // * app5 uses install-time permissions. It was installed by the admin but did not request
+        //        any of the permissions. It should not be counted.
+        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
+                | PackageManager.MATCH_ANY_USER,
+                MAIN_USER_ID)).thenReturn(Arrays.asList(mApp1, mApp2, mApp3, mApp4, mApp5));
+        // The second user has one app installed. This app uses run-time permissions. It has been
+        // granted both permissions by the admin. It should be counted.
+        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
+                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(mApp6));
+
+        // app3 and app5 were installed by enterprise policy.
+        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
+        when(mPackageManager.getInstallReason(APP_1, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_2, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_3, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        when(mPackageManager.getInstallReason(APP_4, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_5, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        // app6 was not installed by enterprise policy.
+        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
+        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+
+    }
+
+    private void configureUserManager() {
+        // There are two users.
+        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
+                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
+                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
+    }
+
     private class AppWithAdminGrantedPermissionsCounterTestable extends
             AppWithAdminGrantedPermissionsCounter {
         public AppWithAdminGrantedPermissionsCounterTestable(String[] permissions) {
diff --git a/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
new file mode 100644
index 0000000..73bba04
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/AppWithAdminGrantedPermissionsListerTest.java
@@ -0,0 +1,223 @@
+/*
+ * 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 android.app.admin.DevicePolicyManager;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.os.Build;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.enterprise.DevicePolicyManagerWrapper;
+
+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;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for {@link AppWithAdminGrantedPermissionsLister}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class AppWithAdminGrantedPermissionsListerTest {
+
+    private final String APP_1 = "app1";
+    private final String APP_2 = "app2";
+    private final String APP_3 = "app3";
+    private final String APP_4 = "app4";
+    private final String APP_5 = "app5";
+    private final String APP_6 = "app6";
+
+    private final int MAIN_USER_ID = 0;
+    private final int MANAGED_PROFILE_ID = 10;
+
+    private final int PER_USER_UID_RANGE = 100000;
+    private final int APP_1_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 1;
+    private final int APP_2_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 2;
+    private final int APP_3_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 3;
+    private final int APP_4_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 4;
+    private final int APP_5_UID = MAIN_USER_ID * PER_USER_UID_RANGE + 5;
+    private final int APP_6_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE + 1;
+
+    private final String PERMISSION_1 = "some.permission.1";
+    private final String PERMISSION_2 = "some.permission.2";
+    private final String[] PERMISSIONS = {PERMISSION_1, PERMISSION_2};
+
+    @Mock private UserManager mUserManager;
+    @Mock private PackageManagerWrapper mPackageManager;
+    @Mock private IPackageManagerWrapper mPackageManagerService;
+    @Mock private DevicePolicyManagerWrapper mDevicePolicyManager;
+
+    private List<UserAppInfo> mAppList = Collections.emptyList();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    @Test
+    public void verifyListInstalledApps() throws Exception {
+        // There are two users.
+        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
+                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
+                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
+
+        // The first user has five apps installed:
+        // * app1 uses run-time permissions. It has been granted one of the permissions by the
+        //        admin. It should be listed.
+        // * app2 uses run-time permissions. It has not been granted any of the permissions by the
+        //        admin. It should not be listed.
+        // * app3 uses install-time permissions. It was installed by the admin and requested one of
+        //        the permissions. It should be listed.
+        // * app4 uses install-time permissions. It was not installed by the admin but did request
+        //        one of the permissions. It should not be listed.
+        // * app5 uses install-time permissions. It was installed by the admin but did not request
+        //        any of the permissions. It should not be listed.
+        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
+                | PackageManager.MATCH_ANY_USER,
+                MAIN_USER_ID)).thenReturn(Arrays.asList(
+                        buildInfo(APP_1_UID, APP_1, 0 /* flags */, Build.VERSION_CODES.M),
+                        buildInfo(APP_2_UID, APP_2, 0 /* flags */, Build.VERSION_CODES.M),
+                        buildInfo(APP_3_UID, APP_3, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP),
+                        buildInfo(APP_4_UID, APP_4, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP),
+                        buildInfo(APP_5_UID, APP_5, 0 /* flags */, Build.VERSION_CODES.LOLLIPOP)));
+
+        // Grant run-time permissions as appropriate.
+        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_1))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
+        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION_2))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_2), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_3), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_4), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_5), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+
+        // Grant install-time permissions as appropriate.
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_1_UID)))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_2_UID)))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_3_UID))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_3_UID))
+                .thenReturn(PackageManager.PERMISSION_GRANTED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION_1, APP_4_UID))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION_2, APP_4_UID))
+                .thenReturn(PackageManager.PERMISSION_GRANTED);
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_5_UID)))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+
+        // app3 and app5 were installed by enterprise policy.
+        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
+        when(mPackageManager.getInstallReason(APP_1, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_2, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_3, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        when(mPackageManager.getInstallReason(APP_4, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_5, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+
+        // The second user has one app installed. This app uses run-time permissions. It has been
+        // granted both permissions by the admin. It should be listed.
+        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
+                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(
+                        buildInfo(APP_6_UID, APP_6, 0 /* flags */, Build.VERSION_CODES.M)));
+
+        // Grant run-time permissions as appropriate.
+        when(mDevicePolicyManager.getPermissionGrantState(eq(null), eq(APP_6), anyObject()))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
+
+        // Grant install-time permissions as appropriate.
+        when(mPackageManagerService.checkUidPermission(anyObject(), eq(APP_6_UID)))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+
+        // app6 was not installed by enterprise policy.
+        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
+        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+
+        // List all apps installed that were granted one or more permissions by the
+        // admin.
+        (new AppWithAdminGrantedPermissionsListerTestable(PERMISSIONS)).execute();
+
+        // Wait for the background task to finish.
+        ShadowApplication.runBackgroundTasks();
+        assertThat(mAppList.size()).isEqualTo(3);
+        InstalledAppListerTest.verifyListUniqueness(mAppList);
+
+        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_1, MAIN_USER_ID)).isTrue();
+        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_2, MAIN_USER_ID)).isFalse();
+        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_3, MAIN_USER_ID)).isTrue();
+        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_4, MAIN_USER_ID)).isFalse();
+        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_5, MAIN_USER_ID)).isFalse();
+        assertThat(InstalledAppListerTest.checkAppFound(mAppList, APP_6, MANAGED_PROFILE_ID)).
+                isTrue();
+
+        // Verify that installed packages were retrieved the current user and the user's managed
+        // profile only.
+        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
+        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
+                eq(MANAGED_PROFILE_ID));
+        verify(mPackageManager, atLeast(0)).getInstallReason(anyObject(), anyObject());
+        verifyNoMoreInteractions(mPackageManager);
+    }
+
+    private class AppWithAdminGrantedPermissionsListerTestable extends
+            AppWithAdminGrantedPermissionsLister {
+
+        public AppWithAdminGrantedPermissionsListerTestable(String[] permissions) {
+            super(permissions, mPackageManager, mPackageManagerService,
+                    mDevicePolicyManager, mUserManager);
+        }
+
+        @Override
+        protected void onAppListBuilt(List<UserAppInfo> list) {
+            mAppList = list;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
index f46bb90..4c4ec46 100644
--- a/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/applications/ApplicationFeatureProviderImplTest.java
@@ -20,19 +20,20 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
 import android.os.Build;
 import android.os.UserHandle;
 import android.os.UserManager;
-import android.util.ArraySet;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.ApplicationTestUtils;
 import com.android.settings.testutils.shadow.ShadowUserManager;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,8 +42,9 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 
+import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Set;
+import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.when;
@@ -76,6 +78,7 @@
     private ApplicationFeatureProvider mProvider;
 
     private int mAppCount = -1;
+    private List<UserAppInfo> mAppList = null;
 
     @Before
     public void setUp() {
@@ -106,6 +109,22 @@
     }
 
     @Test
+    public void testListPolicyInstalledApps() {
+        setUpUsersAndInstalledApps();
+
+        when(mPackageManager.getInstallReason(APP_1, new UserHandle(MAIN_USER_ID)))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_2, new UserHandle(MANAGED_PROFILE_ID)))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+
+        mAppList = null;
+        mProvider.listPolicyInstalledApps((list) -> mAppList = list);
+        assertThat(mAppList).isNotNull();
+        assertThat(mAppList.size()).isEqualTo(1);
+        assertThat(mAppList.get(0).appInfo.packageName).isEqualTo(APP_2);
+    }
+
+    @Test
     public void testCalculateNumberOfInstalledAppsSync() {
         verifyCalculateNumberOfPolicyInstalledApps(false /* async */);
     }
@@ -139,7 +158,6 @@
             ShadowApplication.runBackgroundTasks();
         }
         assertThat(mAppCount).isEqualTo(2);
-
     }
 
     @Test
@@ -153,9 +171,43 @@
     }
 
     @Test
+    public void testListAppsWithAdminGrantedPermissions()
+            throws Exception {
+        setUpUsersAndInstalledApps();
+
+        when(mDevicePolicyManager.getPermissionGrantState(null, APP_1, PERMISSION))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_GRANTED);
+        when(mDevicePolicyManager.getPermissionGrantState(null, APP_2, PERMISSION))
+                .thenReturn(DevicePolicyManager.PERMISSION_GRANT_STATE_DENIED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION, APP_1_UID))
+                .thenReturn(PackageManager.PERMISSION_DENIED);
+        when(mPackageManagerService.checkUidPermission(PERMISSION, APP_2_UID))
+                .thenReturn(PackageManager.PERMISSION_GRANTED);
+        when(mPackageManager.getInstallReason(APP_1, new UserHandle(MAIN_USER_ID)))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_2, new UserHandle(MANAGED_PROFILE_ID)))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+
+        mAppList = null;
+        mProvider.listAppsWithAdminGrantedPermissions(new String[] {PERMISSION},
+                (list) -> mAppList = list);
+        assertThat(mAppList).isNotNull();
+        assertThat(mAppList.size()).isEqualTo(2);
+        assertThat(Arrays.asList(mAppList.get(0).appInfo.packageName,
+                mAppList.get(1).appInfo.packageName).containsAll(Arrays.asList(APP_1, APP_2)))
+                .isTrue();
+    }
+
+    @Test
     public void testFindPersistentPreferredActivities() throws Exception {
+        final UserInfo mainUser = new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN);
+        final UserInfo managedUser = new UserInfo(MANAGED_PROFILE_ID, "managed",
+                UserInfo.FLAG_MANAGED_PROFILE);
+
         when(mUserManager.getUserProfiles()).thenReturn(Arrays.asList(new UserHandle(MAIN_USER_ID),
                 new UserHandle(MANAGED_PROFILE_ID)));
+        when(mUserManager.getUserInfo(MAIN_USER_ID)).thenReturn(mainUser);
+        when(mUserManager.getUserInfo(MANAGED_PROFILE_ID)).thenReturn(managedUser);
 
         final Intent viewIntent = new Intent(Intent.ACTION_VIEW);
         final Intent editIntent = new Intent(Intent.ACTION_EDIT);
@@ -176,17 +228,21 @@
         when(mPackageManagerService.findPersistentPreferredActivity(sendIntent, MANAGED_PROFILE_ID))
                 .thenReturn(null);
 
-        final Set<ApplicationFeatureProvider.PersistentPreferredActivityInfo> expectedActivities
-                = new ArraySet<>();
-        expectedActivities.add(new ApplicationFeatureProvider.PersistentPreferredActivityInfo(APP_1,
-                MAIN_USER_ID));
-        expectedActivities.add(new ApplicationFeatureProvider.PersistentPreferredActivityInfo(APP_1,
-                MANAGED_PROFILE_ID));
-        expectedActivities.add(new ApplicationFeatureProvider.PersistentPreferredActivityInfo(APP_2,
-                MANAGED_PROFILE_ID));
+        final List<UserAppInfo> expectedMainUserActivities = new ArrayList<>();
+        expectedMainUserActivities.add(new UserAppInfo(mainUser,
+                new ApplicationInfo(app1.activityInfo.applicationInfo)));
+        final List<UserAppInfo> expectedManagedUserActivities = new ArrayList<>();
+        expectedManagedUserActivities.add(new UserAppInfo(managedUser,
+                new ApplicationInfo(app1.activityInfo.applicationInfo)));
+        expectedManagedUserActivities.add(new UserAppInfo(managedUser,
+                new ApplicationInfo(app2.activityInfo.applicationInfo)));
 
-        assertThat(mProvider.findPersistentPreferredActivities(
-                new Intent[] {viewIntent, editIntent, sendIntent})).isEqualTo(expectedActivities);
+        assertThat(mProvider.findPersistentPreferredActivities(MAIN_USER_ID,
+                new Intent[] {viewIntent, editIntent, sendIntent}))
+                .isEqualTo(expectedMainUserActivities);
+        assertThat(mProvider.findPersistentPreferredActivities(MANAGED_PROFILE_ID,
+                new Intent[] {viewIntent, editIntent, sendIntent}))
+                .isEqualTo(expectedManagedUserActivities);
     }
 
     private void setUpUsersAndInstalledApps() {
@@ -208,8 +264,11 @@
     }
 
     private ResolveInfo createResolveInfo(String packageName) {
+        final ApplicationInfo applicationInfo = new ApplicationInfo();
+        applicationInfo.packageName = packageName;
         final ActivityInfo activityInfo = new ActivityInfo();
         activityInfo.packageName = packageName;
+        activityInfo.applicationInfo = applicationInfo;
         final ResolveInfo resolveInfo = new ResolveInfo();
         resolveInfo.activityInfo = activityInfo;
         return resolveInfo;
diff --git a/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
new file mode 100644
index 0000000..ad05c27
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/EnterpriseDefaultAppsTest.java
@@ -0,0 +1,43 @@
+/*
+ * 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 com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.annotation.Config;
+
+import static junit.framework.Assert.assertTrue;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class EnterpriseDefaultAppsTest {
+    @Test
+    public void testNumberOfIntentsCorrelateWithUI() throws Exception {
+        final int concatenation_templates[] =
+                new int[]{0 /* no need for single app name */,
+                        R.string.app_names_concatenation_template_2,
+                        R.string.app_names_concatenation_template_3};
+        for (EnterpriseDefaultApps app : EnterpriseDefaultApps.values()) {
+            assertTrue("Number of intents should be limited by number of apps the UI can show",
+                    app.getIntents().length <= concatenation_templates.length);
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
index 46a3359..37fa9d7 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppCounterTest.java
@@ -22,12 +22,14 @@
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.pm.UserInfo;
+import android.os.Build;
 import android.os.UserHandle;
 import android.os.UserManager;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.testutils.shadow.ShadowUserManager;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -75,16 +77,38 @@
     private final int MAIN_USER_APP_UID = MAIN_USER_ID * PER_USER_UID_RANGE;
     private final int MANAGED_PROFILE_APP_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE;
 
-    @Mock private UserManager mUserManager;
-    @Mock private Context mContext;
-    @Mock private PackageManagerWrapper mPackageManager;
+    @Mock
+    private UserManager mUserManager;
+    @Mock
+    private Context mContext;
+    @Mock
+    private PackageManagerWrapper mPackageManager;
 
     private int mInstalledAppCount = -1;
+    private ApplicationInfo mApp1;
+    private ApplicationInfo mApp2;
+    private ApplicationInfo mApp3;
+    private ApplicationInfo mApp4;
+    private ApplicationInfo mApp5;
+    private ApplicationInfo mApp6;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+
+        mApp1 = buildInfo(MAIN_USER_APP_UID, APP_1,
+                ApplicationInfo.FLAG_UPDATED_SYSTEM_APP, 0 /* targetSdkVersion */);
+        mApp2 = buildInfo(MAIN_USER_APP_UID, APP_2, 0 /* flags */,
+                0 /* targetSdkVersion */);
+        mApp3 = buildInfo(MAIN_USER_APP_UID, APP_3, ApplicationInfo.FLAG_SYSTEM,
+                0 /* targetSdkVersion */);
+        mApp4 = buildInfo(MAIN_USER_APP_UID, APP_4, ApplicationInfo.FLAG_SYSTEM,
+                0 /* targetSdkVersion */);
+        mApp5 = buildInfo(MANAGED_PROFILE_APP_UID, APP_5, 0 /* flags */,
+                0 /* targetSdkVersion */);
+        mApp6 = buildInfo(MANAGED_PROFILE_APP_UID, APP_6, ApplicationInfo.FLAG_SYSTEM,
+                0 /* targetSdkVersion */);
     }
 
     private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {
@@ -93,7 +117,7 @@
                 eq(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.MATCH_DIRECT_BOOT_AWARE
                         | PackageManager.MATCH_DIRECT_BOOT_UNAWARE),
                 eq(userId))).thenReturn(launchable ? Arrays.asList(new ResolveInfo())
-                        : new ArrayList<ResolveInfo>());
+                : new ArrayList<ResolveInfo>());
     }
 
     private void testCountInstalledAppsAcrossAllUsers(boolean async) {
@@ -101,58 +125,7 @@
         when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
                 new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
                 new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
-
-        // The first user has four apps installed:
-        // * app1 is an updated system app. It should be counted.
-        // * app2 is a user-installed app. It should be counted.
-        // * app3 is a system app that provides a launcher icon. It should be counted.
-        // * app4 is a system app that provides no launcher icon. It should not be counted.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
-                | PackageManager.MATCH_ANY_USER,
-                MAIN_USER_ID)).thenReturn(Arrays.asList(
-                        buildInfo(MAIN_USER_APP_UID, APP_1,
-                                ApplicationInfo.FLAG_UPDATED_SYSTEM_APP, 0 /* targetSdkVersion */),
-                        buildInfo(MAIN_USER_APP_UID, APP_2, 0 /* flags */,
-                                0 /* targetSdkVersion */),
-                        buildInfo(MAIN_USER_APP_UID, APP_3, ApplicationInfo.FLAG_SYSTEM,
-                                0 /* targetSdkVersion */),
-                        buildInfo(MAIN_USER_APP_UID, APP_4, ApplicationInfo.FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        // For system apps, InstalledAppCounter checks whether they handle the default launcher
-        // intent to decide whether to include them in the count of installed apps or not.
-        expectQueryIntentActivities(MAIN_USER_ID, APP_3, true /* launchable */);
-        expectQueryIntentActivities(MAIN_USER_ID, APP_4, false /* launchable */);
-
-        // app1, app3 and app4 are installed by enterprise policy.
-        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
-        when(mPackageManager.getInstallReason(APP_1, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_2, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
-        when(mPackageManager.getInstallReason(APP_3, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_4, mainUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-
-        // The second user has two apps installed:
-        // * app5 is a user-installed app. It should be counted.
-        // * app6 is a system app that provides a launcher icon. It should be counted.
-        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
-                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
-                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(
-                        buildInfo(MANAGED_PROFILE_APP_UID, APP_5, 0 /* flags */,
-                                0 /* targetSdkVersion */),
-                        buildInfo(MANAGED_PROFILE_APP_UID, APP_6, ApplicationInfo.FLAG_SYSTEM,
-                                0 /* targetSdkVersion */)));
-        expectQueryIntentActivities(MANAGED_PROFILE_ID, APP_6, true /* launchable */);
-
-        // app5 is installed by enterprise policy.
-        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
-        when(mPackageManager.getInstallReason(APP_5, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
-        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
-                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        configurePackageManager();
 
         // Count the number of all apps installed, irrespective of install reason.
         count(InstalledAppCounter.IGNORE_INSTALL_REASON, async);
@@ -173,6 +146,36 @@
     }
 
     @Test
+    public void testIncludeInCount() {
+        configurePackageManager();
+        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
+                mPackageManager, mApp1)).isTrue();
+        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
+                mPackageManager, mApp2)).isTrue();
+        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
+                mPackageManager, mApp3)).isTrue();
+        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
+                mPackageManager, mApp4)).isFalse();
+        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
+                mPackageManager, mApp5)).isTrue();
+        assertThat(InstalledAppCounter.includeInCount(InstalledAppCounter.IGNORE_INSTALL_REASON,
+                mPackageManager, mApp6)).isTrue();
+
+        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
+                mPackageManager, mApp1)).isTrue();
+        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
+                mPackageManager, mApp2)).isFalse();
+        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
+                mPackageManager, mApp3)).isTrue();
+        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
+                mPackageManager, mApp4)).isFalse();
+        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
+                mPackageManager, mApp5)).isTrue();
+        assertThat(InstalledAppCounter.includeInCount(PackageManager.INSTALL_REASON_POLICY,
+                mPackageManager, mApp6)).isFalse();
+    }
+
+    @Test
     public void testCountInstalledAppsAcrossAllUsersSync() {
         testCountInstalledAppsAcrossAllUsers(false /* async */);
     }
@@ -194,6 +197,48 @@
         }
     }
 
+    private void configurePackageManager() {
+        // The first user has four apps installed:
+        // * app1 is an updated system app. It should be counted.
+        // * app2 is a user-installed app. It should be counted.
+        // * app3 is a system app that provides a launcher icon. It should be counted.
+        // * app4 is a system app that provides no launcher icon. It should not be counted.
+        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
+                | PackageManager.MATCH_ANY_USER,
+                MAIN_USER_ID)).thenReturn(Arrays.asList(mApp1, mApp2, mApp3, mApp4));
+        // For system apps, InstalledAppCounter checks whether they handle the default launcher
+        // intent to decide whether to include them in the count of installed apps or not.
+        expectQueryIntentActivities(MAIN_USER_ID, APP_3, true /* launchable */);
+        expectQueryIntentActivities(MAIN_USER_ID, APP_4, false /* launchable */);
+
+        // app1, app3 and app4 are installed by enterprise policy.
+        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
+        when(mPackageManager.getInstallReason(APP_1, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        when(mPackageManager.getInstallReason(APP_2, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_3, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        when(mPackageManager.getInstallReason(APP_4, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+
+        // The second user has two apps installed:
+        // * app5 is a user-installed app. It should be counted.
+        // * app6 is a system app that provides a launcher icon. It should be counted.
+        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,MANAGED_PROFILE_ID))
+                .thenReturn(Arrays.asList(mApp5, mApp6));
+        expectQueryIntentActivities(MANAGED_PROFILE_ID, APP_6, true /* launchable */);
+
+        // app5 is installed by enterprise policy.
+        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
+        when(mPackageManager.getInstallReason(APP_5, managedProfileUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+    }
+
 
     private class InstalledAppCounterTestable extends InstalledAppCounter {
         public InstalledAppCounterTestable(int installReason) {
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
index 6cf4a59..17910bf 100644
--- a/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppDetailsTest.java
@@ -31,6 +31,7 @@
 import android.app.AlertDialog;
 import android.app.admin.DevicePolicyManager;
 import android.content.Context;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
@@ -378,4 +379,13 @@
         verify(mockPreferenceScreen, times(1))
                 .removePreference(mockAppDomainsPref);
     }
+
+    @Test
+    public void onActivityResult_uninstalledUpdates_shouldInvalidateOptionsMenu() {
+        doReturn(true).when(mAppDetail).refreshUi();
+
+        mAppDetail.onActivityResult(InstalledAppDetails.REQUEST_UNINSTALL, 0, mock(Intent.class));
+
+        verify(mActivity).invalidateOptionsMenu();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
new file mode 100644
index 0000000..76421c2
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/applications/InstalledAppListerTest.java
@@ -0,0 +1,233 @@
+/*
+ * 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 android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.ArgumentMatcher;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import static com.android.settings.testutils.ApplicationTestUtils.buildInfo;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.atLeast;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.when;
+
+/**
+ * Tests for {@link InstalledAppLister}.
+ */
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public final class InstalledAppListerTest {
+
+    private final String APP_1 = "app1";
+    private final String APP_2 = "app2";
+    private final String APP_3 = "app3";
+    private final String APP_4 = "app4";
+    private final String APP_5 = "app5";
+    private final String APP_6 = "app6";
+
+    private final int MAIN_USER_ID = 0;
+    private final int MANAGED_PROFILE_ID = 10;
+
+    private final int PER_USER_UID_RANGE = 100000;
+    private final int MAIN_USER_APP_UID = MAIN_USER_ID * PER_USER_UID_RANGE;
+    private final int MANAGED_PROFILE_APP_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE;
+
+    @Mock private UserManager mUserManager;
+    @Mock private PackageManagerWrapper mPackageManager;
+
+    private List<UserAppInfo> mInstalledAppList = Collections.emptyList();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+    }
+
+    private void expectQueryIntentActivities(int userId, String packageName, boolean launchable) {
+        when(mPackageManager.queryIntentActivitiesAsUser(
+                argThat(new IsLaunchIntentFor(packageName)),
+                eq(PackageManager.GET_DISABLED_COMPONENTS | PackageManager.MATCH_DIRECT_BOOT_AWARE
+                        | PackageManager.MATCH_DIRECT_BOOT_UNAWARE),
+                eq(userId))).thenReturn(launchable ? Arrays.asList(new ResolveInfo())
+                        : new ArrayList<ResolveInfo>());
+    }
+
+    @Test
+    public void testCountInstalledAppsAcrossAllUsers() {
+        // There are two users.
+        when(mUserManager.getProfiles(UserHandle.myUserId())).thenReturn(Arrays.asList(
+                new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN),
+                new UserInfo(MANAGED_PROFILE_ID, "managed profile", 0)));
+
+        // The first user has four apps installed:
+        // * app1 is an updated system app. It should be listed.
+        // * app2 is a user-installed app. It should be listed.
+        // * app3 is a system app that provides a launcher icon. It should be listed.
+        // * app4 is a system app that provides no launcher icon. It should not be listed.
+        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS
+                | PackageManager.MATCH_ANY_USER,
+                MAIN_USER_ID)).thenReturn(Arrays.asList(
+                        buildInfo(MAIN_USER_APP_UID, APP_1,
+                                ApplicationInfo.FLAG_UPDATED_SYSTEM_APP, 0 /* targetSdkVersion */),
+                        buildInfo(MAIN_USER_APP_UID, APP_2, 0 /* flags */,
+                                0 /* targetSdkVersion */),
+                        buildInfo(MAIN_USER_APP_UID, APP_3, ApplicationInfo.FLAG_SYSTEM,
+                                0 /* targetSdkVersion */),
+                        buildInfo(MAIN_USER_APP_UID, APP_4, ApplicationInfo.FLAG_SYSTEM,
+                                0 /* targetSdkVersion */)));
+        // For system apps, InstalledAppLister checks whether they handle the default launcher
+        // intent to decide whether to include them in the list of installed apps or not.
+        expectQueryIntentActivities(MAIN_USER_ID, APP_3, true /* launchable */);
+        expectQueryIntentActivities(MAIN_USER_ID, APP_4, false /* launchable */);
+
+        // app1, app3 and app4 are installed by enterprise policy.
+        final UserHandle mainUser = new UserHandle(MAIN_USER_ID);
+        when(mPackageManager.getInstallReason(APP_1, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        when(mPackageManager.getInstallReason(APP_2, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+        when(mPackageManager.getInstallReason(APP_3, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        when(mPackageManager.getInstallReason(APP_4, mainUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+
+        // The second user has two apps installed:
+        // * app5 is a user-installed app. It should be listed.
+        // * app6 is a system app that provides a launcher icon. It should be listed.
+        when(mPackageManager.getInstalledApplicationsAsUser(PackageManager.GET_DISABLED_COMPONENTS
+                | PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS,
+                MANAGED_PROFILE_ID)).thenReturn(Arrays.asList(
+                        buildInfo(MANAGED_PROFILE_APP_UID, APP_5, 0 /* flags */,
+                                0 /* targetSdkVersion */),
+                        buildInfo(MANAGED_PROFILE_APP_UID, APP_6, ApplicationInfo.FLAG_SYSTEM,
+                                0 /* targetSdkVersion */)));
+        expectQueryIntentActivities(MANAGED_PROFILE_ID, APP_6, true /* launchable */);
+
+        // app5 is installed by enterprise policy.
+        final UserHandle managedProfileUser = new UserHandle(MANAGED_PROFILE_ID);
+        when(mPackageManager.getInstallReason(APP_5, managedProfileUser))
+                .thenReturn(PackageManager.INSTALL_REASON_POLICY);
+        when(mPackageManager.getInstallReason(APP_6, managedProfileUser))
+                .thenReturn(PackageManager.INSTALL_REASON_UNKNOWN);
+
+        // List apps, considering apps installed by enterprise policy only.
+        mInstalledAppList = Collections.emptyList();
+        final InstalledAppListerTestable counter = new InstalledAppListerTestable();
+        counter.execute();
+        // Wait for the background task to finish.
+        ShadowApplication.runBackgroundTasks();
+
+        assertThat(mInstalledAppList.size()).isEqualTo(3);
+
+        assertThat(checkAppFound(mInstalledAppList, APP_1, MAIN_USER_ID)).isTrue();
+        assertThat(checkAppFound(mInstalledAppList, APP_2, MAIN_USER_ID)).isFalse();
+        assertThat(checkAppFound(mInstalledAppList, APP_3, MAIN_USER_ID)).isTrue();
+        assertThat(checkAppFound(mInstalledAppList, APP_4, MAIN_USER_ID)).isFalse();
+        assertThat(checkAppFound(mInstalledAppList, APP_5, MANAGED_PROFILE_ID)).isTrue();
+        assertThat(checkAppFound(mInstalledAppList, APP_6, MANAGED_PROFILE_ID)).isFalse();
+
+        // Verify that installed packages were retrieved for the current user and the user's
+        // managed profile.
+        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(), eq(MAIN_USER_ID));
+        verify(mPackageManager).getInstalledApplicationsAsUser(anyInt(),
+                eq(MANAGED_PROFILE_ID));
+        verify(mPackageManager, atLeast(0)).queryIntentActivitiesAsUser(anyObject(), anyInt(),
+                anyInt());
+    }
+
+    public static boolean checkAppFound(List<UserAppInfo> mInstalledAppList, String appId,
+            int userId) {
+       for (UserAppInfo info : mInstalledAppList) {
+           if (appId.equals(info.appInfo.packageName) && (info.userInfo.id == userId)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static void verifyListUniqueness(List<UserAppInfo> list) {
+        assertThat((new HashSet<>(list)).size()).isEqualTo(list.size());
+    }
+
+    private class InstalledAppListerTestable extends InstalledAppLister {
+        public InstalledAppListerTestable() {
+            super(mPackageManager, mUserManager);
+        }
+
+        @Override
+        protected void onAppListBuilt(List<UserAppInfo> list) {
+            mInstalledAppList = list;
+        }
+    }
+
+    private static class IsLaunchIntentFor extends ArgumentMatcher<Intent> {
+        private final String mPackageName;
+
+        IsLaunchIntentFor(String packageName) {
+            mPackageName = packageName;
+        }
+
+        @Override
+        public boolean matches(Object i) {
+            final Intent intent = (Intent) i;
+            if (intent == null) {
+                return false;
+            }
+            if (!Intent.ACTION_MAIN.equals(intent.getAction())) {
+                return false;
+            }
+            final Set<String> categories = intent.getCategories();
+            if (categories == null || categories.size() != 1 ||
+                    !categories.contains(Intent.CATEGORY_LAUNCHER)) {
+                return false;
+            }
+            if (!mPackageName.equals(intent.getPackage())) {
+                return false;
+            }
+            return true;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
similarity index 62%
rename from tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
rename to tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
index 025e1ae..44ca9f7 100644
--- a/tests/robotests/src/com/android/settings/display/BrightnessLevelPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/SpecialAppAccessPreferenceControllerTest.java
@@ -14,47 +14,44 @@
  * limitations under the License.
  */
 
-package com.android.settings.display;
+package com.android.settings.applications;
 
-import static android.provider.Settings.System.SCREEN_BRIGHTNESS;
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-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.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
-
-import java.text.NumberFormat;
+import com.android.settings.datausage.DataSaverBackend;
 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 BrightnessLevelPreferenceControllerTest {
-    @Mock
+public class SpecialAppAccessPreferenceControllerTest {
     private Context mContext;
     @Mock
-    private ContentResolver mContentResolver;
+    private DataSaverBackend mBackend;
     @Mock
     private Preference mPreference;
 
-    private BrightnessLevelPreferenceController mController;
+    private SpecialAppAccessPreferenceController mController;
 
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
-
-        mController = new BrightnessLevelPreferenceController(mContext);
+        mContext = RuntimeEnvironment.application;
+        mController = new SpecialAppAccessPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mDataSaverBackend", mBackend);
     }
 
     @Test
@@ -64,13 +61,18 @@
 
     @Test
     public void updateState_shouldSetSummary() {
-        final NumberFormat formatter = NumberFormat.getPercentInstance();
-        when(mContext.getContentResolver()).thenReturn(mContentResolver);
-        Settings.System.putInt(mContentResolver, SCREEN_BRIGHTNESS, 45);
+        when(mBackend.getWhitelistedCount()).thenReturn(0);
 
         mController.updateState(mPreference);
 
-        verify(mPreference).setSummary(formatter.format(45.0 / 255));
-    }
+        verify(mPreference).setSummary(mContext.getResources().getQuantityString(
+            R.plurals.special_access_summary, 0, 0));
 
+        when(mBackend.getWhitelistedCount()).thenReturn(1);
+
+        mController.updateState(mPreference);
+
+        verify(mPreference).setSummary(mContext.getResources().getQuantityString(
+            R.plurals.special_access_summary, 1, 1));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
index 78d0bda..f564755 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPickerTest.java
@@ -23,6 +23,7 @@
 import static org.mockito.Mockito.when;
 
 import android.app.Activity;
+import android.content.ComponentName;
 import android.content.Context;
 import android.os.UserManager;
 
@@ -41,12 +42,12 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.util.ReflectionHelpers;
 
-
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class DefaultAutofillPickerTest {
 
-    private static final String TEST_APP_KEY = "123";
+    private static final String TEST_APP_KEY = new ComponentName("foo.bar",
+            "foo.bar.Baz").flattenToString();
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Activity mActivity;
@@ -81,6 +82,4 @@
         when(info.loadLabel()).thenReturn("test_app_name");
         assertThat(mPicker.getConfirmationMessage(info)).isNotNull();
     }
-
-
 }
diff --git a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
index 74612e3..a7912c4 100644
--- a/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAutofillPreferenceControllerTest.java
@@ -22,10 +22,12 @@
 import android.os.UserManager;
 import android.provider.Settings;
 import android.support.v7.preference.Preference;
+import android.view.autofill.AutofillManager;
 
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.applications.AutofillManagerWrapper;
 import com.android.settings.applications.PackageManagerWrapper;
 
 import org.junit.Before;
@@ -54,6 +56,8 @@
     private UserManager mUserManager;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private PackageManagerWrapper mPackageManager;
+    @Mock
+    private AutofillManagerWrapper mAutofillManager;
 
     private DefaultAutofillPreferenceController mController;
 
@@ -64,10 +68,23 @@
 
         mController = spy(new DefaultAutofillPreferenceController(mContext));
         ReflectionHelpers.setField(mController, "mPackageManager", mPackageManager);
+        ReflectionHelpers.setField(mController, "mAutofillManager", mAutofillManager);
     }
 
     @Test
-    public void isAlwaysAvailable() {
+    public void isAvailableIfHasFeatureAndSupported() {
+        when(mContext.getSystemService(AutofillManager.class)).thenReturn(null);
+        assertThat(mController.isAvailable()).isFalse();
+
+        when(mAutofillManager.hasAutofillFeature()).thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+
+        when(mAutofillManager.hasAutofillFeature()).thenReturn(true);
+        when(mAutofillManager.isAutofillSupported()).thenReturn(false);
+        assertThat(mController.isAvailable()).isFalse();
+
+        when(mAutofillManager.hasAutofillFeature()).thenReturn(true);
+        when(mAutofillManager.isAutofillSupported()).thenReturn(true);
         assertThat(mController.isAvailable()).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
new file mode 100644
index 0000000..a58b67d
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/backup/BackupSettingsActivityPreferenceControllerTest.java
@@ -0,0 +1,122 @@
+/*
+ * 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.backup;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import android.accounts.AccountManager;
+import android.app.backup.BackupManager;
+import android.content.Context;
+import android.content.Intent;
+import android.os.RemoteException;
+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.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+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.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
+        shadows = {BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class})
+public class BackupSettingsActivityPreferenceControllerTest {
+    private static final String KEY_BACKUP_SETTINGS = "backup_settings";
+
+    private Context mContext;
+    @Mock
+    private UserManager mUserManager;
+
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private Preference mBackupPreference;
+
+    private BackupSettingsActivityPreferenceController mController;
+
+    private static boolean mBackupEnabled;
+
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        mContext = spy(RuntimeEnvironment.application.getApplicationContext());
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+
+        mController = new BackupSettingsActivityPreferenceController(mContext);
+    }
+
+    @Test
+    public void updateState_backupOn() throws RemoteException {
+        mBackupEnabled = true;
+
+        mController.updateState(mBackupPreference);
+
+        verify(mBackupPreference).setSummary(R.string.accessibility_feature_state_on);
+    }
+
+    @Test
+    public void updateState_backupOff() throws RemoteException {
+        mBackupEnabled = false;
+
+        mController.updateState(mBackupPreference);
+
+        verify(mBackupPreference).setSummary(R.string.accessibility_feature_state_off);
+    }
+
+    @Test
+    public void isAvailable_systemUser() {
+        when(mUserManager.isAdminUser()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void isAvailable_nonSystemUser() {
+        when(mUserManager.isAdminUser()).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
+    public void getPreferenceKey() {
+        assertThat(mController.getPreferenceKey()).isEqualTo(KEY_BACKUP_SETTINGS);
+    }
+
+    @Implements(BackupManager.class)
+    public static class ShadowBackupManager {
+
+        @Implementation
+        public boolean isBackupEnabled() {
+            return mBackupEnabled;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
index 90f2106..73f6b84 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDialogTest.java
@@ -54,9 +54,13 @@
     @Mock
     private BluetoothPairingController controller;
 
+    @Mock
+    private BluetoothPairingDialog dialogActivity;
+
     @Before
     public void setUp() {
         MockitoAnnotations.initMocks(this);
+        doNothing().when(dialogActivity).dismiss();
     }
 
     @Test
@@ -214,6 +218,17 @@
         fail("Setting the controller multiple times should throw an exception.");
     }
 
+    @Test(expected = IllegalStateException.class)
+    public void dialogDoesNotAllowSwappingActivity() {
+        // instantiate a fragment
+        BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
+        frag.setPairingDialogActivity(dialogActivity);
+
+        // this should throw an error
+        frag.setPairingDialogActivity(dialogActivity);
+        fail("Setting the dialog activity multiple times should throw an exception.");
+    }
+
     @Test
     public void dialogPositiveButtonDisabledWhenUserInputInvalid() {
         // set the correct dialog type
@@ -342,11 +357,52 @@
                 .contains(device);
     }
 
+    @Test
+    public void pairingDialogDismissedOnPositiveClick() {
+        // set the dialog variant to confirmation/consent
+        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
+
+        // we don't care what this does, just that it is called
+        doNothing().when(controller).onDialogPositiveClick(any());
+
+        // build the fragment
+        BluetoothPairingDialogFragment frag = makeFragment();
+
+        // click the button and verify that the controller hook was called
+        frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_POSITIVE);
+
+        verify(controller, times(1)).onDialogPositiveClick(any());
+        verify(dialogActivity, times(1)).dismiss();
+    }
+
+    @Test
+    public void pairingDialogDismissedOnNegativeClick() {
+        // set the dialog variant to confirmation/consent
+        when(controller.getDialogType()).thenReturn(BluetoothPairingController.CONFIRMATION_DIALOG);
+
+        // we don't care what this does, just that it is called
+        doNothing().when(controller).onDialogNegativeClick(any());
+
+        // build the fragment
+        BluetoothPairingDialogFragment frag = makeFragment();
+
+        // click the button and verify that the controller hook was called
+        frag.onClick(frag.getmDialog(), AlertDialog.BUTTON_NEGATIVE);
+
+        verify(controller, times(1)).onDialogNegativeClick(any());
+        verify(dialogActivity, times(1)).dismiss();
+    }
+
     private BluetoothPairingDialogFragment makeFragment() {
         BluetoothPairingDialogFragment frag = new BluetoothPairingDialogFragment();
+        assertThat(frag.isPairingControllerSet()).isFalse();
         frag.setPairingController(controller);
+        assertThat(frag.isPairingDialogActivitySet()).isFalse();
+        frag.setPairingDialogActivity(dialogActivity);
         FragmentTestUtil.startFragment(frag);
         assertThat(frag.getmDialog()).isNotNull();
+        assertThat(frag.isPairingControllerSet()).isTrue();
+        assertThat(frag.isPairingDialogActivitySet()).isTrue();
         return frag;
     }
 }
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
index a4b5c97..e792845 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentTest.java
@@ -23,6 +23,7 @@
 import com.android.settings.nfc.NfcPreferenceController;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.testutils.XmlTestUtils;
 import com.android.settingslib.drawer.CategoryKey;
 
 import org.junit.Before;
@@ -30,13 +31,12 @@
 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.mock;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -92,20 +92,15 @@
     }
 
     @Test
-    public void testSearchIndexProvider_NoBluetooth_KeyAdded() {
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)).thenReturn(false);
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
+    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);
+        final int xmlId = (new ConnectedDeviceDashboardFragment()).getPreferenceScreenResId();
 
-        assertThat(keys).isNotNull();
-        assertThat(keys).contains(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
-    }
+        final List<String> keys = XmlTestUtils.getKeysFromPreferenceXml(context, xmlId);
 
-    @Test
-    public void testSearchIndexProvider_Bluetooth_KeyNotAdded() {
-        when(mManager.hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)).thenReturn(true);
-        final List<String> keys = mFragment.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mContext);
-
-        assertThat(keys).isNotNull();
-        assertThat(keys).doesNotContain(BluetoothMasterSwitchPreferenceController.KEY_TOGGLE_BLUETOOTH);
+        assertThat(keys).containsAllIn(niks);
     }
 }
diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
index 28bed3e..e7587d5 100644
--- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
@@ -50,6 +50,7 @@
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowActivity;
 import org.robolectric.shadows.ShadowApplication;
+import org.robolectric.util.ReflectionHelpers;
 
 import java.util.ArrayList;
 
@@ -294,8 +295,34 @@
     }
 
     @Test
+    public void clickPreference_withUnresolvableIntent_shouldNotLaunchAnything() {
+        ReflectionHelpers.setField(
+                mImpl, "mPackageManager", RuntimeEnvironment.getPackageManager());
+        Activity activity = Robolectric.buildActivity(Activity.class).get();
+        final ShadowApplication application = ShadowApplication.getInstance();
+        final Preference preference = new Preference(application.getApplicationContext());
+        final Tile tile = new Tile();
+        tile.key = "key";
+        tile.intent = new Intent();
+        tile.intent.setComponent(new ComponentName("pkg", "class"));
+        tile.metaData = new Bundle();
+        tile.metaData.putString("com.android.settings.intent.action", "TestAction");
+        tile.userHandle = null;
+
+        mImpl.bindPreferenceToTile(activity, MetricsProto.MetricsEvent.SETTINGS_GESTURES,
+                preference, tile, "123", Preference.DEFAULT_ORDER);
+        preference.performClick();
+
+        final ShadowActivity.IntentForResult launchIntent =
+                shadowOf(activity).getNextStartedActivityForResult();
+
+        assertThat(launchIntent).isNull();
+    }
+
+    @Test
     public void getPreferences_noCategory_shouldReturnNull() {
-        mImpl = new DashboardFeatureProviderImpl(mActivity, mCategoryManager);
+        mImpl = new DashboardFeatureProviderImpl(mActivity);
+        ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
         when(mCategoryManager.getTilesByCategory(mActivity, CategoryKey.CATEGORY_HOMEPAGE))
                 .thenReturn(null);
 
@@ -306,7 +333,8 @@
 
     @Test
     public void getPreferences_noTileForCategory_shouldReturnNull() {
-        mImpl = new DashboardFeatureProviderImpl(mActivity, mCategoryManager);
+        mImpl = new DashboardFeatureProviderImpl(mActivity);
+        ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
         when(mCategoryManager.getTilesByCategory(mActivity, CategoryKey.CATEGORY_HOMEPAGE))
                 .thenReturn(new DashboardCategory());
 
@@ -317,7 +345,8 @@
 
     @Test
     public void getPreferences_hasTileForCategory_shouldReturnPrefList() {
-        mImpl = new DashboardFeatureProviderImpl(mActivity, mCategoryManager);
+        mImpl = new DashboardFeatureProviderImpl(mActivity);
+        ReflectionHelpers.setField(mImpl, "mCategoryManager", mCategoryManager);
         final DashboardCategory category = new DashboardCategory();
         category.tiles.add(new Tile());
         when(mCategoryManager
diff --git a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
index bae6f8f..a3b9bf8 100644
--- a/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
+++ b/tests/robotests/src/com/android/settings/dashboard/ProgressiveDisclosureTest.java
@@ -25,7 +25,6 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -58,8 +57,6 @@
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
-    @Mock
-    private FakeFeatureFactory mFakeFeatureFactory;
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private PreferenceFragment mPreferenceFragment;
     @Mock
@@ -75,7 +72,6 @@
         FakeFeatureFactory.setupForTest(mContext);
         mScreen = mPreferenceFragment.getPreferenceScreen();
         mAppContext = ShadowApplication.getInstance().getApplicationContext();
-        mFakeFeatureFactory = (FakeFeatureFactory) FeatureFactory.getFactory(mContext);
         mMixin = new ProgressiveDisclosureMixin(mAppContext,
                 mPreferenceFragment, false /* keepExpanded */);
         ReflectionHelpers.setField(mMixin, "mExpandButton", mExpandButton);
@@ -93,6 +89,15 @@
     }
 
     @Test
+    public void shouldNotCollapse_preferenceCountSameAsThreshold() {
+        when(mScreen.getPreferenceCount()).thenReturn(5);
+
+        mMixin.setTileLimit(5);
+
+        assertThat(mMixin.shouldCollapse(mScreen)).isFalse();
+    }
+
+    @Test
     public void shouldNotCollapse_whenStartAsExpanded() {
         when(mScreen.getPreferenceCount()).thenReturn(5);
 
@@ -306,6 +311,25 @@
     }
 
     @Test
+    public void updateExpandSummary_doNotIncludeEmptyPrefTitle() {
+        final Preference pref1 = new Preference(mAppContext);
+        pref1.setTitle("1");
+        final Preference pref2 = new Preference(mAppContext);
+        pref2.setTitle(null);
+        final Preference pref3 = new Preference(mAppContext);
+        pref3.setTitle("3");
+        final Preference pref4 = new Preference(mAppContext);
+        pref4.setTitle("");
+
+        mMixin.addToCollapsedList(pref1);
+        mMixin.addToCollapsedList(pref2);
+        mMixin.addToCollapsedList(pref3);
+        mMixin.addToCollapsedList(pref4);
+
+        verify(mExpandButton).setSummary("1, 3");
+    }
+
+    @Test
     public void updateExapndSummary_singlePref_expandSummarySameAsPrefTitle() {
         final String TEST = "test";
         final Preference pref = new Preference(mAppContext);
diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
index 71d9ea1..e1572ab 100644
--- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
+++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryTest.java
@@ -25,6 +25,8 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+import com.android.settings.testutils.XmlTestUtils;
 import com.android.settingslib.NetworkPolicyEditor;
 
 import org.junit.Before;
@@ -32,11 +34,13 @@
 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.ArrayList;
+import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.mockito.Matchers.any;
@@ -143,4 +147,17 @@
         policy.metered = false;
         assertThat(dataUsageSummary.isMetered(config)).isFalse();
     }
+
+    @Test
+    public void testNonIndexableKeys_existInXmlLayout() {
+        final Context context = RuntimeEnvironment.application;
+        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));
+
+        assertThat(keys).containsAllIn(niks);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
new file mode 100644
index 0000000..d9c17bc
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/development/VerifyAppsOverUsbPreferenceControllerTest.java
@@ -0,0 +1,179 @@
+/*
+ * 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 org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.anyString;
+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.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.UserManager;
+import android.provider.Settings.Global;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+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;
+import org.robolectric.util.ReflectionHelpers;
+
+import java.util.Collections;
+import java.util.List;
+
+@RunWith(SettingsRobolectricTestRunner.class)
+@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
+public class VerifyAppsOverUsbPreferenceControllerTest {
+
+    @Mock
+    private PackageManager mPackageManager;
+    @Mock
+    private PreferenceScreen mScreen;
+    @Mock
+    private RestrictedSwitchPreference mPreference;
+
+    @Mock
+    private VerifyAppsOverUsbPreferenceController.RestrictedLockUtilsDelegate
+            mRestrictedLockUtilsDelegate;
+
+    private Context mContext;
+    private VerifyAppsOverUsbPreferenceController mController;
+
+    /** Convenience class for setting global int settings. */
+    class GlobalSetter {
+        public GlobalSetter set(String setting, int value) {
+            Global.putInt(mContext.getContentResolver(), setting, value);
+            return this;
+        }
+    }
+    private final GlobalSetter mGlobals = new GlobalSetter();
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        final ShadowApplication shadowContext = ShadowApplication.getInstance();
+        mContext = spy(shadowContext.getApplicationContext());
+        when(mScreen.findPreference(anyString())).thenReturn(mPreference);
+        when(mContext.getPackageManager()).thenReturn(mPackageManager);
+        mController = new VerifyAppsOverUsbPreferenceController(mContext);
+        ReflectionHelpers.setField(
+                mController, "mRestrictedLockUtils", mRestrictedLockUtilsDelegate);
+    }
+
+    private void setupVerifyBroadcastReceivers(boolean nonEmpty) {
+        final List<ResolveInfo> resolveInfos = nonEmpty
+                ? Collections.singletonList(mock(ResolveInfo.class))
+                : Collections.<ResolveInfo>emptyList();
+        when(mPackageManager.queryBroadcastReceivers((Intent) any(), anyInt()))
+                .thenReturn(resolveInfos);
+    }
+
+    private void setupEnforcedAdmin(EnforcedAdmin result) {
+        when(mRestrictedLockUtilsDelegate.checkIfRestrictionEnforced(
+                (Context) any(), anyString(), anyInt())).thenReturn(result);
+    }
+
+    @Test
+    public void updateState_preferenceCheckedWhenSettingIsOn() {
+        setupVerifyBroadcastReceivers(true);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 1).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
+        mController.displayPreference(mScreen);
+        mController.updatePreference();
+        verify(mPreference).setChecked(true);
+    }
+
+    @Test
+    public void updateState_preferenceUncheckedWhenSettingIsOff() {
+        setupVerifyBroadcastReceivers(true);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 1).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 0);
+        mController.displayPreference(mScreen);
+        mController.updatePreference();
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_preferenceUncheckedWhenNoAdb() {
+        setupVerifyBroadcastReceivers(true);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 0).set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
+        mController.displayPreference(mScreen);
+        mController.updatePreference();
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_preferenceUncheckedWhenVerifierIsOff() {
+        setupVerifyBroadcastReceivers(true);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 1)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1)
+                .set(Global.PACKAGE_VERIFIER_ENABLE, 0);
+        mController.displayPreference(mScreen);
+        mController.updatePreference();
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_preferenceUncheckedWhenNoVerifyBroadcastReceivers() {
+        setupVerifyBroadcastReceivers(false);
+        setupEnforcedAdmin(null);
+        mGlobals.set(Global.ADB_ENABLED, 1)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
+        mController.displayPreference(mScreen);
+        mController.updatePreference();
+        verify(mPreference).setChecked(false);
+    }
+
+    @Test
+    public void updateState_preferenceDisabledWhenRestrictedByAdmin() {
+        setupVerifyBroadcastReceivers(true);
+        final EnforcedAdmin admin = new EnforcedAdmin();
+        setupEnforcedAdmin(admin);
+        mGlobals.set(Global.ADB_ENABLED, 1)
+                .set(Global.PACKAGE_VERIFIER_INCLUDE_ADB, 1);
+        mController.displayPreference(mScreen);
+        mController.updatePreference();
+        verify(mPreference).setDisabledByAdmin(admin);
+    }
+
+    @Test
+    public void updateState_preferenceRemovedWhenVerifierSettingsVisibleIsOff() {
+        setupVerifyBroadcastReceivers(true);
+        mGlobals.set(Global.PACKAGE_VERIFIER_SETTING_VISIBLE, 0);
+        when(mPreference.getKey()).thenReturn(mController.getPreferenceKey());
+        when(mScreen.getPreferenceCount()).thenReturn(1);
+        when(mScreen.getPreference(anyInt())).thenReturn(mPreference);
+        mController.displayPreference(mScreen);
+        verify(mScreen).removePreference(mPreference);
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
index 969719f..6cb8f58 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/StorageItemPreferenceTest.java
@@ -15,7 +15,7 @@
  */
 package com.android.settings.deviceinfo;
 
-import static com.android.settings.TestUtils.KILOBYTE;
+import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
 
 import static com.google.common.truth.Truth.assertThat;
 
@@ -54,8 +54,8 @@
 
     @Test
     public void testAfterLoad() {
-        mPreference.setStorageSize(KILOBYTE, KILOBYTE * 10);
-        assertThat(((String) mPreference.getSummary())).isEqualTo("1.00KB");
+        mPreference.setStorageSize(MEGABYTE_IN_BYTES * 10, MEGABYTE_IN_BYTES * 100);
+        assertThat(((String) mPreference.getSummary())).isEqualTo("0.01GB");
     }
 
     @Test
@@ -66,7 +66,7 @@
                 (ProgressBar) holder.itemView.findViewById(android.R.id.progress);
 
         mPreference.onBindViewHolder(holder);
-        mPreference.setStorageSize(KILOBYTE, KILOBYTE * 10);
+        mPreference.setStorageSize(MEGABYTE_IN_BYTES, MEGABYTE_IN_BYTES * 10);
 
         assertThat(progressBar.getProgress()).isEqualTo(10);
     }
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 963e35f..32def69 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/SecondaryUserControllerTest.java
@@ -17,6 +17,7 @@
 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 org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.verify;
@@ -96,13 +97,13 @@
     public void controllerUpdatesSummaryOfNewPreference() throws Exception {
         mPrimaryUser.name = TEST_NAME;
         mController.displayPreference(mScreen);
-        mController.setSize(10L);
+        mController.setSize(MEGABYTE_IN_BYTES * 10);
         final ArgumentCaptor<Preference> argumentCaptor = ArgumentCaptor.forClass(Preference.class);
 
         verify(mGroup).addPreference(argumentCaptor.capture());
 
         Preference preference = argumentCaptor.getValue();
-        assertThat(preference.getSummary()).isEqualTo("10.00B");
+        assertThat(preference.getSummary()).isEqualTo("0.01GB");
     }
 
     @Test
@@ -162,7 +163,12 @@
         StorageAsyncLoader.AppsStorageResult userResult =
                 new StorageAsyncLoader.AppsStorageResult();
         SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
-        userResult.externalStats = new StorageStatsSource.ExternalStorageStats(99, 33, 33, 33);
+        userResult.externalStats =
+                new StorageStatsSource.ExternalStorageStats(
+                        MEGABYTE_IN_BYTES * 30,
+                        MEGABYTE_IN_BYTES * 10,
+                        MEGABYTE_IN_BYTES * 10,
+                        MEGABYTE_IN_BYTES * 10);
         result.put(10, userResult);
 
         mController.handleResult(result);
@@ -170,7 +176,7 @@
         verify(mGroup).addPreference(argumentCaptor.capture());
         Preference preference = argumentCaptor.getValue();
 
-        assertThat(preference.getSummary()).isEqualTo("99.00B");
+        assertThat(preference.getSummary()).isEqualTo("0.03GB");
     }
 
     @Test
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 efe44ef..bc42d1f 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/StorageItemPreferenceControllerTest.java
@@ -15,9 +15,9 @@
  */
 package com.android.settings.deviceinfo.storage;
 
-import static com.android.settings.TestUtils.KILOBYTE;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.anyString;
@@ -28,6 +28,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+
 import android.app.Fragment;
 import android.content.Context;
 import android.content.Intent;
@@ -50,9 +51,11 @@
 import com.android.settings.deviceinfo.PrivateVolumeSettings;
 import com.android.settings.deviceinfo.StorageItemPreference;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.SettingsShadowResources;
 import com.android.settingslib.applications.StorageStatsSource;
 import com.android.settingslib.deviceinfo.StorageVolumeProvider;
 
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -80,6 +83,8 @@
     @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);
@@ -96,6 +101,11 @@
                 mPreference.getLayoutResource(), new LinearLayout(mContext), false);
     }
 
+    @After
+    public void tearDown() {
+        SettingsShadowResources.reset();
+    }
+
     @Test
     public void testUpdateStateWithInitialState() {
         assertThat(mPreference.getSummary().toString()).isEqualTo(
@@ -137,6 +147,14 @@
     }
 
     @Test
+    public void handlePreferenceTreeClick_tappingAudioWhileUninitializedDoesntCrash() {
+        mController.setVolume(null);
+
+        mPreference.setKey("pref_music_audio");
+        mController.handlePreferenceTreeClick(mPreference);
+    }
+
+    @Test
     public void testClickApps() {
         mPreference.setKey("pref_other_apps");
         mController.handlePreferenceTreeClick(mPreference);
@@ -155,6 +173,14 @@
     }
 
     @Test
+    public void handlePreferenceTreeClick_tappingAppsWhileUninitializedDoesntCrash() {
+        mController.setVolume(null);
+
+        mPreference.setKey("pref_other_apps");
+        mController.handlePreferenceTreeClick(mPreference);
+    }
+
+    @Test
     public void testClickFiles() {
         when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
         mPreference.setKey("pref_files");
@@ -243,28 +269,29 @@
                 eq(StorageItemPreferenceController.FILES_KEY))).thenReturn(files);
         mController.displayPreference(screen);
 
-        mController.setUsedSize(KILOBYTE * 200); // There should 87kB attributed.
+        mController.setUsedSize(MEGABYTE_IN_BYTES * 970); // There should 870MB attributed.
         StorageAsyncLoader.AppsStorageResult result = new StorageAsyncLoader.AppsStorageResult();
-        result.gamesSize = KILOBYTE * 8;
-        result.videoAppsSize = KILOBYTE * 16;
-        result.musicAppsSize = KILOBYTE * 4;
-        result.otherAppsSize = KILOBYTE * 9;
-        result.systemSize = KILOBYTE * 10; // This value is ignored and overriden now.
-        result.externalStats = new StorageStatsSource.ExternalStorageStats(
-                KILOBYTE * 50, // total
-                KILOBYTE * 10, // audio
-                KILOBYTE * 15, // video
-                KILOBYTE * 20); // image
+        result.gamesSize = MEGABYTE_IN_BYTES * 80;
+        result.videoAppsSize = MEGABYTE_IN_BYTES * 160;
+        result.musicAppsSize = MEGABYTE_IN_BYTES * 40;
+        result.otherAppsSize = MEGABYTE_IN_BYTES * 90;
+        result.systemSize = MEGABYTE_IN_BYTES * 100; // This value is ignored and overridden now.
+        result.externalStats =
+                new StorageStatsSource.ExternalStorageStats(
+                        MEGABYTE_IN_BYTES * 500, // total
+                        MEGABYTE_IN_BYTES * 100, // audio
+                        MEGABYTE_IN_BYTES * 150, // video
+                        MEGABYTE_IN_BYTES * 200); // image
 
         mController.onLoadFinished(result);
 
-        assertThat(audio.getSummary().toString()).isEqualTo("14.00KB"); // 4KB apps + 10KB files
-        assertThat(image.getSummary().toString()).isEqualTo("35.00KB"); // 15KB video + 20KB images
-        assertThat(games.getSummary().toString()).isEqualTo("8.00KB");
-        assertThat(movies.getSummary().toString()).isEqualTo("16.00KB");
-        assertThat(apps.getSummary().toString()).isEqualTo("9.00KB");
-        assertThat(system.getSummary().toString()).isEqualTo("113KB");
-        assertThat(files.getSummary().toString()).isEqualTo("5.00KB");
+        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(system.getSummary().toString()).isEqualTo("0.10GB");
+        assertThat(files.getSummary().toString()).isEqualTo("0.05GB");
     }
 
     @Test
@@ -391,4 +418,69 @@
 
         verify(screen).removePreference(files);
     }
+
+    @Test
+    public void displayPreference_updateFilePreferenceToHideAfterSettingVolume() {
+        StorageItemPreference audio = new StorageItemPreference(mContext);
+        StorageItemPreference image = new StorageItemPreference(mContext);
+        StorageItemPreference games = new StorageItemPreference(mContext);
+        StorageItemPreference apps = new StorageItemPreference(mContext);
+        StorageItemPreference system = new StorageItemPreference(mContext);
+        StorageItemPreference files = new StorageItemPreference(mContext);
+        PreferenceScreen screen = mock(PreferenceScreen.class);
+        when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
+                .thenReturn(audio);
+        when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
+                .thenReturn(image);
+        when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
+        when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+                .thenReturn(apps);
+        when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+                .thenReturn(system);
+        when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
+                .thenReturn(files);
+
+        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mVolume.isMountedReadable()).thenReturn(true);
+
+        mController.displayPreference(screen);
+        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(null);
+        mController.setVolume(mVolume);
+
+        verify(screen).removePreference(files);
+    }
+
+
+    @Test
+    public void displayPreference_updateFilePreferenceToShowAfterSettingVolume() {
+        StorageItemPreference audio = new StorageItemPreference(mContext);
+        StorageItemPreference image = new StorageItemPreference(mContext);
+        StorageItemPreference games = new StorageItemPreference(mContext);
+        StorageItemPreference apps = new StorageItemPreference(mContext);
+        StorageItemPreference system = new StorageItemPreference(mContext);
+        StorageItemPreference files = new StorageItemPreference(mContext);
+        PreferenceScreen screen = mock(PreferenceScreen.class);
+        when(screen.findPreference(eq(StorageItemPreferenceController.AUDIO_KEY)))
+                .thenReturn(audio);
+        when(screen.findPreference(eq(StorageItemPreferenceController.PHOTO_KEY)))
+                .thenReturn(image);
+        when(screen.findPreference(eq(StorageItemPreferenceController.GAME_KEY))).thenReturn(games);
+        when(screen.findPreference(eq(StorageItemPreferenceController.OTHER_APPS_KEY)))
+                .thenReturn(apps);
+        when(screen.findPreference(eq(StorageItemPreferenceController.SYSTEM_KEY)))
+                .thenReturn(system);
+        when(screen.findPreference(eq(StorageItemPreferenceController.FILES_KEY)))
+                .thenReturn(files);
+
+        // This will hide it initially.
+        mController.displayPreference(screen);
+
+        when(mSvp.findEmulatedForPrivate(any(VolumeInfo.class))).thenReturn(mVolume);
+        when(mVolume.isMountedReadable()).thenReturn(true);
+
+        // And we bring it back.
+        mController.setVolume(mVolume);
+
+        verify(screen).addPreference(files);
+    }
 }
\ No newline at end of file
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 0c3fc47..8b7110d 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/UserProfileControllerTest.java
@@ -17,6 +17,7 @@
 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 org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
@@ -108,7 +109,12 @@
         SparseArray<StorageAsyncLoader.AppsStorageResult> result = new SparseArray<>();
         StorageAsyncLoader.AppsStorageResult userResult =
                 new StorageAsyncLoader.AppsStorageResult();
-        userResult.externalStats = new StorageStatsSource.ExternalStorageStats(99, 33, 33, 33);
+        userResult.externalStats =
+                new StorageStatsSource.ExternalStorageStats(
+                        99 * MEGABYTE_IN_BYTES,
+                        33 * MEGABYTE_IN_BYTES,
+                        33 * MEGABYTE_IN_BYTES,
+                        33 * MEGABYTE_IN_BYTES);
         result.put(10, userResult);
 
         mController.handleResult(result);
@@ -116,7 +122,7 @@
         verify(mScreen).addPreference(argumentCaptor.capture());
         Preference preference = argumentCaptor.getValue();
 
-        assertThat(preference.getSummary()).isEqualTo("99.00B");
+        assertThat(preference.getSummary()).isEqualTo("0.10GB");
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
new file mode 100644
index 0000000..3f9ccaf
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/deviceinfo/storage/VolumeSizesLoaderTest.java
@@ -0,0 +1,30 @@
+package com.android.settings.deviceinfo.storage;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import android.os.storage.VolumeInfo;
+
+import com.android.settingslib.deviceinfo.PrivateStorageInfo;
+import com.android.settingslib.deviceinfo.StorageVolumeProvider;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+
+public class VolumeSizesLoaderTest {
+    @Test
+    public void getVolumeSize_getsValidSizes() throws Exception {
+        VolumeInfo info = mock(VolumeInfo.class);
+        StorageVolumeProvider storageVolumeProvider = mock(StorageVolumeProvider.class);
+        when(storageVolumeProvider.getTotalBytes(any(), any())).thenReturn(10000L);
+        when(storageVolumeProvider.getFreeBytes(any(), any())).thenReturn(1000L);
+
+        PrivateStorageInfo storageInfo =
+                VolumeSizesLoader.getVolumeSize(storageVolumeProvider, null, info);
+
+        assertThat(storageInfo.freeBytes).isEqualTo(1000L);
+        assertThat(storageInfo.totalBytes).isEqualTo(10000L);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
index f001bd1..96ce081 100644
--- a/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
+++ b/tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerTestBase.java
@@ -17,8 +17,6 @@
 package com.android.settings.enterprise;
 
 import android.content.Context;
-import android.content.Intent;
-import android.content.res.Resources;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
@@ -28,24 +26,21 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Answers;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.anyObject;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.eq;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 /**
  * Common base for testing subclasses of {@link AdminGrantedPermissionsPreferenceControllerBase}.
  */
 public abstract class AdminGrantedPermissionsPreferenceControllerTestBase {
-
     protected final String mKey;
     protected final String[] mPermissions;
     protected final String mPermissionGroup;
@@ -123,19 +118,8 @@
 
     @Test
     public void testHandlePreferenceTreeClick() {
-        final Preference preference = new Preference(mContext, null, 0, 0);
-        preference.setKey(mKey);
-
-        assertThat(mController.handlePreferenceTreeClick(preference)).isTrue();
-
-        final ArgumentCaptor<Intent> argumentCaptor = ArgumentCaptor.forClass(Intent.class);
-        verify(mContext).startActivity(argumentCaptor.capture());
-
-        final Intent intent = argumentCaptor.getValue();
-
-        assertThat(intent.getAction()).isEqualTo(Intent.ACTION_MANAGE_PERMISSION_APPS);
-        assertThat(intent.getStringExtra(Intent.EXTRA_PERMISSION_NAME)).
-                isEqualTo(mPermissionGroup);
+        assertThat(mController.handlePreferenceTreeClick(new Preference(mContext, null, 0, 0)))
+                .isFalse();
     }
 
     @Test
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java
new file mode 100644
index 0000000..1936f80
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.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.enterprise;
+
+import android.content.Context;
+import android.content.pm.UserInfo;
+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.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.UserAppInfo;
+import com.android.settings.core.PreferenceController;
+
+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;
+
+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 {
+    private static final int USER_ID = 0;
+    private static final int USER_APP_UID = 0;
+
+    private static final String APP = "APP";
+
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceManager mPreferenceManager;
+
+    private ApplicationListFragment mFragment;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ShadowApplication.getInstance().getApplicationContext();
+        when(mPreferenceManager.getContext()).thenReturn(mContext);
+
+        mFragment = new ApplicationListFragmentTestable(mPreferenceManager, mScreen);
+    }
+
+    @Test
+    public void getLogTag() {
+        assertThat(mFragment.getLogTag())
+                .isEqualTo("EnterprisePrivacySettings");
+    }
+
+    @Test
+    public void getScreenResource() {
+        assertThat(mFragment.getPreferenceScreenResId())
+                .isEqualTo(R.xml.app_list_disclosure_settings);
+    }
+
+    @Test
+    public void getPreferenceControllers() {
+        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        assertThat(controllers).isNotNull();
+        assertThat(controllers.size()).isEqualTo(1);
+        int position = 0;
+        assertThat(controllers.get(position++)).isInstanceOf(
+                ApplicationListPreferenceController.class);
+    }
+
+    @Test public void getCategories() {
+        assertThat(new ApplicationListFragment.AdminGrantedPermissionCamera().getMetricsCategory())
+                .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS);
+        assertThat(new ApplicationListFragment.AdminGrantedPermissionLocation().
+                getMetricsCategory()).isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS);
+        assertThat(new ApplicationListFragment.AdminGrantedPermissionMicrophone().
+                getMetricsCategory()).isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_PERMISSIONS);
+        assertThat(new ApplicationListFragment.EnterpriseInstalledPackages().getMetricsCategory())
+                .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_INSTALLED_APPS);
+    }
+
+    private static class ApplicationListFragmentTestable extends ApplicationListFragment {
+
+        private final PreferenceManager mPreferenceManager;
+        private final PreferenceScreen mPreferenceScreen;
+
+        public ApplicationListFragmentTestable(PreferenceManager preferenceManager,
+                PreferenceScreen screen) {
+            this.mPreferenceManager = preferenceManager;
+            this.mPreferenceScreen = screen;
+        }
+
+        @Override
+        public void buildApplicationList(Context context,
+                ApplicationFeatureProvider.ListOfAppsCallback callback) {
+            final List<UserAppInfo> apps = new ArrayList<>();
+            final UserInfo user = new UserInfo(USER_ID, "main", UserInfo.FLAG_ADMIN);
+            apps.add(new UserAppInfo(user, buildInfo(USER_APP_UID, APP, 0, 0)));
+            callback.onListOfAppsResult(apps);
+        }
+
+        @Override
+        public PreferenceManager getPreferenceManager() {
+            return mPreferenceManager;
+        }
+
+        @Override
+        public PreferenceScreen getPreferenceScreen() {
+            return mPreferenceScreen;
+        }
+
+        @Override
+        public int getMetricsCategory() {
+            return MetricsEvent.VIEW_UNKNOWN;
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.java
new file mode 100644
index 0000000..56a6c62
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListPreferenceControllerTest.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.enterprise;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.UserAppInfo;
+
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+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.Matchers.any;
+import static org.mockito.Matchers.anyInt;
+import static org.mockito.Matchers.eq;
+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 ApplicationListPreferenceControllerTest {
+
+    private static final int MAIN_USER_ID = 0;
+
+    private static final int MANAGED_PROFILE_ID = 10;
+    private static final int PER_USER_UID_RANGE = 100000;
+    private static final int MAIN_USER_APP_UID = MAIN_USER_ID * PER_USER_UID_RANGE;
+    private static final int MANAGED_PROFILE_APP_UID = MANAGED_PROFILE_ID * PER_USER_UID_RANGE;
+
+    private static final String APP_1 = "APP_1";
+    private static final String APP_2 = "APP_2";
+    private static final String APP_3 = "APP_3";
+
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PackageManager mPackageManager;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private SettingsPreferenceFragment mFragment;
+
+    private Context mContext;
+    private ApplicationListPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        final ShadowApplication shadowContext = ShadowApplication.getInstance();
+        mContext = shadowContext.getApplicationContext();
+        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
+        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);
+        when(mPackageManager.getText(eq(APP_1), anyInt(), any())).thenReturn(APP_1);
+        when(mPackageManager.getText(eq(APP_2), anyInt(), any())).thenReturn(APP_2);
+        when(mPackageManager.getText(eq(APP_3), anyInt(), any())).thenReturn(APP_3);
+
+        mController = new ApplicationListPreferenceController(mContext, new ThreeAppsBuilder(),
+                mPackageManager, mFragment);
+    }
+
+    @Test
+    public void checkNumberAndTitlesOfApps() {
+        ArgumentCaptor<Preference> apps = ArgumentCaptor.forClass(Preference.class);
+        verify(mScreen, times(3)).addPreference(apps.capture());
+        final Set<String> expectedPackages = new HashSet<>(Arrays.asList(APP_1, APP_2, APP_3));
+        final Set<String> packages = new HashSet<>();
+
+        for (Preference p : apps.getAllValues()) {
+            packages.add(p.getTitle().toString());
+        }
+        assertThat(packages).isEqualTo(expectedPackages);
+    }
+
+    @Test
+    public void isAvailable() {
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void getPreferenceKey() {
+        assertThat(mController.getPreferenceKey()).isNull();
+    }
+
+    private static class ThreeAppsBuilder
+            implements ApplicationListPreferenceController.ApplicationListBuilder {
+        @Override
+        public void buildApplicationList(Context context,
+                                         ApplicationFeatureProvider.ListOfAppsCallback callback) {
+            final List<UserAppInfo> apps = new ArrayList<>();
+            final UserInfo user = new UserInfo(MAIN_USER_ID, "main", UserInfo.FLAG_ADMIN);
+            apps.add(new UserAppInfo(user, buildInfo(MAIN_USER_APP_UID, APP_1, 0, 0)));
+            apps.add(new UserAppInfo(user, buildInfo(MAIN_USER_APP_UID, APP_2, 0, 0)));
+            apps.add(new UserAppInfo(user, buildInfo(MANAGED_PROFILE_APP_UID, APP_3, 0, 0)));
+            callback.onListOfAppsResult(apps);
+        }
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
new file mode 100644
index 0000000..e5c877f
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java
@@ -0,0 +1,111 @@
+/*
+ * 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.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.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.core.PreferenceController;
+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;
+
+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 {
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceManager mPreferenceManager;
+
+    private EnterpriseSetDefaultAppsListFragment mFragment;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = ShadowApplication.getInstance().getApplicationContext();
+        when(mPreferenceManager.getContext()).thenReturn(mContext);
+        when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager);
+        mFragment = new EnterpriseSetDefaultAppsListFragmentTestable(mPreferenceManager, mScreen);
+    }
+
+    @Test
+    public void getMetricsCategory() {
+        assertThat(mFragment.getMetricsCategory())
+                .isEqualTo(MetricsEvent.ENTERPRISE_PRIVACY_DEFAULT_APPS);
+    }
+
+    @Test
+    public void getLogTag() {
+        assertThat(mFragment.getLogTag()).isEqualTo("EnterprisePrivacySettings");
+    }
+
+    @Test
+    public void getScreenResource() {
+        assertThat(mFragment.getPreferenceScreenResId())
+                .isEqualTo(R.xml.enterprise_set_default_apps_settings);
+    }
+
+    @Test
+    public void getPreferenceControllers() {
+        final List<PreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
+        assertThat(controllers).isNotNull();
+        assertThat(controllers.size()).isEqualTo(1);
+        int position = 0;
+        assertThat(controllers.get(position++)).isInstanceOf(
+                EnterpriseSetDefaultAppsListPreferenceController.class);
+    }
+
+    private static class EnterpriseSetDefaultAppsListFragmentTestable extends
+            EnterpriseSetDefaultAppsListFragment {
+
+        private final PreferenceManager mPreferenceManager;
+        private final PreferenceScreen mPreferenceScreen;
+
+        public EnterpriseSetDefaultAppsListFragmentTestable(PreferenceManager preferenceManager,
+                PreferenceScreen screen) {
+            this.mPreferenceManager = preferenceManager;
+            this.mPreferenceScreen = screen;
+        }
+
+        @Override
+        public PreferenceManager getPreferenceManager() {
+            return mPreferenceManager;
+        }
+
+        @Override
+        public PreferenceScreen getPreferenceScreen() {
+            return mPreferenceScreen;
+        }
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
new file mode 100644
index 0000000..6a1a7f7
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceControllerTest.java
@@ -0,0 +1,167 @@
+/*
+ * 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.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.UserInfo;
+import android.content.res.Resources;
+import android.os.UserHandle;
+import android.support.v7.preference.Preference;
+import android.support.v7.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceScreen;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.applications.EnterpriseDefaultApps;
+import com.android.settings.applications.UserAppInfo;
+import com.android.settings.overlay.FeatureFactory;
+import com.android.settings.testutils.ApplicationTestUtils;
+import com.android.settings.testutils.FakeFeatureFactory;
+
+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.annotation.Config;
+import org.robolectric.shadows.ShadowApplication;
+
+import java.util.Arrays;
+import java.util.Collections;
+
+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.Matchers.eq;
+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 EnterpriseSetDefaultAppsListPreferenceControllerTest {
+    private static final int USER_ID = 0;
+    private static final int APP_UID = 0;
+
+    private static final String APP_1 = "APP_1";
+    private static final String APP_2 = "APP_2";
+    private static final String BROWSER_TITLE = "Browser app";
+    private static final String PHONE_TITLE = "Phone apps";
+
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceScreen mScreen;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PreferenceManager mPrefenceManager;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private PackageManager mPackageManager;
+    @Mock(answer = RETURNS_DEEP_STUBS)
+    private SettingsPreferenceFragment mFragment;
+
+    private Context mContext;
+    private FakeFeatureFactory mFeatureFactory;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        ShadowApplication shadowContext = ShadowApplication.getInstance();
+        mContext = spy(shadowContext.getApplicationContext());
+        FakeFeatureFactory.setupForTest(mContext);
+        mFeatureFactory = (FakeFeatureFactory) FeatureFactory.getFactory(mContext);
+        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);
+        when(mPrefenceManager.getContext()).thenReturn(mContext);
+        when(mFragment.getPreferenceManager()).thenReturn(mPrefenceManager);
+
+        when(mContext.getString(R.string.default_browser_title)).thenReturn(BROWSER_TITLE);
+        Resources resources = spy(mContext.getResources());
+        when(mContext.getResources()).thenReturn(resources);
+        when(resources.getQuantityString(R.plurals.default_phone_app_title, 2))
+                .thenReturn(PHONE_TITLE);
+        when(mContext.getString(R.string.app_names_concatenation_template_2))
+                .thenReturn("%1$s, %2$s");
+
+        when(mPackageManager.getText(eq(APP_1), anyInt(), any())).thenReturn(APP_1);
+        when(mPackageManager.getText(eq(APP_2), anyInt(), any())).thenReturn(APP_2);
+    }
+
+    @Test
+    public void testMultipleAppsForOneTypeOfDefault() {
+        final UserInfo user = new UserInfo(USER_ID, "main", UserInfo.FLAG_ADMIN);
+        final ApplicationInfo appInfo1 = ApplicationTestUtils.buildInfo(APP_UID, APP_1, 0, 0);
+        final ApplicationInfo appInfo2 = ApplicationTestUtils.buildInfo(APP_UID, APP_2, 0, 0);
+
+        when(mFeatureFactory.userFeatureProvider.getUserProfiles())
+                .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
+        when(mFeatureFactory.enterprisePrivacyFeatureProvider.isInCompMode()).thenReturn(false);
+        when(mFeatureFactory.applicationFeatureProvider
+                .findPersistentPreferredActivities(anyInt(), any()))
+                .thenReturn(Collections.emptyList());
+        when(mFeatureFactory.applicationFeatureProvider
+                .findPersistentPreferredActivities(eq(USER_ID),
+                        eq(EnterpriseDefaultApps.BROWSER.getIntents())))
+                .thenReturn(Arrays.asList(new UserAppInfo(user, appInfo1)));
+        when(mFeatureFactory.applicationFeatureProvider
+                .findPersistentPreferredActivities(eq(USER_ID),
+                        eq(EnterpriseDefaultApps.PHONE.getIntents()))).thenReturn(
+                                Arrays.asList(new UserAppInfo(user, appInfo1),
+                                        new UserAppInfo(user, appInfo2)));
+
+        new EnterpriseSetDefaultAppsListPreferenceController(mContext, mFragment, mPackageManager);
+        ShadowApplication.runBackgroundTasks();
+
+        ArgumentCaptor<Preference> apps = ArgumentCaptor.forClass(Preference.class);
+        verify(mScreen, times(2)).addPreference(apps.capture());
+
+        assertThat(apps.getAllValues().get(0).getTitle()).isEqualTo(BROWSER_TITLE);
+        assertThat(apps.getAllValues().get(0).getSummary()).isEqualTo(APP_1);
+
+        assertThat(apps.getAllValues().get(1).getTitle()).isEqualTo(PHONE_TITLE);
+        assertThat(apps.getAllValues().get(1).getSummary()).isEqualTo(APP_1 + ", " + APP_2);
+    }
+
+    @Test
+    public void isAvailable() {
+        when(mFeatureFactory.userFeatureProvider.getUserProfiles())
+                .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
+        when(mFeatureFactory.applicationFeatureProvider
+                .findPersistentPreferredActivities(anyInt(), any()))
+                .thenReturn(Collections.emptyList());
+        final EnterpriseSetDefaultAppsListPreferenceController controller =
+                new EnterpriseSetDefaultAppsListPreferenceController(mContext, mFragment,
+                        mPackageManager);
+        assertThat(controller.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void getPreferenceKey() {
+        when(mFeatureFactory.userFeatureProvider.getUserProfiles())
+                .thenReturn(Arrays.asList(new UserHandle(USER_ID)));
+        when(mFeatureFactory.applicationFeatureProvider
+                .findPersistentPreferredActivities(anyInt(), any()))
+                .thenReturn(Collections.emptyList());
+        final EnterpriseSetDefaultAppsListPreferenceController controller =
+                new EnterpriseSetDefaultAppsListPreferenceController(mContext, mFragment,
+                        mPackageManager);
+        assertThat(controller.getPreferenceKey()).isNull();
+    }
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
index 3455e80..34d9b24 100644
--- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceControllerTest.java
@@ -18,32 +18,35 @@
 
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.Resources;
-import android.net.Uri;
-import android.provider.ContactsContract;
-import android.provider.MediaStore;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.UserInfo;
+import android.os.UserHandle;
+import android.os.UserManager;
 import android.support.v7.preference.Preference;
-import android.util.ArraySet;
 
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
-import com.android.settings.applications.ApplicationFeatureProvider;
+import com.android.settings.applications.EnterpriseDefaultApps;
+import com.android.settings.applications.UserAppInfo;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentMatcher;
 import org.mockito.Answers;
+import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
-import java.util.Set;
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.argThat;
+import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.when;
 
@@ -56,6 +59,8 @@
 
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
+    @Mock(answer = Answers.RETURNS_DEEP_STUBS)
+    private UserManager mUm;
     private FakeFeatureFactory mFeatureFactory;
 
     private EnterpriseSetDefaultAppsPreferenceController mController;
@@ -69,50 +74,40 @@
                 null /* lifecycle */);
     }
 
-    private static Intent buildIntent(String action, String category, String protocol,
-            String type) {
-        final Intent intent = new Intent(action);
-        if (category != null) {
-            intent.addCategory(category);
+    private void setEnterpriseSetDefaultApps(Intent[] intents, int number) {
+        final ApplicationInfo appInfo = new ApplicationInfo();
+        appInfo.packageName = "app";
+        for (int i = 0; i < number; i++) {
+            final List<UserAppInfo> apps = new ArrayList<>(number);
+            apps.add(new UserAppInfo(new UserInfo(i, "user." + i, UserInfo.FLAG_ADMIN), appInfo));
+            when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(eq(i),
+                    argThat(new MatchesIntents(intents)))).thenReturn(apps);
         }
-        if (protocol != null) {
-            intent.setData(Uri.parse(protocol));
-        }
-        if (type != null) {
-            intent.setType(type);
-        }
-        return intent;
     }
 
-    private void setEnterpriseSetDefaultApps(Intent[] intents, int number) {
-        final Set<ApplicationFeatureProvider.PersistentPreferredActivityInfo> apps
-                = new ArraySet<>(number);
-        for (int i = 0; i < number; i++) {
-            apps.add(new ApplicationFeatureProvider.PersistentPreferredActivityInfo("app", i));
+    private void configureUsers(int number) {
+        final List<UserHandle> users = new ArrayList<>(number);
+        for (int i = 0; i < 64; i++) {
+            users.add(new UserHandle(i));
         }
-        when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(
-                argThat(new MatchesIntents(intents)))).thenReturn(apps);
+        when(mFeatureFactory.userFeatureProvider.getUserProfiles()).thenReturn(users);
     }
 
     @Test
     public void testUpdateState() {
-        setEnterpriseSetDefaultApps(new Intent[] {buildIntent(Intent.ACTION_VIEW,
-                Intent.CATEGORY_BROWSABLE, "http:", null)}, 1);
-        setEnterpriseSetDefaultApps(new Intent[] {new Intent(MediaStore.ACTION_IMAGE_CAPTURE),
-                new Intent(MediaStore.ACTION_VIDEO_CAPTURE)}, 2);
-        setEnterpriseSetDefaultApps(new Intent[] {buildIntent(Intent.ACTION_VIEW, null, "geo:",
-                null)}, 4);
-        setEnterpriseSetDefaultApps(new Intent[] {new Intent(Intent.ACTION_SENDTO),
-                new Intent(Intent.ACTION_SEND), new Intent(Intent.ACTION_SEND_MULTIPLE)}, 8);
-        setEnterpriseSetDefaultApps(new Intent[] {buildIntent(Intent.ACTION_INSERT, null, null,
-                "vnd.android.cursor.dir/event")}, 16);
-        setEnterpriseSetDefaultApps(new Intent[] {buildIntent(Intent.ACTION_PICK, null, null,
-                ContactsContract.Contacts.CONTENT_TYPE)}, 32);
-        setEnterpriseSetDefaultApps(new Intent[] {new Intent(Intent.ACTION_DIAL),
-                new Intent(Intent.ACTION_CALL)}, 64);
+        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.BROWSER.getIntents(), 1);
+        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.CAMERA.getIntents(), 2);
+        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.MAP.getIntents(), 4);
+        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.EMAIL.getIntents(), 8);
+        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.CALENDAR.getIntents(), 16);
+        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.CONTACTS.getIntents(), 32);
+        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.PHONE.getIntents(), 64);
         when(mContext.getResources().getQuantityString(R.plurals.enterprise_privacy_number_packages,
                 127, 127)).thenReturn("127 apps");
 
+        // As setEnterpriseSetDefaultApps uses fake Users, we need to list them via UserManager.
+        configureUsers(64);
+
         final Preference preference = new Preference(mContext, null, 0, 0);
         mController.updateState(preference);
         assertThat(preference.getSummary()).isEqualTo("127 apps");
@@ -120,13 +115,12 @@
 
     @Test
     public void testIsAvailable() {
-        when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(
-                anyObject())).thenReturn(
-                        new ArraySet<ApplicationFeatureProvider.PersistentPreferredActivityInfo>());
+        when(mFeatureFactory.applicationFeatureProvider.findPersistentPreferredActivities(anyInt(),
+                anyObject())).thenReturn(new ArrayList<UserAppInfo>());
         assertThat(mController.isAvailable()).isFalse();
 
-        setEnterpriseSetDefaultApps(new Intent[] {buildIntent(Intent.ACTION_VIEW,
-                Intent.CATEGORY_BROWSABLE, "http:", null)}, 1);
+        setEnterpriseSetDefaultApps(EnterpriseDefaultApps.BROWSER.getIntents(), 1);
+        configureUsers(1);
         assertThat(mController.isAvailable()).isTrue();
     }
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
index 4305dc7..d9934b1 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetailTest.java
@@ -137,7 +137,7 @@
         doReturn(BACKGROUND_TIME_US).when(mUid).getProcessStateTime(
                 eq(BatteryStats.Uid.PROCESS_STATE_BACKGROUND), anyLong(), anyInt());
         doReturn(FOREGROUND_TIME_US).when(mUid).getProcessStateTime(
-                eq(BatteryStats.Uid.PROCESS_STATE_FOREGROUND), anyLong(), anyInt());
+                eq(BatteryStats.Uid.PROCESS_STATE_TOP), anyLong(), anyInt());
         ReflectionHelpers.setField(mBatteryEntry, "sipper", mBatterySipper);
         mBatteryEntry.iconId = ICON_ID;
         mBatterySipper.uidObj = mUid;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
index 85b4f81..a341d83 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/AppButtonsPreferenceControllerTest.java
@@ -19,8 +19,8 @@
 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.anyInt;
+import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.doNothing;
@@ -48,7 +48,9 @@
 import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.enterprise.DevicePolicyManagerWrapper;
 import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settingslib.applications.AppUtils;
 import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.instantapps.InstantAppDataProvider;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -61,6 +63,7 @@
 import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
+import org.robolectric.util.ReflectionHelpers;
 
 @RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@@ -189,6 +192,32 @@
     }
 
     @Test
+    public void testIsAvailable_nonInstantApp() throws Exception {
+        mController.mAppEntry = mAppEntry;
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                new InstantAppDataProvider() {
+                    @Override
+                    public boolean isInstantApp(ApplicationInfo info) {
+                        return false;
+                    }
+                });
+        assertThat(mController.isAvailable()).isTrue();
+    }
+
+    @Test
+    public void testIsAvailable_instantApp() throws Exception {
+        mController.mAppEntry = mAppEntry;
+        ReflectionHelpers.setStaticField(AppUtils.class, "sInstantAppDataProvider",
+                new InstantAppDataProvider() {
+                    @Override
+                    public boolean isInstantApp(ApplicationInfo info) {
+                        return true;
+                    }
+                });
+        assertThat(mController.isAvailable()).isFalse();
+    }
+
+    @Test
     public void testUpdateUninstallButton_isDeviceAdminApp_setButtonDisable() {
         doReturn(true).when(mController).handleDisableable(any());
         mAppInfo.flags |= ApplicationInfo.FLAG_SYSTEM;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
index f9cc771..fd89558 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryUtilsTest.java
@@ -64,9 +64,9 @@
     private static final long TIME_STATE_BACKGROUND = 6000 * UNIT;
 
     private static final int UID = 123;
-    private static final long TIME_EXPECTED_FOREGROUND = 6500;
+    private static final long TIME_EXPECTED_FOREGROUND = 1500;
     private static final long TIME_EXPECTED_BACKGROUND = 6000;
-    private static final long TIME_EXPECTED_ALL = 12500;
+    private static final long TIME_EXPECTED_ALL = 7500;
     private static final double BATTERY_SCREEN_USAGE = 300;
     private static final double BATTERY_SYSTEM_USAGE = 600;
     private static final double BATTERY_OVERACCOUNTED_USAGE = 500;
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
index d46baa1..8694dbd 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageAdvancedTest.java
@@ -189,6 +189,16 @@
     }
 
     @Test
+    public void testUpdateUsageDataSummary_typeIdle_showUsageTime() {
+        mPowerUsageData.usageType = UsageType.IDLE;
+        mPowerUsageData.usageList.add(mNormalBatterySipper);
+
+        mPowerUsageAdvanced.updateUsageDataSummary(mPowerUsageData, TOTAL_POWER, DISCHARGE_AMOUNT);
+
+        assertThat(mPowerUsageData.summary.toString()).isEqualTo("0m");
+    }
+
+    @Test
     public void testUpdateUsageDataSummary_moreThanOneApp_showMaxUsageApp() {
         mPowerUsageData.usageList.add(mNormalBatterySipper);
         mPowerUsageData.usageList.add(mMaxBatterySipper);
@@ -279,6 +289,20 @@
     }
 
     @Test
+    public void testShouldHideSummary_typeWifi_returnTrue() {
+        mPowerUsageData.usageType = UsageType.WIFI;
+
+        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
+    }
+
+    @Test
+    public void testShouldHideSummary_typeBluetooth_returnTrue() {
+        mPowerUsageData.usageType = UsageType.BLUETOOTH;
+
+        assertThat(mPowerUsageAdvanced.shouldHideSummary(mPowerUsageData)).isTrue();
+    }
+
+    @Test
     public void testShouldHideSummary_typeNormal_returnFalse() {
         mPowerUsageData.usageType = UsageType.APP;
 
diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
index 643e305..8c23cbf 100644
--- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
+++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java
@@ -31,6 +31,7 @@
 import android.hardware.input.InputManager;
 import android.os.UserManager;
 import android.provider.Settings;
+import android.view.autofill.AutofillManager;
 import android.view.inputmethod.InputMethodInfo;
 import android.view.inputmethod.InputMethodManager;
 import android.view.textservice.TextServicesManager;
@@ -72,6 +73,8 @@
     private DevicePolicyManager mDpm;
     @Mock
     private InputMethodManager mInputMethodManager;
+    @Mock
+    private AutofillManager mAutofillManager;
     private TestFragment mFragment;
 
     @Before
@@ -84,6 +87,7 @@
                 .thenReturn(mock(TextServicesManager.class));
         when(mContext.getSystemService(Context.DEVICE_POLICY_SERVICE)).thenReturn(mDpm);
         when(mContext.getSystemService(Context.INPUT_METHOD_SERVICE)).thenReturn(mImm);
+        when(mContext.getSystemService(AutofillManager.class)).thenReturn(mAutofillManager);
         mFragment = new TestFragment(mContext);
     }
 
diff --git a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
index 31a3f07..4908b49 100644
--- a/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/language/TtsPreferenceControllerTest.java
@@ -38,9 +38,7 @@
 
 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.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -94,7 +92,7 @@
 
         mController.displayPreference(mScreen);
 
-        // Remove both category and preference.
-        verify(mScreen, times(2)).removePreference(any(Preference.class));
+        // Remove preference.
+        verify(mScreen).removePreference(any(Preference.class));
     }
 }
diff --git a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
index 2201c68..d1c3207 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkDashboardFragmentTest.java
@@ -15,16 +15,20 @@
  */
 package com.android.settings.network;
 
+import android.content.Context;
 import android.provider.SearchIndexableResource;
 import android.view.Menu;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;
+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.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.shadows.ShadowApplication;
 import org.robolectric.util.ReflectionHelpers;
@@ -74,4 +78,15 @@
         verify(resetController).buildMenuItem(any(Menu.class));
     }
 
+    @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);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.java
new file mode 100644
index 0000000..eeb4131
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/network/NetworkResetPreferenceControllerTest.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.network;
+
+
+import android.content.Context;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+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.Mockito.never;
+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 NetworkResetPreferenceControllerTest {
+
+    @Mock
+    private NetworkResetRestrictionChecker mRestrictionChecker;
+    private Context mContext;
+    private NetworkResetPreferenceController mController;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        mController = new NetworkResetPreferenceController(mContext);
+        ReflectionHelpers.setField(mController, "mRestrictionChecker", mRestrictionChecker);
+    }
+
+    @Test
+    public void testIsAvailable_shouldReturnTrueWhenNoUserRestriction() {
+        when(mRestrictionChecker.isRestrictionEnforcedByAdmin()).thenReturn(true);
+
+        when(mRestrictionChecker.hasUserRestriction()).thenReturn(true);
+
+        assertThat(mController.isAvailable()).isFalse();
+
+        when(mRestrictionChecker.hasUserRestriction()).thenReturn(false);
+
+        assertThat(mController.isAvailable()).isTrue();
+        verify(mRestrictionChecker, never()).isRestrictionEnforcedByAdmin();
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
index 1e468a3..57dd8e6 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerPreferenceControllerTest.java
@@ -16,8 +16,8 @@
 
 package com.android.settings.network;
 
-import static android.provider.Settings.Global.NETWORK_RECOMMENDATIONS_ENABLED;
 import static com.google.common.truth.Truth.assertThat;
+
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -25,11 +25,12 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.net.NetworkScorerAppData;
-import android.provider.Settings;
 import android.support.v7.preference.Preference;
+
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,6 +39,8 @@
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
+import java.util.Collections;
+
 @RunWith(SettingsRobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class NetworkScorerPickerPreferenceControllerTest {
@@ -65,11 +68,12 @@
 
     @Test
     public void updateState_preferenceSetSummaryAsActiveScorerLabel() {
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
         ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
         NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
                 0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
                 null /* networkAvailableNotificationChannelId */);
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
         when(mNetworkScorer.getActiveScorer()).thenReturn(scorerAppData);
         Preference preference = mock(Preference.class);
 
@@ -79,8 +83,13 @@
     }
 
     @Test
-    public void updateState_noActiveScorer_preferenceSetSummaryToNone() {
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 1);
+    public void updateState_scorersAvailable_noActiveScorer_preferenceSetSummaryToNone() {
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
         when(mNetworkScorer.getActiveScorer()).thenReturn(null);
         Preference preference = mock(Preference.class);
 
@@ -91,9 +100,25 @@
     }
 
     @Test
-    public void updateState_networkRecommendationsDisabled_preferenceDisabled() {
-        Settings.System.putInt(mContext.getContentResolver(), NETWORK_RECOMMENDATIONS_ENABLED, 0);
-        when(mNetworkScorer.getActiveScorer()).thenReturn(null);
+    public void updateState_scorersAvailable_preferenceEnabled() {
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE, TEST_SCORER_CLASS);
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.singletonList(scorerAppData));
+
+        Preference preference = mock(Preference.class);
+
+        mController.updateState(preference);
+
+        verify(preference).setEnabled(true);
+    }
+
+    @Test
+    public void updateState_noScorersAvailable_preferenceDisabled() {
+        when(mNetworkScorer.getAllValidScorers())
+                .thenReturn(Collections.emptyList());
         Preference preference = mock(Preference.class);
 
         mController.updateState(preference);
diff --git a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
index bb8635f..aba1f77 100644
--- a/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
+++ b/tests/robotests/src/com/android/settings/network/NetworkScorerPickerTest.java
@@ -20,6 +20,7 @@
 import static org.mockito.Matchers.anyInt;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
@@ -112,6 +113,33 @@
         verify(mPreferenceScreen).addPreference(arg.capture());
         assertThat(arg.getValue().getTitle()).isEqualTo(
                 mContext.getString(R.string.network_scorer_picker_none_preference));
+        assertThat(arg.getValue().isChecked()).isTrue();
+    }
+
+    @Test
+    public void testUpdateCandidates_validScorers_noActiveScorer() {
+        ComponentName scorer = new ComponentName(TEST_SCORER_PACKAGE_1, TEST_SCORER_CLASS_1);
+        NetworkScorerAppData scorerAppData = new NetworkScorerAppData(
+                0, scorer, TEST_SCORER_LABEL_1, null /* enableUseOpenWifiActivity */,
+                null /* networkAvailableNotificationChannelId */);
+        when(mNetworkScoreManager.getAllValidScorers()).thenReturn(
+                Lists.newArrayList(scorerAppData));
+        when(mNetworkScoreManager.getActiveScorerPackage()).thenReturn(null);
+
+        ArgumentCaptor<RadioButtonPreference> arg =
+                ArgumentCaptor.forClass(RadioButtonPreference.class);
+
+        mFragment.updateCandidates();
+
+        verify(mPreferenceScreen, times(2)).addPreference(arg.capture());
+
+        final RadioButtonPreference nonePref = arg.getAllValues().get(0);
+        assertThat(nonePref.getKey()).isNull();
+        assertThat(nonePref.isChecked()).isTrue();
+
+        final RadioButtonPreference testScorerPref = arg.getAllValues().get(1);
+        assertThat(testScorerPref.getTitle()).isEqualTo(TEST_SCORER_LABEL_1);
+        assertThat(testScorerPref.isChecked()).isFalse();
     }
 
     @Test
@@ -128,7 +156,10 @@
 
         mFragment.updateCandidates();
 
-        verify(mPreferenceScreen).addPreference(arg.capture());
+        // The first preference added is the "none" preference and the second is the
+        // pref for the test scorer.
+        verify(mPreferenceScreen, times(2)).addPreference(arg.capture());
+        // Returns the last captured value which is expected to be the test scorer pref.
         RadioButtonPreference pref = arg.getValue();
         assertThat(pref.getTitle()).isEqualTo(TEST_SCORER_LABEL_1);
         assertThat(pref.isChecked()).isTrue();
diff --git a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
index 6f751eb..7e92bc5 100644
--- a/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/network/TetherPreferenceControllerTest.java
@@ -21,7 +21,9 @@
 import android.bluetooth.BluetoothPan;
 import android.bluetooth.BluetoothProfile;
 import android.content.Context;
+import android.database.ContentObserver;
 import android.net.ConnectivityManager;
+import android.provider.Settings;
 import android.support.v7.preference.Preference;
 
 import com.android.settings.R;
@@ -33,6 +35,7 @@
 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;
 
@@ -42,6 +45,7 @@
 import static org.mockito.Mockito.spy;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
+import static org.mockito.Mockito.verifyZeroInteractions;
 import static org.mockito.Mockito.when;
 
 @RunWith(SettingsRobolectricTestRunner.class)
@@ -66,6 +70,7 @@
         ReflectionHelpers.setField(mController, "mContext", mContext);
         ReflectionHelpers.setField(mController, "mConnectivityManager", mConnectivityManager);
         ReflectionHelpers.setField(mController, "mBluetoothAdapter", mBluetoothAdapter);
+        ReflectionHelpers.setField(mController, "mPreference", mPreference);
     }
 
     @Test
@@ -82,13 +87,13 @@
 
     @Test
     public void updateSummary_noPreference_noInteractionWithConnectivityManager() {
+        ReflectionHelpers.setField(mController, "mPreference", null);
         mController.updateSummary();
         verifyNoMoreInteractions(mConnectivityManager);
     }
 
     @Test
     public void updateSummary_wifiTethered_shouldShowHotspotMessage() {
-        ReflectionHelpers.setField(mController, "mPreference", mPreference);
         when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
         when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"123"});
 
@@ -98,7 +103,6 @@
 
     @Test
     public void updateSummary_btThetherOn_shouldShowTetherMessage() {
-        ReflectionHelpers.setField(mController, "mPreference", mPreference);
         when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123"});
         when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
 
@@ -108,7 +112,6 @@
 
     @Test
     public void updateSummary_tetherOff_shouldShowTetherOffMessage() {
-        ReflectionHelpers.setField(mController, "mPreference", mPreference);
         when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"123"});
         when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
 
@@ -118,7 +121,6 @@
 
     @Test
     public void updateSummary_wifiBtTetherOn_shouldShowHotspotAndTetherMessage() {
-        ReflectionHelpers.setField(mController, "mPreference", mPreference);
         when(mConnectivityManager.getTetheredIfaces()).thenReturn(new String[]{"123", "456"});
         when(mConnectivityManager.getTetherableWifiRegexs()).thenReturn(new String[]{"456"});
         when(mConnectivityManager.getTetherableBluetoothRegexs()).thenReturn(new String[]{"23"});
@@ -127,4 +129,25 @@
         verify(mPreference).setSummary(R.string.tether_settings_summary_hotspot_on_tether_on);
     }
 
+    @Test
+    public void airplaneModeOn_shouldUpdateSummaryToOff() {
+        ReflectionHelpers.setField(mController, "mContext", RuntimeEnvironment.application);
+
+        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 0);
+
+        mController.onResume();
+
+        verifyZeroInteractions(mPreference);
+
+        Settings.Global.putInt(RuntimeEnvironment.application.getContentResolver(),
+                Settings.Global.AIRPLANE_MODE_ON, 1);
+
+        final ContentObserver observer = ReflectionHelpers.getField(mController,
+                "mAirplaneModeObserver");
+        observer.onChange(true, Settings.Global.getUriFor(Settings.Global.AIRPLANE_MODE_ON));
+
+        verify(mPreference).setSummary(R.string.switch_off_text);
+    }
+
 }
diff --git a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
index 98951d1..392bd2c 100644
--- a/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/notification/EmergencyBroadcastPreferenceControllerTest.java
@@ -44,6 +44,8 @@
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class EmergencyBroadcastPreferenceControllerTest {
 
+    private static final String PREF_TEST_KEY = "test_key";
+
     @Mock(answer = Answers.RETURNS_DEEP_STUBS)
     private Context mContext;
     @Mock
@@ -62,7 +64,8 @@
         MockitoAnnotations.initMocks(this);
         when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
         when(mContext.getPackageManager()).thenReturn(mPackageManager);
-        mController = new EmergencyBroadcastPreferenceController(mContext, mAccountHelper);
+        mController = new EmergencyBroadcastPreferenceController(mContext, mAccountHelper,
+                PREF_TEST_KEY);
     }
 
     @Test
@@ -73,12 +76,17 @@
     }
 
     @Test
+    public void getPreferenceKey_shouldReturnKeyDefinedInConstructor() {
+        assertThat(mController.getPreferenceKey()).isEqualTo(PREF_TEST_KEY);
+    }
+
+    @Test
     public void isAvailable_notAdminUser_shouldReturnFalse() {
         when(mUserManager.isAdminUser()).thenReturn(false);
         when(mContext.getResources().getBoolean(
-            com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
+                com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
         when(mPackageManager.getApplicationEnabledSetting(anyString()))
-            .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
         when(mAccountHelper.hasBaseUserRestriction(anyString(), anyInt())).thenReturn(false);
 
         assertThat(mController.isAvailable()).isFalse();
@@ -88,11 +96,11 @@
     public void isAvailable_hasConfigCellBroadcastRestriction_shouldReturnFalse() {
         when(mUserManager.isAdminUser()).thenReturn(true);
         when(mContext.getResources().getBoolean(
-            com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
+                com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
         when(mPackageManager.getApplicationEnabledSetting(anyString()))
-            .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
         when(mAccountHelper.hasBaseUserRestriction(
-            eq(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS), anyInt())).thenReturn(true);
+                eq(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS), anyInt())).thenReturn(true);
 
         assertThat(mController.isAvailable()).isFalse();
     }
@@ -101,9 +109,9 @@
     public void isAvailable_cellBroadcastAppLinkDisabled_shouldReturnFalse() {
         when(mUserManager.isAdminUser()).thenReturn(true);
         when(mContext.getResources().getBoolean(
-            com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(false);
+                com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(false);
         when(mPackageManager.getApplicationEnabledSetting(anyString()))
-            .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
+                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);
         when(mAccountHelper.hasBaseUserRestriction(anyString(), anyInt())).thenReturn(false);
 
         assertThat(mController.isAvailable()).isFalse();
@@ -113,9 +121,9 @@
     public void isAvailable_cellBroadcastReceiverDisabled_shouldReturnFalse() {
         when(mUserManager.isAdminUser()).thenReturn(true);
         when(mContext.getResources().getBoolean(
-            com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
+                com.android.internal.R.bool.config_cellBroadcastAppLinks)).thenReturn(true);
         when(mPackageManager.getApplicationEnabledSetting(anyString()))
-            .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
+                .thenReturn(PackageManager.COMPONENT_ENABLED_STATE_DISABLED);
         when(mAccountHelper.hasBaseUserRestriction(anyString(), anyInt())).thenReturn(false);
 
         assertThat(mController.isAvailable()).isFalse();
diff --git a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
index 6a34472..6175093 100644
--- a/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
+++ b/tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java
@@ -125,7 +125,7 @@
                 "key_user_dictionary_settings", "gesture_settings_category", "gesture_assist",
                 "gesture_swipe_down_fingerprint", "gesture_double_tap_power",
                 "gesture_double_twist", "gesture_double_tap_screen", "gesture_pick_up",
-                "pointer_settings_category", "pointer_speed", "voice_category", "tts_settings",
+                "pointer_speed", "tts_settings",
                 "game_controller_settings_category", "vibrate_input_devices");
     }
 
diff --git a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
index 63eeae0..e733196 100644
--- a/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/search/SearchFeatureProviderImplTest.java
@@ -18,7 +18,6 @@
 package com.android.settings.search;
 
 import android.app.Activity;
-import android.content.Context;
 import android.view.Menu;
 
 import com.android.settings.SettingsRobolectricTestRunner;
@@ -35,14 +34,11 @@
 import org.robolectric.Robolectric;
 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.Matchers.anyString;
-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)
@@ -73,19 +69,10 @@
     }
 
     @Test
-    public void getSiteMapManager_shouldCacheInstanec() {
+    public void getSiteMapManager_shouldCacheInstance() {
         final SiteMapManager manager1 = mProvider.getSiteMapManager();
         final SiteMapManager manager2 = mProvider.getSiteMapManager();
 
         assertThat(manager1).isSameAs(manager2);
     }
-
-    @Test
-    public void testUpdateIndexNewSearch_UsesDatabaseIndexingManager() {
-        mProvider = spy(new SearchFeatureProviderImpl());
-        when(mProvider.isEnabled(mActivity)).thenReturn(true);
-
-        mProvider.updateIndex(mActivity);
-        verify(mProvider).getIndexingManager(any(Context.class));
-    }
 }
diff --git a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
index 5b7efcd..e35eb10 100644
--- a/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
+++ b/tests/robotests/src/com/android/settings/search/XmlParserUtilTest.java
@@ -89,7 +89,7 @@
                 "com.android.settings.TimeoutListPreference");
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String summary = XmlParserUtils.getDataSummary(mContext, attrs);
-        String expSummary = mContext.getString(R.string.screen_timeout_summary);
+        String expSummary = mContext.getString(R.string.summary_placeholder);
         assertThat(summary).isEqualTo(expSummary);
 
     }
diff --git a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
index 047d867..0a8326d 100644
--- a/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
+++ b/tests/robotests/src/com/android/settings/search2/DatabaseIndexingManagerTest.java
@@ -31,14 +31,13 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.net.Uri;
 import android.os.Build;
-import android.provider.SearchIndexableData;
 import android.provider.SearchIndexableResource;
-import android.provider.SearchIndexablesContract;
 import android.util.ArrayMap;
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
 import com.android.settings.search.IndexDatabaseHelper;
+import com.android.settings.search.IndexingCallback;
 import com.android.settings.search.SearchIndexableRaw;
 import com.android.settings.testutils.DatabaseTestUtils;
 import com.android.settings.testutils.shadow.ShadowDatabaseIndexingUtils;
@@ -49,6 +48,7 @@
 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.ShadowContentResolver;
@@ -62,13 +62,16 @@
 import java.util.Map;
 import java.util.Set;
 
+import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
 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.anyMap;
 import static org.mockito.Matchers.anyString;
+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.times;
 import static org.mockito.Mockito.verify;
@@ -903,7 +906,7 @@
     }
 
     @Test
-    public void testUpdateDataInDatabase_DisabledResultsAreIndexable_BecomeEnabled() {
+    public void testUpdateDataInDatabase_disabledResultsAreIndexable_becomeEnabled() {
         // Both results are initially disabled, and then TITLE_TWO gets enabled.
         final boolean enabled = false;
         insertSpecialCase(TITLE_ONE, enabled, KEY_ONE);
@@ -921,6 +924,44 @@
         assertThat(cursor.getString(2)).isEqualTo(TITLE_TWO);
     }
 
+    @Test
+    @Config(shadows = {ShadowContentResolver.class})
+    public void testEmptyNonIndexableKeys_emptyDataKeyResources_addedToDatabase() {
+        insertSpecialCase(TITLE_ONE, true /* enabled */, null /* dataReferenceKey */);
+
+        mManager.updateDatabase(false, localeStr);
+
+        Cursor cursor = mDb.rawQuery("SELECT * FROM prefs_index WHERE enabled = 1", null);
+        cursor.moveToPosition(0);
+        assertThat(cursor.getCount()).isEqualTo(1);
+        assertThat(cursor.getString(2)).isEqualTo(TITLE_ONE);
+    }
+
+    @Test
+    public void testUpdateAsyncTask_onPostExecute_performsCallback() {
+        IndexingCallback callback = mock(IndexingCallback.class);
+
+        DatabaseIndexingManager.IndexingTask task = mManager.new IndexingTask(callback);
+        task.execute();
+
+        Robolectric.flushForegroundThreadScheduler();
+
+        verify(callback).onIndexingFinished();
+    }
+
+    @Test
+    public void testUpdateAsyncTask_onPostExecute_setsIndexingComplete() {
+        SearchFeatureProviderImpl provider = new SearchFeatureProviderImpl();
+        DatabaseIndexingManager manager = spy(provider.getIndexingManager(mContext));
+        DatabaseIndexingManager.IndexingTask task = manager.new IndexingTask(null);
+        doNothing().when(manager).performIndexing();
+
+        task.execute();
+        Robolectric.flushForegroundThreadScheduler();
+
+        assertThat(provider.isIndexingComplete(mContext)).isTrue();
+    }
+
     // Util functions
 
     private SearchIndexableRaw getFakeRaw() {
@@ -986,11 +1027,11 @@
     // TODO move this method and its counterpart in CursorToSearchResultConverterTest into
     // a util class with public fields to assert values.
     private Cursor getDummyCursor() {
-        MatrixCursor cursor = new MatrixCursor(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS);
+        MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
         final String BLANK = "";
 
         ArrayList<String> item =
-                new ArrayList<>(SearchIndexablesContract.INDEXABLES_RAW_COLUMNS.length);
+                new ArrayList<>(INDEXABLES_RAW_COLUMNS.length);
         item.add("42"); // Rank
         item.add(TITLE_ONE); // Title
         item.add(BLANK); // Summary on
diff --git a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java b/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
index 2b6ebaf..2296370 100644
--- a/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/search2/SearchFragmentTest.java
@@ -26,6 +26,7 @@
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.search.IndexingCallback;
 import com.android.settings.testutils.FakeFeatureFactory;
 
 import org.junit.Before;
@@ -42,6 +43,7 @@
 
 import java.util.List;
 
+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;
@@ -104,10 +106,7 @@
         activityController = Robolectric.buildActivity(SearchActivity.class);
         activityController.setup(bundle);
 
-        verify(mFeatureFactory.searchFeatureProvider)
-                .getDatabaseSearchLoader(any(Context.class), anyString());
-        verify(mFeatureFactory.searchFeatureProvider)
-                .getInstalledAppSearchLoader(any(Context.class), anyString());
+        assertThat(fragment.mQuery).isEqualTo(testQuery);
     }
 
     @Test
@@ -121,6 +120,8 @@
         activityController.setup();
         SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
                 .findFragmentById(R.id.main_content);
+        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
+                .thenReturn(true);
 
         fragment.mQuery = "";
 
@@ -133,8 +134,6 @@
                 .getDatabaseSearchLoader(any(Context.class), anyString());
         verify(mFeatureFactory.searchFeatureProvider, never())
                 .getInstalledAppSearchLoader(any(Context.class), anyString());
-        verify(mFeatureFactory.searchFeatureProvider, times(2))
-                .getSavedQueryLoader(any(Context.class));
     }
 
     @Test
@@ -154,6 +153,8 @@
         activityController.setup();
         SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
                 .findFragmentById(R.id.main_content);
+        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
+                .thenReturn(true);
 
         fragment.onQueryTextChange(testQuery);
         activityController.get().onBackPressed();
@@ -181,15 +182,16 @@
                 .thenReturn(mInstalledAppResultLoader);
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
-
         ActivityController<SearchActivity> activityController =
                 Robolectric.buildActivity(SearchActivity.class);
         activityController.setup();
-
         SearchFragment fragment = spy((SearchFragment) activityController.get().getFragmentManager()
                 .findFragmentById(R.id.main_content));
+        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
+                .thenReturn(true);
         ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
         fragment.mQuery = "123";
+
         fragment.onQueryTextChange("");
 
         verify(mFeatureFactory.searchFeatureProvider, never())
@@ -215,9 +217,12 @@
         activityController.setup();
         SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
                 .findFragmentById(R.id.main_content);
+        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
+                .thenReturn(true);
 
         fragment.onAttach(null);
-        verify(mFeatureFactory.searchFeatureProvider).updateIndex(any(Context.class));
+        verify(mFeatureFactory.searchFeatureProvider).updateIndex(any(Context.class),
+                any(IndexingCallback.class));
     }
 
     @Test
@@ -237,6 +242,8 @@
 
         SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
                 .findFragmentById(R.id.main_content));
+        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
+                .thenReturn(true);
 
         fragment.onQueryTextChange("non-empty");
 
@@ -261,11 +268,11 @@
         activityController.setup();
         SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
                 .findFragmentById(R.id.main_content));
-
+        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
+                .thenReturn(true);
         when(fragment.getLoaderManager()).thenReturn(mock(LoaderManager.class));
 
         fragment.onQueryTextChange("");
-
         Robolectric.flushForegroundThreadScheduler();
 
         verify(mFeatureFactory.searchFeatureProvider).hideFeedbackButton();
@@ -281,18 +288,65 @@
                 .thenReturn(new MockAppLoader(RuntimeEnvironment.application));
         when(mFeatureFactory.searchFeatureProvider.getSavedQueryLoader(any(Context.class)))
                 .thenReturn(mSavedQueryLoader);
+        ActivityController<SearchActivity> activityController =
+                Robolectric.buildActivity(SearchActivity.class);
+        activityController.setup();
+        SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
+                .findFragmentById(R.id.main_content);
+        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
+                .thenReturn(true);
 
+        fragment.onQueryTextChange("non-empty");
+        Robolectric.flushForegroundThreadScheduler();
+
+        verify(mFeatureFactory.searchFeatureProvider).showFeedbackButton(any(SearchFragment.class),
+                any(View.class));
+    }
+
+    @Test
+    public void preIndexingFinished_isIndexingFinishedFlag_isFalse() {
         ActivityController<SearchActivity> activityController =
                 Robolectric.buildActivity(SearchActivity.class);
         activityController.setup();
         SearchFragment fragment = (SearchFragment) activityController.get().getFragmentManager()
                 .findFragmentById(R.id.main_content);
 
-        fragment.onQueryTextChange("non-empty");
+        when(mFeatureFactory.searchFeatureProvider.isIndexingComplete(any(Context.class)))
+                .thenReturn(false);
+    }
 
-        Robolectric.flushForegroundThreadScheduler();
+    @Test
+    public void onIndexingFinished_notShowingSavedQuery_initLoaders() {
+        ActivityController<SearchActivity> activityController =
+                Robolectric.buildActivity(SearchActivity.class);
+        activityController.setup();
+        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
+                .findFragmentById(R.id.main_content));
+        final LoaderManager loaderManager = mock(LoaderManager.class);
+        when(fragment.getLoaderManager()).thenReturn(loaderManager);
+        fragment.mShowingSavedQuery = false;
+        fragment.mQuery = null;
 
-        verify(mFeatureFactory.searchFeatureProvider).showFeedbackButton(any(SearchFragment.class),
-                any(View.class));
+        fragment.onIndexingFinished();
+
+        verify(loaderManager).initLoader(eq(SearchFragment.LOADER_ID_DATABASE),
+                eq(null), any(LoaderManager.LoaderCallbacks.class));
+        verify(loaderManager).initLoader(eq(SearchFragment.LOADER_ID_INSTALLED_APPS),
+                eq(null), any(LoaderManager.LoaderCallbacks.class));
+    }
+
+    @Test
+    public void onIndexingFinished_showingSavedQuery_loadsSavedQueries() {
+        ActivityController<SearchActivity> activityController =
+                Robolectric.buildActivity(SearchActivity.class);
+        activityController.setup();
+        SearchFragment fragment = (SearchFragment) spy(activityController.get().getFragmentManager()
+                .findFragmentById(R.id.main_content));
+        fragment.mShowingSavedQuery = true;
+        ReflectionHelpers.setField(fragment, "mSavedQueryController", mSavedQueryController);
+
+        fragment.onIndexingFinished();
+
+        verify(fragment.mSavedQueryController).loadSavedQueries();
     }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
index f4f1c63..68333e7 100644
--- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
+++ b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
@@ -30,6 +30,7 @@
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.search2.SearchFeatureProvider;
 import com.android.settings.overlay.SurveyFeatureProvider;
+import com.android.settings.users.UserFeatureProvider;
 
 import static org.mockito.Matchers.anyString;
 import static org.mockito.Mockito.mock;
@@ -52,6 +53,7 @@
     public final SurveyFeatureProvider surveyFeatureProvider;
     public final SecurityFeatureProvider securityFeatureProvider;
     public final SuggestionFeatureProvider suggestionsFeatureProvider;
+    public final UserFeatureProvider userFeatureProvider;
     public final AssistGestureFeatureProvider assistGestureFeatureProvider;
 
     /**
@@ -86,6 +88,7 @@
         surveyFeatureProvider = mock(SurveyFeatureProvider.class);
         securityFeatureProvider = mock(SecurityFeatureProvider.class);
         suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class);
+        userFeatureProvider = mock(UserFeatureProvider.class);
         assistGestureFeatureProvider = mock(AssistGestureFeatureProvider.class);
     }
 
@@ -145,6 +148,11 @@
     }
 
     @Override
+    public UserFeatureProvider getUserFeatureProvider(Context context) {
+        return userFeatureProvider;
+    }
+
+    @Override
     public AssistGestureFeatureProvider getAssistGestureFeatureProvider() {
         return assistGestureFeatureProvider;
     }
diff --git a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
index 20b3f89..f9d5439 100644
--- a/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
+++ b/tests/robotests/src/com/android/settings/testutils/XmlTestUtils.java
@@ -53,5 +53,4 @@
 
         return keys;
     }
-
-}
+}
\ No newline at end of file
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
index 724909d..ba82835 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/SettingsShadowResources.java
@@ -1,5 +1,11 @@
 package com.android.settings.testutils.shadow;
 
+import static android.util.TypedValue.TYPE_REFERENCE;
+
+import static org.robolectric.RuntimeEnvironment.application;
+import static org.robolectric.Shadows.shadowOf;
+import static org.robolectric.internal.Shadow.directlyOn;
+
 import android.annotation.DimenRes;
 import android.content.res.Resources;
 import android.content.res.Resources.NotFoundException;
@@ -12,6 +18,7 @@
 import android.support.annotation.ColorRes;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
+import android.util.SparseArray;
 import android.util.TypedValue;
 
 import com.android.settings.R;
@@ -20,21 +27,19 @@
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.RealObject;
+import org.robolectric.internal.Shadow;
 import org.robolectric.res.StyleData;
 import org.robolectric.res.StyleResolver;
 import org.robolectric.res.builder.XmlResourceParserImpl;
 import org.robolectric.shadows.ShadowAssetManager;
 import org.robolectric.shadows.ShadowResources;
 import org.robolectric.util.ReflectionHelpers;
+import org.robolectric.util.ReflectionHelpers.ClassParameter;
 import org.w3c.dom.Node;
 
 import java.util.List;
 import java.util.Map;
 
-import static android.util.TypedValue.TYPE_REFERENCE;
-import static org.robolectric.Shadows.shadowOf;
-import static org.robolectric.internal.Shadow.directlyOn;
-
 /**
  * Shadow Resources and Theme classes to handle resource references that Robolectric shadows cannot
  * handle because they are too new or private.
@@ -45,6 +50,25 @@
     @RealObject
     public Resources realResources;
 
+    private static SparseArray<Object> sResourceOverrides = new SparseArray<>();
+
+    public static void overrideResource(int id, Object value) {
+        sResourceOverrides.put(id, value);
+    }
+
+    public static void overrideResource(String name, Object value) {
+        final Resources res = application.getResources();
+        final int resId = res.getIdentifier(name, null, null);
+        if (resId == 0) {
+            throw new Resources.NotFoundException("Cannot override \"" + name + "\"");
+        }
+        overrideResource(resId, value);
+    }
+
+    public static void reset() {
+        sResourceOverrides.clear();
+    }
+
     @Implementation
     public int getDimensionPixelSize(@DimenRes int id) throws NotFoundException {
         // Handle requests for private dimension resources,
@@ -93,6 +117,16 @@
         return directlyOn(realResources, Resources.class).getIntArray(id);
     }
 
+    @Implementation
+    public String getString(int id) {
+        final Object override = sResourceOverrides.get(id);
+        if (override instanceof String) {
+            return (String) override;
+        }
+        return Shadow.directlyOn(
+                realResources, Resources.class, "getString", ClassParameter.from(int.class, id));
+    }
+
     @Implements(Theme.class)
     public static class SettingsShadowTheme extends ShadowTheme {
 
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
new file mode 100644
index 0000000..dbf1a65
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowConnectivityManager.java
@@ -0,0 +1,32 @@
+/*
+ * 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.net.ConnectivityManager;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(ConnectivityManager.class)
+public class ShadowConnectivityManager extends org.robolectric.shadows.ShadowConnectivityManager {
+
+    @Implementation
+    public boolean isNetworkSupported(int networkType) {
+        return false;
+    }
+
+}
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
index 6ae695b..36f170a 100644
--- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowContentResolver.java
@@ -19,9 +19,15 @@
 import android.content.ContentResolver;
 import android.content.SyncAdapterType;
 
+import android.database.Cursor;
+import android.database.MatrixCursor;
+import android.net.Uri;
+import android.provider.SearchIndexablesContract;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 
+import static android.provider.SearchIndexablesContract.INDEXABLES_RAW_COLUMNS;
+
 @Implements(ContentResolver.class)
 public class ShadowContentResolver {
 
@@ -29,4 +35,13 @@
     public static SyncAdapterType[] getSyncAdapterTypesAsUser(int userId) {
         return new SyncAdapterType[0];
     }
+
+    @Implementation
+    public final Cursor query(Uri uri, String[] projection, String selection,
+            String[] selectionArgs, String sortOrder) {
+        MatrixCursor cursor = new MatrixCursor(INDEXABLES_RAW_COLUMNS);
+        MatrixCursor.RowBuilder builder = cursor.newRow()
+                .add(SearchIndexablesContract.NonIndexableKey.COLUMN_KEY_VALUE, "");
+        return cursor;
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
new file mode 100644
index 0000000..81cc607
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java
@@ -0,0 +1,33 @@
+/*
+ * 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 com.android.settings.Utils;
+
+import org.robolectric.annotation.Implementation;
+import org.robolectric.annotation.Implements;
+
+@Implements(Utils.class)
+public class ShadowUtils {
+
+    @Implementation
+    public static int enforceSameOwner(Context context, int userId) {
+        return userId;
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
new file mode 100644
index 0000000..c794cdd
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/users/UserFeatureProviderImplTest.java
@@ -0,0 +1,67 @@
+/*
+ * 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.users;
+
+import android.content.Context;
+import android.os.UserHandle;
+import android.os.UserManager;
+
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+
+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 java.util.Arrays;
+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 UserFeatureProviderImplTest {
+    public static final int FIRST_USER_ID = 0;
+    public static final int SECOND_USER_ID = 4;
+
+    @Mock
+    private Context mContext;
+    @Mock
+    private UserManager mUserManager;
+
+    private UserFeatureProviderImpl mFeatureProvider;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        when(mContext.getSystemService(Context.USER_SERVICE)).thenReturn(mUserManager);
+        mFeatureProvider = new UserFeatureProviderImpl(mContext);
+    }
+
+    @Test
+    public void getUserProfiles() {
+        final List<UserHandle> expected =
+                Arrays.asList(new UserHandle(FIRST_USER_ID), new UserHandle(SECOND_USER_ID));
+        when(mUserManager.getUserProfiles()).thenReturn(expected);
+        final List<UserHandle> userProfiles = mFeatureProvider.getUserProfiles();
+        assertThat(userProfiles).isEqualTo(expected);
+    }
+}
diff --git a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java b/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
index 4ee42e0..4267ed1 100644
--- a/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/utils/ThreadUtilsTest.java
@@ -16,17 +16,16 @@
 package com.android.settings.utils;
 
 
+import com.android.settings.TestConfig;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
 
-import com.android.settings.SettingsRobolectricTestRunner;
-import com.android.settings.TestConfig;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.robolectric.annotation.Config;
-
-@RunWith(SettingsRobolectricTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 @Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
 public class ThreadUtilsTest {
 
diff --git a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
index 3747dda..21dc038 100644
--- a/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
+++ b/tests/robotests/src/com/android/settings/widget/MasterSwitchPreferenceTest.java
@@ -183,4 +183,19 @@
         preference.setDisabledByAdmin(null);
         assertThat(toggle.isEnabled()).isTrue();
     }
+
+    @Test
+    public void onBindViewHolder_toggleButtonShouldHaveContentDescription() {
+        final MasterSwitchPreference preference = new MasterSwitchPreference(mContext);
+        final PreferenceViewHolder holder = PreferenceViewHolder.createInstanceForTests(
+            LayoutInflater.from(mContext)
+                .inflate(R.layout.preference_widget_master_switch, null));
+        final Switch toggle = (Switch) holder.findViewById(R.id.switchWidget);
+        final String label = "TestButton";
+        preference.setTitle(label);
+
+        preference.onBindViewHolder(holder);
+
+        assertThat(toggle.getContentDescription()).isEqualTo(label);
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
new file mode 100644
index 0000000..ac0f5c8
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
@@ -0,0 +1,131 @@
+/*
+ * 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 com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import com.android.settings.R;
+import com.android.settings.SettingsRobolectricTestRunner;
+import com.android.settings.TestConfig;
+import com.android.settings.testutils.shadow.ShadowConnectivityManager;
+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 = ShadowConnectivityManager.class)
+public class WifiConfigControllerTest {
+
+    @Mock private WifiConfigUiBase mConfigUiBase;
+    @Mock private Context mContext;
+    @Mock private View mView;
+    @Mock 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 LONG_PSK =
+            "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl";
+    // An invalid PSK pass phrase. It is 7 characters long, must be at least 8
+    private static final String SHORT_PSK = "abcdefg";
+    // Valid PSK pass phrase
+    private static final String GOOD_PSK = "abcdefghijklmnopqrstuvwxyz";
+    private static final int DHCP = 0;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = RuntimeEnvironment.application;
+        when(mConfigUiBase.getContext()).thenReturn(mContext);
+        when(mAccessPoint.getSecurity()).thenReturn(AccessPoint.SECURITY_PSK);
+        mView = LayoutInflater.from(mContext).inflate(R.layout.wifi_dialog, null);
+        final Spinner ipSettingsSpinner = mView.findViewById(R.id.ip_settings);
+        ipSettingsSpinner.setSelection(DHCP);
+
+        mController = new TestWifiConfigController(mConfigUiBase, mView, mAccessPoint,
+                WifiConfigUiBase.MODE_CONNECT);
+    }
+    @Test
+    public void isSubmittable_noSSID_shouldReturnFalse() {
+        final TextView ssid = mView.findViewById(R.id.ssid);
+        ssid.setText("");
+        assertThat(mController.isSubmittable()).isFalse();
+    }
+
+    @Test
+    public void isSubmittable_longPsk_shouldReturnFalse() {
+        final TextView password = mView.findViewById(R.id.password);
+        password.setText(LONG_PSK);
+        assertThat(mController.isSubmittable()).isFalse();
+
+    }
+    @Test
+    public void isSubmittable_shortPsk_shouldReturnFalse() {
+        final TextView password = mView.findViewById(R.id.password);
+        password.setText(SHORT_PSK);
+        assertThat(mController.isSubmittable()).isFalse();
+
+    }
+    @Test
+    public void isSubmittable_goodPsk_shouldReturnTrue() {
+        final TextView password = mView.findViewById(R.id.password);
+        password.setText(GOOD_PSK);
+        assertThat(mController.isSubmittable()).isTrue();
+
+    }
+    @Test
+    public void isSubmittable_savedConfigZeroLengthPassword_shouldReturnTrue() {
+        final TextView password = mView.findViewById(R.id.password);
+        password.setText("");
+        when(mAccessPoint.isSaved()).thenReturn(true);
+        assertThat(mController.isSubmittable()).isTrue();
+    }
+    @Test
+    public void isSubmittable_nullAccessPoint_noException() {
+        mController = new TestWifiConfigController(mConfigUiBase, mView, null,
+                WifiConfigUiBase.MODE_CONNECT);
+        mController.isSubmittable();
+    }
+
+    public class TestWifiConfigController extends WifiConfigController {
+
+        public TestWifiConfigController(WifiConfigUiBase parent, View view,
+                AccessPoint accessPoint, int mode) {
+            super(parent, view, accessPoint, mode);
+        }
+
+        @Override
+        boolean isSplitSystemUser() {
+            return false;
+        }
+    }
+}
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 8d28dee..208c157 100644
--- a/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/wifi/details/WifiDetailPreferenceControllerTest.java
@@ -18,6 +18,8 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.reset;
 import static org.mockito.Mockito.times;
@@ -29,24 +31,35 @@
 import android.content.Intent;
 import android.graphics.drawable.Drawable;
 import android.net.ConnectivityManager;
+import android.net.ConnectivityManager.NetworkCallback;
 import android.net.IpPrefix;
 import android.net.LinkAddress;
 import android.net.LinkProperties;
 import android.net.Network;
 import android.net.NetworkBadging;
+import android.net.NetworkCapabilities;
 import android.net.NetworkInfo;
+import android.net.NetworkRequest;
 import android.net.RouteInfo;
 import android.net.wifi.WifiConfiguration;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
+import android.os.Handler;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceCategory;
 import android.support.v7.preference.PreferenceScreen;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 
+import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;
+import com.android.settings.applications.LayoutPreference;
+import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.core.lifecycle.Lifecycle;
+import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
 import com.android.settings.wifi.WifiDetailPreference;
 import com.android.settingslib.wifi.AccessPoint;
 
@@ -55,6 +68,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.Answers;
 import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
+import org.mockito.InOrder;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.RuntimeEnvironment;
@@ -83,14 +98,18 @@
     @Mock private AccessPoint mockAccessPoint;
     @Mock private Activity mockActivity;
     @Mock private ConnectivityManager mockConnectivityManager;
+    @Mock private ConnectivityManagerWrapperImpl mockConnectivityManagerWrapper;
     @Mock private Network mockNetwork;
     @Mock private NetworkInfo mockNetworkInfo;
     @Mock private WifiConfiguration mockWifiConfig;
     @Mock private WifiInfo mockWifiInfo;
     @Mock private WifiNetworkDetailsFragment mockFragment;
     @Mock private WifiManager mockWifiManager;
+    @Mock private MetricsFeatureProvider mockMetricsFeatureProvider;
 
     @Mock private Preference mockConnectionDetailPref;
+    @Mock private LayoutPreference mockButtonsPref;
+    @Mock private Button mockSignInButton;
     @Mock private WifiDetailPreference mockSignalStrengthPref;
     @Mock private WifiDetailPreference mockLinkSpeedPref;
     @Mock private WifiDetailPreference mockFrequencyPref;
@@ -100,11 +119,15 @@
     @Mock private WifiDetailPreference mockGatewayPref;
     @Mock private WifiDetailPreference mockSubnetPref;
     @Mock private WifiDetailPreference mockDnsPref;
+    @Mock private Button mockForgetButton;
     @Mock private PreferenceCategory mockIpv6AddressCategory;
 
-    private LinkProperties mLinkProperties;
+    @Captor private ArgumentCaptor<NetworkCallback> mCallbackCaptor;
+    @Captor private ArgumentCaptor<View.OnClickListener> mForgetClickListener;
+
     private Context mContext = RuntimeEnvironment.application;
     private Lifecycle mLifecycle;
+    private LinkProperties mLinkProperties;
     private WifiDetailPreferenceController mController;
 
     @Before
@@ -128,12 +151,15 @@
 
         when(mockAccessPoint.getConfig()).thenReturn(mockWifiConfig);
         when(mockAccessPoint.getLevel()).thenReturn(LEVEL);
-        when(mockAccessPoint.getNetworkInfo()).thenReturn(mockNetworkInfo);
-        when(mockAccessPoint.getRssi()).thenReturn(RSSI);
         when(mockAccessPoint.getSecurityString(false)).thenReturn(SECURITY);
 
+        when(mockConnectivityManagerWrapper.getConnectivityManager())
+                .thenReturn(mockConnectivityManager);
         when(mockConnectivityManager.getNetworkInfo(any(Network.class)))
                 .thenReturn(mockNetworkInfo);
+        doNothing().when(mockConnectivityManagerWrapper).registerNetworkCallback(
+                any(NetworkRequest.class), mCallbackCaptor.capture(), any(Handler.class));
+        doNothing().when(mockForgetButton).setOnClickListener(mForgetClickListener.capture());
 
         when(mockWifiInfo.getLinkSpeed()).thenReturn(LINK_SPEED);
         when(mockWifiInfo.getRssi()).thenReturn(RSSI);
@@ -146,19 +172,20 @@
 
         when(mockFragment.getActivity()).thenReturn(mockActivity);
 
-        mController = newWifiDetailPreferenceController();
-
         setupMockedPreferenceScreen();
+        mController = newWifiDetailPreferenceController();
     }
 
     private WifiDetailPreferenceController newWifiDetailPreferenceController() {
         return new WifiDetailPreferenceController(
                 mockAccessPoint,
-                mockConnectivityManager,
+                mockConnectivityManagerWrapper,
                 mContext,
                 mockFragment,
+                null,  // Handler
                 mLifecycle,
-                mockWifiManager);
+                mockWifiManager,
+                mockMetricsFeatureProvider);
     }
 
     private void setupMockedPreferenceScreen() {
@@ -166,6 +193,12 @@
 
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_CONNECTION_DETAIL_PREF))
                 .thenReturn(mockConnectionDetailPref);
+        when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_BUTTONS_PREF))
+                .thenReturn(mockButtonsPref);
+        when(mockButtonsPref.findViewById(R.id.left_button))
+                .thenReturn(mockForgetButton);
+        when(mockButtonsPref.findViewById(R.id.right_button))
+                .thenReturn(mockSignInButton);
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_SIGNAL_STRENGTH_PREF))
                 .thenReturn(mockSignalStrengthPref);
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_LINK_SPEED))
@@ -186,40 +219,59 @@
                 .thenReturn(mockDnsPref);
         when(mockScreen.findPreference(WifiDetailPreferenceController.KEY_IPV6_ADDRESS_CATEGORY))
                 .thenReturn(mockIpv6AddressCategory);
-
-        mController.displayPreference(mockScreen);
     }
 
     @Test
     public void isAvailable_shouldAlwaysReturnTrue() {
+        mController.displayPreference(mockScreen);
+
         assertThat(mController.isAvailable()).isTrue();
     }
 
     @Test
     public void securityPreference_stringShouldBeSet() {
+        mController.displayPreference(mockScreen);
+
         verify(mockSecurityPref).setDetailText(SECURITY);
     }
 
     @Test
-    public void latestWifiInfo_shouldBeFetchedOnResume() {
-        mController.onResume();
+    public void latestWifiInfo_shouldBeFetchedInDisplayPreference() {
+        mController.displayPreference(mockScreen);
 
         verify(mockWifiManager, times(1)).getConnectionInfo();
     }
 
     @Test
-    public void latestNetworkInfo_shouldBeFetchedOnResume() {
-        mController.onResume();
+    public void latestNetworkInfo_shouldBeFetchedInDisplayPreference() {
+        mController.displayPreference(mockScreen);
 
         verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
     }
 
     @Test
+    public void networkCallback_shouldBeRegisteredOnResume() {
+        mController.onResume();
+
+        verify(mockConnectivityManagerWrapper, times(1)).registerNetworkCallback(
+                any(NetworkRequest.class), mCallbackCaptor.capture(), any(Handler.class));
+    }
+
+    @Test
+    public void networkCallback_shouldBeUnregisteredOnPause() {
+        mController.onResume();
+        mController.onPause();
+
+        verify(mockConnectivityManager, times(1)).unregisterNetworkCallback(
+                mCallbackCaptor.getValue());
+    }
+
+    @Test
     public void connectionDetailPref_shouldHaveIconSet() {
         Drawable expectedIcon =
                 NetworkBadging.getWifiIcon(LEVEL, NetworkBadging.BADGING_NONE, mContext.getTheme());
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockConnectionDetailPref).setIcon(expectedIcon);
     }
@@ -229,14 +281,14 @@
         String summary = "summary";
         when(mockAccessPoint.getSettingsSummary()).thenReturn(summary);
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockConnectionDetailPref).setTitle(summary);
     }
 
     @Test
     public void signalStrengthPref_shouldHaveIconSet() {
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockSignalStrengthPref).setIcon(any(Drawable.class));
     }
@@ -246,7 +298,7 @@
         String expectedStrength =
                 mContext.getResources().getStringArray(R.array.wifi_signal)[LEVEL];
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockSignalStrengthPref).setDetailText(expectedStrength);
     }
@@ -255,7 +307,7 @@
     public void linkSpeedPref_shouldHaveDetailTextSet() {
         String expectedLinkSpeed = mContext.getString(R.string.link_speed, LINK_SPEED);
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockLinkSpeedPref).setDetailText(expectedLinkSpeed);
     }
@@ -264,14 +316,14 @@
     public void linkSpeedPref_shouldNotShowIfNotSet() {
         when(mockWifiInfo.getLinkSpeed()).thenReturn(-1);
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockLinkSpeedPref).setVisible(false);
     }
 
     @Test
     public void macAddressPref_shouldHaveDetailTextSet() {
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockMacAddressPref).setDetailText(MAC_ADDRESS);
     }
@@ -282,7 +334,7 @@
 
         mLinkProperties.addLinkAddress(ipv4Address);
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockIpAddressPref).setDetailText(mIpv4Address.getHostAddress());
     }
@@ -294,7 +346,7 @@
         InetAddress gateway = mIpv4Address;
         mLinkProperties.addRoute(new RouteInfo(subnet, gateway));
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockSubnetPref).setDetailText("255.255.255.0");
         verify(mockGatewayPref).setDetailText(mIpv4Address.getHostAddress());
@@ -305,29 +357,20 @@
         mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,4,4}));
         mLinkProperties.addDnsServer(InetAddress.getByAddress(new byte[]{8,8,8,8}));
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockDnsPref).setDetailText("8.8.4.4,8.8.8.8");
     }
 
     @Test
-    public void noCurrentNetwork_allIpDetailsHidden() {
+    public void noCurrentNetwork_shouldFinishActivity() {
+        // If WifiManager#getCurrentNetwork() returns null, then the network is neither connected
+        // nor connecting and WifiStateMachine has not reached L2ConnectedState.
         when(mockWifiManager.getCurrentNetwork()).thenReturn(null);
-        reset(mockIpv6AddressCategory, mockIpAddressPref, mockSubnetPref, mockGatewayPref,
-                mockDnsPref);
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
-        verify(mockIpv6AddressCategory).setVisible(false);
-        verify(mockIpAddressPref).setVisible(false);
-        verify(mockSubnetPref).setVisible(false);
-        verify(mockGatewayPref).setVisible(false);
-        verify(mockDnsPref).setVisible(false);
-        verify(mockIpv6AddressCategory, never()).setVisible(true);
-        verify(mockIpAddressPref, never()).setVisible(true);
-        verify(mockSubnetPref, never()).setVisible(true);
-        verify(mockGatewayPref, never()).setVisible(true);
-        verify(mockDnsPref, never()).setVisible(true);
+        verify(mockActivity).finish();
     }
 
     @Test
@@ -336,7 +379,7 @@
         reset(mockIpv6AddressCategory, mockIpAddressPref, mockSubnetPref, mockGatewayPref,
                 mockDnsPref);
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         verify(mockIpv6AddressCategory).setVisible(false);
         verify(mockIpAddressPref).setVisible(false);
@@ -353,27 +396,28 @@
     @Test
     public void canForgetNetwork_noNetwork() {
         when(mockAccessPoint.getConfig()).thenReturn(null);
+
         mController = newWifiDetailPreferenceController();
         mController.displayPreference(mockScreen);
-        mController.onResume();
 
-        assertThat(mController.canForgetNetwork()).isFalse();
+        verify(mockForgetButton).setVisibility(View.INVISIBLE);
     }
 
     @Test
     public void canForgetNetwork_ephemeral() {
         when(mockWifiInfo.isEphemeral()).thenReturn(true);
         when(mockAccessPoint.getConfig()).thenReturn(null);
-        mController = newWifiDetailPreferenceController();
-        mController.displayPreference(mockScreen);
-        mController.onResume();
 
-        assertThat(mController.canForgetNetwork()).isTrue();
+        mController.displayPreference(mockScreen);
+
+        verify(mockForgetButton).setVisibility(View.VISIBLE);
     }
 
     @Test
     public void canForgetNetwork_saved() {
-        assertThat(mController.canForgetNetwork()).isTrue();
+        mController.displayPreference(mockScreen);
+
+        verify(mockForgetButton).setVisibility(View.VISIBLE);
     }
 
     @Test
@@ -382,25 +426,31 @@
         when(mockWifiInfo.isEphemeral()).thenReturn(true);
         when(mockWifiInfo.getSSID()).thenReturn(ssid);
 
-        mController.onResume();
-
-        mController.forgetNetwork();
+        mController.displayPreference(mockScreen);
+        mForgetClickListener.getValue().onClick(null);
 
         verify(mockWifiManager).disableEphemeralNetwork(ssid);
+        verify(mockMetricsFeatureProvider)
+                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
     }
 
     @Test
     public void forgetNetwork_saved() {
         mockWifiConfig.networkId = 5;
 
-        mController.forgetNetwork();
+        mController.displayPreference(mockScreen);
+        mForgetClickListener.getValue().onClick(null);
 
         verify(mockWifiManager).forget(mockWifiConfig.networkId, null);
+        verify(mockMetricsFeatureProvider)
+                .action(mockActivity, MetricsProto.MetricsEvent.ACTION_WIFI_FORGET);
     }
 
     @Test
     public void networkStateChangedIntent_shouldRefetchInfo() {
+        mController.displayPreference(mockScreen);
         mController.onResume();
+
         verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
         verify(mockWifiManager, times(1)).getConnectionInfo();
 
@@ -412,7 +462,9 @@
 
     @Test
     public void rssiChangedIntent_shouldRefetchInfo() {
+        mController.displayPreference(mockScreen);
         mController.onResume();
+
         verify(mockConnectivityManager, times(1)).getNetworkInfo(any(Network.class));
         verify(mockWifiManager, times(1)).getConnectionInfo();
 
@@ -433,12 +485,22 @@
     }
 
     @Test
+    public void networkOnLost_shouldFinishActivity() {
+        mController.displayPreference(mockScreen);
+        mController.onResume();
+
+        mCallbackCaptor.getValue().onLost(mockNetwork);
+
+        verify(mockActivity).finish();
+    }
+
+    @Test
     public void ipv6AddressPref_shouldHaveHostAddressTextSet() {
         LinkAddress ipv6Address = new LinkAddress(mIpv6Address, 128);
 
         mLinkProperties.addLinkAddress(ipv6Address);
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mockIpv6AddressCategory).addPreference(preferenceCaptor.capture());
@@ -451,10 +513,78 @@
 
         mLinkProperties.addLinkAddress(ipv6Address);
 
-        mController.onResume();
+        mController.displayPreference(mockScreen);
 
         ArgumentCaptor<Preference> preferenceCaptor = ArgumentCaptor.forClass(Preference.class);
         verify(mockIpv6AddressCategory).addPreference(preferenceCaptor.capture());
         assertThat(preferenceCaptor.getValue().isSelectable()).isFalse();
     }
+
+    @Test
+    public void captivePortal_shouldShowSignInButton() {
+        InOrder inOrder = inOrder(mockSignInButton);
+
+        mController.displayPreference(mockScreen);
+        mController.onResume();
+
+        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
+
+        NetworkCapabilities nc = new NetworkCapabilities();
+        nc.clearAll();
+        nc.addTransportType(NetworkCapabilities.TRANSPORT_WIFI);
+
+        NetworkCallback callback = mCallbackCaptor.getValue();
+        callback.onCapabilitiesChanged(mockNetwork, nc);
+        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
+
+        nc = new NetworkCapabilities(nc);
+        nc.addCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
+        callback.onCapabilitiesChanged(mockNetwork, nc);
+        inOrder.verify(mockSignInButton).setVisibility(View.VISIBLE);
+
+        nc = new NetworkCapabilities(nc);
+        nc.removeCapability(NetworkCapabilities.NET_CAPABILITY_CAPTIVE_PORTAL);
+        callback.onCapabilitiesChanged(mockNetwork, nc);
+        inOrder.verify(mockSignInButton).setVisibility(View.INVISIBLE);
+    }
+
+    @Test
+    public void testSignInButton_shouldStartCaptivePortalApp() {
+        mController.displayPreference(mockScreen);
+
+        ArgumentCaptor<OnClickListener> captor = ArgumentCaptor.forClass(OnClickListener.class);
+        verify(mockSignInButton).setOnClickListener(captor.capture());
+        captor.getValue().onClick(mockSignInButton);
+        verify(mockConnectivityManagerWrapper).startCaptivePortalApp(mockNetwork);
+    }
+
+    @Test
+    public void signInButtonVisible_buttonPanelShouldBeVisible() {
+        when(mockSignInButton.getVisibility()).thenReturn(View.VISIBLE);
+        when(mockForgetButton.getVisibility()).thenReturn(View.INVISIBLE);
+
+        mController.displayPreference(mockScreen);
+
+        verify(mockButtonsPref).setVisible(true);
+    }
+
+    @Test
+    public void forgetButtonVisible_buttonPanelShouldBeVisible() {
+        when(mockSignInButton.getVisibility()).thenReturn(View.INVISIBLE);
+        when(mockForgetButton.getVisibility()).thenReturn(View.VISIBLE);
+
+        mController.displayPreference(mockScreen);
+
+        verify(mockButtonsPref).setVisible(true);
+    }
+
+    @Test
+    public void neitherButtonVisible_buttonPanelShouldBeInvisible() {
+        when(mockSignInButton.getVisibility()).thenReturn(View.INVISIBLE);
+        when(mockForgetButton.getVisibility()).thenReturn(View.INVISIBLE);
+
+        mController.displayPreference(mockScreen);
+
+        verify(mockButtonsPref).setVisible(false);
+    }
 }
diff --git a/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java b/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.java
new file mode 100644
index 0000000..92e556e
--- /dev/null
+++ b/tests/unit/src/com/android/settings/applications/ManageApplicationsTest.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.applications;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.mock;
+
+import android.content.pm.ApplicationInfo;
+
+import com.android.settingslib.applications.ApplicationsState;
+import com.android.settingslib.applications.ApplicationsState.AppFilter;
+
+import org.junit.Test;
+
+public class ManageApplicationsTest {
+    @Test
+    public void getOverrideFilter_filtersVolumeForAudio() {
+        AppFilter filter =
+                ManageApplications.getOverrideFilter(
+                        ManageApplications.LIST_TYPE_STORAGE,
+                        ManageApplications.STORAGE_TYPE_MUSIC,
+                        "uuid");
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_AUDIO;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        assertThat(filter.filterApp(appEntry)).isTrue();
+    }
+
+    @Test
+    public void getOverrideFilter_filtersVolumeForVideo() {
+        AppFilter filter =
+                ManageApplications.getOverrideFilter(
+                        ManageApplications.LIST_TYPE_MOVIES,
+                        ManageApplications.STORAGE_TYPE_DEFAULT,
+                        "uuid");
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_VIDEO;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        assertThat(filter.filterApp(appEntry)).isTrue();
+    }
+
+    @Test
+    public void getOverrideFilter_filtersVolumeForGames() {
+        ApplicationsState.AppFilter filter =
+                ManageApplications.getOverrideFilter(
+                        ManageApplications.LIST_TYPE_GAMES,
+                        ManageApplications.STORAGE_TYPE_DEFAULT,
+                        "uuid");
+        final ApplicationInfo info = new ApplicationInfo();
+        info.volumeUuid = "uuid";
+        info.category = ApplicationInfo.CATEGORY_GAME;
+        final ApplicationsState.AppEntry appEntry = mock(ApplicationsState.AppEntry.class);
+        appEntry.info = info;
+
+        assertThat(filter.filterApp(appEntry)).isTrue();
+    }
+
+    @Test
+    public void getOverrideFilter_isEmptyNormally() {
+        ApplicationsState.AppFilter filter =
+                ManageApplications.getOverrideFilter(
+                        ManageApplications.LIST_TYPE_MAIN,
+                        ManageApplications.STORAGE_TYPE_DEFAULT,
+                        "uuid");
+        assertThat(filter).isNull();
+    }
+}
diff --git a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
index 3137d59..69c8c54 100644
--- a/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
+++ b/tests/unit/src/com/android/settings/display/ThemePreferenceControllerTest.java
@@ -16,11 +16,10 @@
 
 package com.android.settings.display;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+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.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
@@ -29,6 +28,7 @@
 import android.content.ContextWrapper;
 import android.content.om.OverlayInfo;
 import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.SmallTest;
@@ -58,7 +58,7 @@
     public void setup() {
         mMockOverlayManager = mock(OverlayManager.class);
         mMockPackageManager = mock(PackageManager.class);
-        mContext = new ContextWrapper(InstrumentationRegistry.getContext()) {
+        mContext = new ContextWrapper(InstrumentationRegistry.getTargetContext()) {
             @Override
             public PackageManager getPackageManager() {
                 return mMockPackageManager;
@@ -82,6 +82,8 @@
             }
             return info;
         });
+        when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
+                new PackageInfo());
         when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn(
                 list(info1, info2));
         ListPreference pref = mock(ListPreference.class);
@@ -91,31 +93,71 @@
 
 
         CharSequence[] entries = arg.getValue();
-        assertEquals(2, entries.length);
-        assertEquals("Theme1", entries[0]);
-        assertEquals("Theme2", entries[1]);
+        assertThat(entries).asList().containsExactly("Theme1", "Theme2");
 
         verify(pref).setEntryValues(arg.capture());
         CharSequence[] entryValues = arg.getValue();
-        assertEquals("com.android.Theme1", entryValues[0]);
-        assertEquals("com.android.Theme2", entryValues[1]);
+        assertThat(entryValues).asList().containsExactly(
+                "com.android.Theme1", "com.android.Theme2");
 
         verify(pref).setValue(eq("com.android.Theme1"));
     }
 
     @Test
+    public void testUpdateState_withStaticOverlay() throws Exception {
+        OverlayInfo info1 = new OverlayInfo("com.android.Theme1", "android",
+                "", OverlayInfo.STATE_ENABLED, 0);
+        OverlayInfo info2 = new OverlayInfo("com.android.Theme2", "android",
+                "", OverlayInfo.STATE_ENABLED, 0);
+        when(mMockPackageManager.getApplicationInfo(any(), anyInt())).thenAnswer(inv -> {
+            ApplicationInfo info = mock(ApplicationInfo.class);
+            if ("com.android.Theme1".equals(inv.getArguments()[0])) {
+                when(info.loadLabel(any())).thenReturn("Theme1");
+            } else {
+                when(info.loadLabel(any())).thenReturn("Theme2");
+            }
+            return info;
+        });
+        PackageInfo pi = new PackageInfo();
+        pi.isStaticOverlay = true;
+        when(mMockPackageManager.getPackageInfo(eq("com.android.Theme1"), anyInt())).thenReturn(pi);
+        when(mMockPackageManager.getPackageInfo(eq("com.android.Theme2"), anyInt())).thenReturn(
+                new PackageInfo());
+        when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt())).thenReturn(
+                list(info1, info2));
+        ListPreference pref = mock(ListPreference.class);
+        mPreferenceController.updateState(pref);
+        ArgumentCaptor<String[]> arg = ArgumentCaptor.forClass(String[].class);
+        verify(pref).setEntries(arg.capture());
+
+
+        CharSequence[] entries = arg.getValue();
+        assertThat(entries).asList().containsExactly("Theme2");
+
+        verify(pref).setEntryValues(arg.capture());
+        CharSequence[] entryValues = arg.getValue();
+        assertThat(entryValues).asList().containsExactly("com.android.Theme2");
+
+        verify(pref).setValue(eq("com.android.Theme2"));
+    }
+
+    @Test
     public void testAvailable_false() throws Exception {
+        when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
+                new PackageInfo());
         when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
                 .thenReturn(list(new OverlayInfo("", "", "", 0, 0)));
-        assertFalse(mPreferenceController.isAvailable());
+        assertThat(mPreferenceController.isAvailable()).isFalse();
     }
 
     @Test
     public void testAvailable_true() throws Exception {
+        when(mMockPackageManager.getPackageInfo(anyString(), anyInt())).thenReturn(
+                 new PackageInfo());
         when(mMockOverlayManager.getOverlayInfosForTarget(any(), anyInt()))
                 .thenReturn(list(new OverlayInfo("", "", "", 0, 0),
                         new OverlayInfo("", "", "", 0, 0)));
-        assertTrue(mPreferenceController.isAvailable());
+        assertThat(mPreferenceController.isAvailable()).isTrue();
     }
 
     private ArrayList<OverlayInfo> list(OverlayInfo... infos) {
diff --git a/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java b/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java
new file mode 100644
index 0000000..c5b050a
--- /dev/null
+++ b/tests/unit/src/com/android/settings/utils/FileSizeFormatterTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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.utils;
+
+import static com.android.settings.utils.FileSizeFormatter.GIGABYTE_IN_BYTES;
+import static com.android.settings.utils.FileSizeFormatter.MEGABYTE_IN_BYTES;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.content.Context;
+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;
+
+@SmallTest
+@RunWith(AndroidJUnit4.class)
+public class FileSizeFormatterTest {
+    private Context mContext;
+
+    @Before
+    public void setUp() throws Exception {
+        mContext = InstrumentationRegistry.getTargetContext();
+    }
+
+    @Test
+    public void formatFileSize_zero() throws Exception {
+        assertThat(
+                        FileSizeFormatter.formatFileSize(
+                                mContext,
+                                0 /* size */,
+                                com.android.internal.R.string.gigabyteShort,
+                                GIGABYTE_IN_BYTES))
+                .isEqualTo("0.00 GB");
+    }
+
+    @Test
+    public void formatFileSize_smallSize() throws Exception {
+        assertThat(
+                        FileSizeFormatter.formatFileSize(
+                                mContext,
+                                MEGABYTE_IN_BYTES * 11 /* size */,
+                                com.android.internal.R.string.gigabyteShort,
+                                GIGABYTE_IN_BYTES))
+                .isEqualTo("0.01 GB");
+    }
+
+    @Test
+    public void formatFileSize_lessThanOneSize() throws Exception {
+        assertThat(
+                        FileSizeFormatter.formatFileSize(
+                                mContext,
+                                MEGABYTE_IN_BYTES * 155 /* size */,
+                                com.android.internal.R.string.gigabyteShort,
+                                GIGABYTE_IN_BYTES))
+                .isEqualTo("0.16 GB");
+    }
+
+    @Test
+    public void formatFileSize_greaterThanOneSize() throws Exception {
+        assertThat(
+                        FileSizeFormatter.formatFileSize(
+                                mContext,
+                                MEGABYTE_IN_BYTES * 1551 /* size */,
+                                com.android.internal.R.string.gigabyteShort,
+                                GIGABYTE_IN_BYTES))
+                .isEqualTo("1.6 GB");
+    }
+
+    @Test
+    public void formatFileSize_greaterThanTen() throws Exception {
+        // Should round down due to truncation
+        assertThat(
+                        FileSizeFormatter.formatFileSize(
+                                mContext,
+                                GIGABYTE_IN_BYTES * 15 + MEGABYTE_IN_BYTES * 50 /* size */,
+                                com.android.internal.R.string.gigabyteShort,
+                                GIGABYTE_IN_BYTES))
+                .isEqualTo("15 GB");
+    }
+
+    @Test
+    public void formatFileSize_handlesNegativeFileSizes() throws Exception {
+        assertThat(
+                        FileSizeFormatter.formatFileSize(
+                                mContext,
+                                MEGABYTE_IN_BYTES * -155 /* size */,
+                                com.android.internal.R.string.gigabyteShort,
+                                GIGABYTE_IN_BYTES))
+                .isEqualTo("-0.16 GB");
+    }
+}
diff --git a/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
new file mode 100644
index 0000000..c1c5199
--- /dev/null
+++ b/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
@@ -0,0 +1,205 @@
+/*
+ * 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.assertion.ViewAssertions.doesNotExist;
+import static android.support.test.espresso.assertion.ViewAssertions.matches;
+import static android.support.test.espresso.matcher.ViewMatchers.Visibility.VISIBLE;
+import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;
+import static android.support.test.espresso.matcher.ViewMatchers.withEffectiveVisibility;
+import static android.support.test.espresso.matcher.ViewMatchers.withText;
+import static com.google.common.truth.Truth.assertThat;
+import static org.hamcrest.Matchers.allOf;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.startsWith;
+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.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiSsid;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.rule.ActivityTestRule;
+import android.support.test.runner.AndroidJUnit4;
+import com.android.settings.Settings.WifiSettingsActivity;
+import com.android.settingslib.wifi.AccessPoint;
+import com.android.settingslib.wifi.WifiTracker;
+import com.android.settingslib.wifi.WifiTracker.WifiListener;
+import com.android.settingslib.wifi.WifiTrackerFactory;
+import com.google.common.collect.Lists;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.List;
+
+@RunWith(AndroidJUnit4.class)
+public class WifiSettingsUiTest {
+
+    // TODO(b/37714546): Investigate why resource ids are not resolving correctly in the test apk,
+    // then remove this manual string entry
+    /** R.string.wifi_configure_settings_preference_title */
+    private static final String WIFI_PREFERENCES = "Wi\u2011Fi preferences";
+    /** R.string.wifi_saved_access_points_label */
+    private static final String SAVED_NETWORKS = "Saved networks";
+    /** R.string.wifi_empty_list_wifi_off */
+    private static final String WIFI_OFF_MESSAGE = "To see available networks, turn Wi\u2011Fi on.";
+    /** R.string.wifi_display_status_connected */
+    private static final String CONNECTED = "Connected";
+
+    private static final String TEST_SSID = "\"Test Ssid\"";
+    private static final String TEST_UNQUOTED_SSID = "Test Ssid";
+    private static final String TEST_BSSID = "0a:08:5c:67:89:00";
+    private static final int TEST_RSSI = 123;
+    private static final int TEST_NETWORK_ID = 1;
+
+    @Mock private WifiTracker mWifiTracker;
+    @Mock private WifiManager mWifiManager;
+    private Context mContext;
+    private WifiListener mWifiListener;
+
+    @Rule
+    public ActivityTestRule<WifiSettingsActivity> mActivityRule =
+            new ActivityTestRule<>(WifiSettingsActivity.class, true);
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        mContext = InstrumentationRegistry.getTargetContext();
+        WifiTrackerFactory.setTestingWifiTracker(mWifiTracker);
+        when(mWifiTracker.getManager()).thenReturn(mWifiManager);
+    }
+
+    private void setupConnectedAccessPoint() {
+        WifiConfiguration config = new WifiConfiguration();
+        config.SSID = TEST_SSID;
+        config.BSSID = TEST_BSSID;
+        config.networkId = TEST_NETWORK_ID;
+        WifiInfo wifiInfo = new WifiInfo();
+        wifiInfo.setSSID(WifiSsid.createFromAsciiEncoded(TEST_UNQUOTED_SSID));
+        wifiInfo.setBSSID(TEST_BSSID);
+        wifiInfo.setRssi(TEST_RSSI);
+        wifiInfo.setNetworkId(TEST_NETWORK_ID);
+        NetworkInfo networkInfo = new NetworkInfo(ConnectivityManager.TYPE_WIFI, 0, null, null);
+        networkInfo.setDetailedState(NetworkInfo.DetailedState.CONNECTED, null, null);
+        AccessPoint accessPoint = new AccessPoint(mContext, config);
+        accessPoint.update(config, wifiInfo, networkInfo);
+
+        assertThat(accessPoint.getSsidStr()).isEqualTo(TEST_UNQUOTED_SSID);
+        assertThat(accessPoint.getBssid()).isEqualTo(TEST_BSSID);
+        assertThat(accessPoint.getNetworkInfo()).isNotNull();
+        assertThat(accessPoint.isActive()).isTrue();
+        assertThat(accessPoint.getSettingsSummary()).isEqualTo(CONNECTED);
+
+        when(mWifiTracker.getAccessPoints()).thenReturn(
+                Lists.asList(accessPoint, new AccessPoint[]{}));
+    }
+
+    private void launchActivity() {
+        mActivityRule.launchActivity(new Intent("android.settings.WIFI_SETTINGS"));
+
+        verify(mWifiTracker).getManager();
+
+        List<Fragment> fragments = mActivityRule.getActivity().getFragmentManager().getFragments();
+        assertThat(fragments.size()).isEqualTo(1);
+        mWifiListener = (WifiSettings) fragments.get(0);
+        assertThat(mWifiListener).isNotNull();
+    }
+
+    private void setWifiState(int wifiState) {
+        when(mWifiManager.getWifiState()).thenReturn(wifiState);
+        when(mWifiManager.isWifiEnabled()).thenReturn(wifiState == WifiManager.WIFI_STATE_ENABLED);
+    }
+
+    private void callOnWifiStateChanged(int state) {
+        mActivityRule.getActivity().getMainThreadHandler()
+                .post( () -> mWifiListener.onWifiStateChanged(state) );
+    }
+
+    @Test
+    public void launchActivityShouldSucceed() {
+        launchActivity();
+    }
+
+    @Test
+    public void shouldShowWifiPreferences() {
+        launchActivity();
+
+        onView(withText(WIFI_PREFERENCES)).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void noSavedNetworks_shouldNotShowSavedNetworksButton() {
+        setWifiState(WifiManager.WIFI_STATE_ENABLED);
+        when(mWifiTracker.getNumSavedNetworks()).thenReturn(0);
+
+        launchActivity();
+
+        onView(withText(SAVED_NETWORKS)).check(matches(not(isDisplayed())));
+    }
+
+    @Test
+    public void savedNetworksExist_shouldShowSavedNetworksButton() {
+        setWifiState(WifiManager.WIFI_STATE_ENABLED);
+        when(mWifiTracker.getNumSavedNetworks()).thenReturn(1);
+
+        launchActivity();
+
+        onView(allOf(withText(SAVED_NETWORKS),
+                withEffectiveVisibility(VISIBLE))).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void onDisableWifi_seeOffMessage() {
+        setWifiState(WifiManager.WIFI_STATE_DISABLED);
+
+        launchActivity();
+        callOnWifiStateChanged(WifiManager.WIFI_STATE_DISABLED);
+
+        onView(withText(startsWith(WIFI_OFF_MESSAGE))).check(matches(isDisplayed()));
+    }
+
+    @Test
+    public void onEnableWifi_shouldNotSeeOffMessage() {
+        setWifiState(WifiManager.WIFI_STATE_ENABLED);
+
+        launchActivity();
+        callOnWifiStateChanged(WifiManager.WIFI_STATE_ENABLED);
+
+        onView(withText(startsWith(WIFI_OFF_MESSAGE))).check(doesNotExist());
+    }
+
+    @Test
+    public void onConnected_shouldSeeConnectedMessage() {
+        setWifiState(WifiManager.WIFI_STATE_ENABLED);
+        setupConnectedAccessPoint();
+        when(mWifiTracker.isConnected()).thenReturn(true);
+
+        launchActivity();
+
+        onView(withText(CONNECTED)).check(matches(isDisplayed()));
+    }
+}