diff --git a/res/drawable-hdpi/ic_settings_backup.png b/res/drawable-hdpi/ic_settings_backup.png
index c0662da..701b6cf 100644
--- a/res/drawable-hdpi/ic_settings_backup.png
+++ b/res/drawable-hdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_battery.png b/res/drawable-hdpi/ic_settings_battery.png
index d7f3d18..75a2af9 100644
--- a/res/drawable-hdpi/ic_settings_battery.png
+++ b/res/drawable-hdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_data_usage.png b/res/drawable-hdpi/ic_settings_data_usage.png
index 05cc163..b274f4f 100644
--- a/res/drawable-hdpi/ic_settings_data_usage.png
+++ b/res/drawable-hdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_more.png b/res/drawable-hdpi/ic_settings_more.png
new file mode 100644
index 0000000..e9b6309
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_more.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_wireless.png b/res/drawable-hdpi/ic_settings_wireless.png
index 8a6c8de..28409db 100644
--- a/res/drawable-hdpi/ic_settings_wireless.png
+++ b/res/drawable-hdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_backup.png b/res/drawable-mdpi/ic_settings_backup.png
index 756ccae..4595bda 100644
--- a/res/drawable-mdpi/ic_settings_backup.png
+++ b/res/drawable-mdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_battery.png b/res/drawable-mdpi/ic_settings_battery.png
index cca14ff..7a001fc 100644
--- a/res/drawable-mdpi/ic_settings_battery.png
+++ b/res/drawable-mdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_data_usage.png b/res/drawable-mdpi/ic_settings_data_usage.png
index b3fe265..e5d464d 100644
--- a/res/drawable-mdpi/ic_settings_data_usage.png
+++ b/res/drawable-mdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_more.png b/res/drawable-mdpi/ic_settings_more.png
new file mode 100644
index 0000000..048e3ed
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_more.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_wireless.png b/res/drawable-mdpi/ic_settings_wireless.png
index 8ddaa6a..59ed4d4 100644
--- a/res/drawable-mdpi/ic_settings_wireless.png
+++ b/res/drawable-mdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_backup.png b/res/drawable-xhdpi/ic_settings_backup.png
index 2a5b0d4..73d718b 100644
--- a/res/drawable-xhdpi/ic_settings_backup.png
+++ b/res/drawable-xhdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_battery.png b/res/drawable-xhdpi/ic_settings_battery.png
index 78f8a3f..6825b71 100644
--- a/res/drawable-xhdpi/ic_settings_battery.png
+++ b/res/drawable-xhdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_data_usage.png b/res/drawable-xhdpi/ic_settings_data_usage.png
index 5eb888a..57cf2b1 100644
--- a/res/drawable-xhdpi/ic_settings_data_usage.png
+++ b/res/drawable-xhdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_more.png b/res/drawable-xhdpi/ic_settings_more.png
new file mode 100644
index 0000000..d1b5c37
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_more.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_wireless.png b/res/drawable-xhdpi/ic_settings_wireless.png
index cc0fe15..d7a6955 100644
--- a/res/drawable-xhdpi/ic_settings_wireless.png
+++ b/res/drawable-xhdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_backup.png b/res/drawable-xxhdpi/ic_settings_backup.png
index 2edc43c..d7add84 100644
--- a/res/drawable-xxhdpi/ic_settings_backup.png
+++ b/res/drawable-xxhdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_battery.png b/res/drawable-xxhdpi/ic_settings_battery.png
index 0396687..1648ee4 100644
--- a/res/drawable-xxhdpi/ic_settings_battery.png
+++ b/res/drawable-xxhdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_data_usage.png b/res/drawable-xxhdpi/ic_settings_data_usage.png
index b6331fb..4460509 100644
--- a/res/drawable-xxhdpi/ic_settings_data_usage.png
+++ b/res/drawable-xxhdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_more.png b/res/drawable-xxhdpi/ic_settings_more.png
new file mode 100644
index 0000000..610e340
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_more.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_wireless.png b/res/drawable-xxhdpi/ic_settings_wireless.png
index f225145..4125f9f 100644
--- a/res/drawable-xxhdpi/ic_settings_wireless.png
+++ b/res/drawable-xxhdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_backup.png b/res/drawable-xxxhdpi/ic_settings_backup.png
index f3ab021..2a3f313 100644
--- a/res/drawable-xxxhdpi/ic_settings_backup.png
+++ b/res/drawable-xxxhdpi/ic_settings_backup.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_battery.png b/res/drawable-xxxhdpi/ic_settings_battery.png
index 06edb91..d45c6ef 100644
--- a/res/drawable-xxxhdpi/ic_settings_battery.png
+++ b/res/drawable-xxxhdpi/ic_settings_battery.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_data_usage.png b/res/drawable-xxxhdpi/ic_settings_data_usage.png
index 45922f9..54d464b 100644
--- a/res/drawable-xxxhdpi/ic_settings_data_usage.png
+++ b/res/drawable-xxxhdpi/ic_settings_data_usage.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_more.png b/res/drawable-xxxhdpi/ic_settings_more.png
new file mode 100644
index 0000000..def6b0e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_more.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_wireless.png b/res/drawable-xxxhdpi/ic_settings_wireless.png
index 9f137be..ed05fb3 100644
--- a/res/drawable-xxxhdpi/ic_settings_wireless.png
+++ b/res/drawable-xxxhdpi/ic_settings_wireless.png
Binary files differ
diff --git a/res/drawable/dashboard_tile_background.xml b/res/drawable/dashboard_tile_background.xml
index 92b6f42..f66ff23 100644
--- a/res/drawable/dashboard_tile_background.xml
+++ b/res/drawable/dashboard_tile_background.xml
@@ -15,7 +15,7 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-                android:tint="?android:attr/colorButtonPressed">
+                android:tint="?android:attr/colorControlHighlight">
     <item>
         <color android:color="@android:color/white" />
     </item>
diff --git a/res/drawable/preference_highlight.xml b/res/drawable/preference_highlight.xml
index 615a360..bbffe62 100644
--- a/res/drawable/preference_highlight.xml
+++ b/res/drawable/preference_highlight.xml
@@ -15,7 +15,7 @@
 -->
 
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-                android:tint="?android:attr/colorButtonPressed"
+                android:tint="?android:attr/colorControlHighlight"
                 android:pinned="true">
     <item android:id="@android:id/mask"
           android:drawable="@android:color/white" />
diff --git a/res/layout-land/crypt_keeper_pattern_entry.xml b/res/layout-land/crypt_keeper_pattern_entry.xml
new file mode 100644
index 0000000..d3d987d
--- /dev/null
+++ b/res/layout-land/crypt_keeper_pattern_entry.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License")
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+>
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+    >
+        <include layout="@layout/crypt_keeper_status" />
+
+        <!-- Emergency call button.
+             Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() -->
+        <Button android:id="@+id/emergencyCallButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginTop="16dip"
+            style="@*android:style/Widget.Button.Transparent"
+            android:textSize="14sp"
+            android:drawablePadding="6dip"
+        />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_marginStart="8dip"
+        android:layout_marginEnd="8dip"
+        android:orientation="horizontal"
+    >
+        <include layout="@layout/crypt_keeper_pattern_field" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/layout-sw600dp/crypt_keeper_pattern_entry.xml b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
new file mode 100644
index 0000000..e82e14f
--- /dev/null
+++ b/res/layout-sw600dp/crypt_keeper_pattern_entry.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License")
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+>
+
+    <include layout="@layout/crypt_keeper_status" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="0dip"
+        android:layout_weight="1"
+        android:layout_gravity="center_horizontal"
+    >
+        <ImageView android:id="@+id/encroid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:src="@drawable/encroid_resignin"
+            android:contentDescription="@null"
+        />
+
+        <!-- Password entry field -->
+        <LinearLayout
+            android:layout_height="354dip"
+            android:layout_width="354dip"
+            android:layout_toEndOf="@+id/encroid"
+            android:layout_centerVertical="true"
+            android:orientation="horizontal"
+        >
+            <include layout="@layout/crypt_keeper_pattern_field" />
+        </LinearLayout>
+
+    </RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/preference_batteryhistory.xml b/res/layout/preference_batteryhistory.xml
index c9403c6..86856d7 100644
--- a/res/layout/preference_batteryhistory.xml
+++ b/res/layout/preference_batteryhistory.xml
@@ -23,7 +23,7 @@
     android:gravity="center_vertical"
     android:id="@+android:id/battery_history_chart"
     android:paddingEnd="?android:attr/scrollbarSize"
-    android:textAppearance="?android:attr/textAppearanceMedium"
+    android:textAppearance="?android:attr/textAppearanceSmall"
     app:headerAppearance="?android:attr/textAppearanceMedium"
     android:shadowRadius="4"
     android:shadowColor="?android:attr/colorBackground"
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c62f836..0b41b35 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Jy is nou \'n ontwikkelaar!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Toemaar, jy is reeds \'n ontwikkelaar."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"DRAADLOOS en NETWERKE"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"TOESTEL"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSOONLIK"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"STELSEL"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Draadloos en netwerke"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Toestel"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Persoonlik"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Stelsel"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Skakel radio aan"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Skakel radio af"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Skakel SMS oor IMS aan"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripteer tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripteer foon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vereis \'n numeriese PIN of wagwoord om jou tablet te dekripteer elke keer as jy dit aanskakel"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vereis \'n numeriese PIN of wagwoord om jou foon te dekripteer elke keer as jy dit aanskakel"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Geënkripteer"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou tablet geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou tablet dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee.\n\nEnkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou tablet ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media, en ander lêers enkripteer. Sodra jy jou foon geënkripteer het, moet jy elke keer \'n numeriese PIN of wagwoord invoer om dit te dekripteer wanneer jy dit aanskakel. Jy kan nie jou foon dekripteer nie, behalwe deur \'n fabrieksterugstelling uit te voer, wat al jou data sal uitvee.\n\nEnkripsie neem \'n uur of langer. Jy moet begin met \'n volgelaaide battery en jou foon ingeprop hou tot enkripsie klaar is. As jy die enkripsieproses onderbreek, sal jy sommige van of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media en ander lêers enkripteer. Nadat jy jou tablet geënkripteer het, en as aanvaar word dat jy \'n skermslot opgestel het (dit is \'n patroon of numeriese PIN of wagwoord), sal jy elke keer as jy die tablet aanskakel, die skerm moet ontsluit om die tablet te dekripteer. Die enigste ander manier om te dekripteer, is om \'n fabrieksterugstelling te doen wat al jou data sal uitvee.\n\nEnkripsie duur \'n uur of langer. Jy moet met \'n gelaaide battery begin en jou tablet regdeur die proses ingeprop hou. As jy dit onderbreek, sal jy sommige of al jou data verloor."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Jy kan jou rekeninge, instellings, afgelaaide programme en hul data, media en ander lêers enkripteer. Nadat jy jou foon geënkripteer het, en as aanvaar word dat jy \'n skermslot opgestel het (dit is \'n patroon of numeriese PIN of wagwoord), sal jy elke keer as jy die foon aanskakel, die skerm moet ontsluit om die foon te dekripteer. Die enigste ander manier om te dekripteer, is om \'n fabrieksterugstelling te doen wat al jou data sal uitvee.\n\nEnkripsie duur \'n uur of langer. Jy moet met \'n gelaaide battery begin en jou foon regdeur die proses ingeprop hou. As jy dit onderbreek, sal jy sommige of al jou data verloor."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripteer tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripteer foon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laai jou battery en probeer weer."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Sien of deaktiveer toesteladministrateurs"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Vertrouensagente"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Bekyk of deaktiveer vertrouensagente"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Kennisgewingtoegang"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programme kan nie kennisgewings lees nie"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d program kan kennisgewings lees"</item>
-    <item quantity="other" msgid="980049191810249052">"%d programme kan kennisgewings lees"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Geen kennisgewingluisteraars is geïnstalleer nie."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Aktiveer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sal alle kennisgewings kan lees wat deur die stelsel of deur enige geïnstalleerde program geplaas is, wat dalk persoonlike inligting soos kontakname en die teks van boodskappe wat na jou gestuur is, kan insluit. Dit sal ook hierdie kennisgewings kan verwerp of handelingknoppies daarbinne kan aanraak."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Voorwaardesverskaffers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Geen programme voorsien voorwaardes nie"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d program voorsien voorwaardes"</item>
-    <item quantity="other" msgid="358057362115673258">"%d programme voorsien voorwaardes"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Geen voorwaardeverskaffers is geïnstalleer nie."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Aktiveer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> sal uitgaanvoorwaardes by die Moenie steur nie-modus kan voeg."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Skakel Bluetooth aan"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koppel aan netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Vergeet netwerk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Wysig netwerk"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Om beskikbare netwerke te sien, skakel Wi-Fi aan."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Soek tans vir Wi-Fi-netwerke…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Jy het nie toestemming om die Wi-Fi-netwerk te verander nie."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beskikbaar)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveilig met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Voer jou netwerkwagwoord in."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om liggingsakkuraatheid te verbeter en vir ander doele, wil <xliff:g id="APP_NAME">%1$s</xliff:g> netwerkskandering aanskakel, selfs wanneer Wi-Fi af is.\n\n Laat dit toe vir alle programme wat wil skandeer?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Laat toe"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Tuis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Foon-luitoon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiekeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Luiervolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreer wanneer stil"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Verstek kennisgewingklank"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Flikker kennisgewing-liggie"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Spring op as hoë prioriteit"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Luitoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Kennisgewing"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Demp musiek en ander media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Demp kennisgewings"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Demp alarms"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreer wanneer dit lui"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dok-instellings"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Oudio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
-    <string name="brightness" msgid="2354961343555249270">"Helderheid"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Verstel die helderheid van die skerm"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Slaap"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Muurpapier"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB-ontfouting"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"In ontfoutmodus wanneer USB gekoppel is"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Herroep USB-onfoutingmagtigings"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Kragkieslys se foutverslae"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Sluit opsie in die kragkieslys in vir die neem van \'n foutverslag"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Bly wakker"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skerm sal nooit slaap terwyl laai nie"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiveer Bluetooth HCI-loerloglêer"</string>
@@ -1628,8 +1615,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Toonhoogte"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affekteer die klank van die gesproke teks"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Taal"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Gebruik stelseltaal"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Taal nie gekies nie"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Stel die taalspesifieke stem vir gesproke teks"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Luister na \'n voorbeeld"</string>
@@ -1821,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-Mac-adres"</string>
     <string name="enter_password" msgid="4131758584074246224">"Voer wagwoord in om berging te dekripteer"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Voer jou PIN in om berging te dekripteer"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Teken jou patroon om berging te dekripteer"</string>
     <string name="try_again" msgid="4272075051293936921">"Probeer weer."</string>
     <string name="delete" msgid="4219243412325163003">"Vee uit"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse lêers"</string>
@@ -2073,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Verander lettergrootte"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tik en betaal"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Betaal met net \'n tik"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Bevoordeel voorgrondprogram"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Kom meer te wete"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Vind programme"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Stel as jou voorkeur?"</string>
@@ -2126,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Onlangse soektogte"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultate"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi netwerk verbinding"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"As toestel gesluit is"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Versteek sensitiewe kennisgewinginhoud"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Wys alle kennisgewinginhoud"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Moenie steur nie"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Moenie steur nie"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Kennisgewings"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Aanpassings"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programkennisgewings"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Stel Wi-Fi-NFC-merker op"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Skryf"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik \'n merker om te skryf …"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Ongeldige wagwoord, probeer weer."</string>
@@ -2143,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Kon nie data na NFC-merker skryf nie. As die probleem voortduur, probeer \'n ander merker"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-merker is nie skryfbaar nie. Gebruik asseblief \'n ander merker."</string>
     <string name="default_sound" msgid="8821684447333687810">"Verstekgeluid"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Klanke en kennisgewings"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Mediavolume"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Wekkervolume"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Luivolume"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Moenie steur nie"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Wanneer oproepe en kennisgewings opdaag"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Lui"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibreer pleks van om te lui"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Moenie lui of vibreer nie"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Foon-luitoon"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Verstekkennisgewingluitoon"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreer wanneer dit lui"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Wys tans kennisgewings"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Flikker kennisgewing-liggie"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"As toestel gesluit is"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Wys alle kennisgewinginhoud"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Versteek sensitiewe kennisgewinginhoud"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Moet glad nie kennisgewings wys nie"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Wanneer moenie steur nie aan is"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Versteek nuwe kennisgewings van die lys af"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Wys alle kennisgewings op die lys"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Programkennisgewings"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Raakklanke"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Belbladtone"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Skermsluiting en -ontsluiting"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Ander raakklanke"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibreer by aanraking"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Kennisgewingtoegang"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programme kan nie kennisgewings lees nie"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d program kan kennisgewings lees"</item>
+    <item quantity="other" msgid="980049191810249052">"%d programme kan kennisgewings lees"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Geen kennisgewingluisteraars is geïnstalleer nie."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Aktiveer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sal alle kennisgewings kan lees wat deur die stelsel of deur enige geïnstalleerde program geplaas is, wat dalk persoonlike inligting soos kontakname en die teks van boodskappe wat na jou gestuur is, kan insluit. Dit sal ook hierdie kennisgewings kan verwerp of handelingknoppies daarbinne kan aanraak."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Voorwaardesverskaffers"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Geen programme voorsien voorwaardes nie"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d program voorsien voorwaardes"</item>
+    <item quantity="other" msgid="358057362115673258">"%d programme voorsien voorwaardes"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Geen voorwaardeverskaffers is geïnstalleer nie."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Aktiveer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> sal uitgaanvoorwaardes by die Moenie steur nie-modus kan voeg."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Laai tans programme …"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Wys kennisgewings"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Hoë prioriteit"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Wys boaan die lys"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Versteek sensitiewe inhoud wanneer toestel gesluit is"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Geblokkeer"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Boaan lys"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitief"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klaar"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Af"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Aan"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Totdat jy dit afskakel"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokkeer al onderbrekings behalwe"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Snags"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Ander outomatisasie"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Skakel outomaties aan"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nooit"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Foonoproepe"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Boodskappe"</string>
@@ -2171,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Begintyd"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindigtyd"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> volgende dag"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programkennisgewings"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Kennisgewingsinstellings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Stuur terugvoer oor hierdie toestel"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index a245547..4f65adf 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"አሁን ገንቢ ሆነዋል!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"አያስፈልግም፣ አስቀድሞ ገንቢ ሆነዋል።"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"ገመድ አልባ&amp; አውታረ መረቦች"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"መሣሪያ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"የግል"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"ስርዓት"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"ሬዲዮ አብራ"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"ሬዲዮ አጥፋ"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"SMS በ IMS ላይ አብራ"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"የአስተናጋጁ መስክ ባዶ ከሆነ የወደብ መስኩ ባዶ መሆን አለበት።"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"የተየብከው ወደብ ትክክል አይደለም።"</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"አሳሹ የHTTP ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</string>
-    <string name="proxy_url" msgid="2523518669129974654">"ፒ ኤ ሲ ዩ አር ኤል፦ "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"ፒ ኤ ሲ ዩአርኤል፦ "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"ስፍራ:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"አጎራባችCID፡"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo፦"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ማመስጠሪያ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ስልክ አመስጥር"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ጡባዊዎን ባበሩ ቁጥር ለመፍታት የቁጥር ፒን   ወይም ይለፍ ቃል ጠይቅ"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ስልክዎን በአበሩ ቁጥር ለመፍታት የቁጥር ፒን   ወይም ይለፍ ቃል ጠይቅ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ተመሳጥሯል"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ይችላሉ። ጡባዊ ተኮዎን ምስጠራ አፈታት አንዴ ካደረጉ በኋላ፣በእያንዳንዱ ጊዜ ሲያበሩት ላለማመሳጠር የቁጥር ፒን ወይም የይለፍ ቃል መተየብ ያስፈልግዎታል፡- የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ጡባዊ ተኮዎን አለማመሳጠር አይችሉም፤ሁሉንም ውሂብ በማጥፋት።\n\n ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብዎ እና ምስጠራ እስኪጠናቀቅ ጡባዊ ተኮዎ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጡ፣ውሂብዎን አንዳንዱን ወይም ሁሉንም ያጣሉ።"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"መለያዎችን፣ ቅንብሮች ፣የወረዱ መተግበሪያዎች እና የነሱን ውሂብ፣ማህደረ  መረጃ ፣እና ሌላ ፋይሎች ማመሳጠር ትችላለህ።  ስልክህን ምስጠራ አፈታት አንዴ ካደረክ በኋላ፣በእያንዳንዱ ጊዜ ስታበራው ላለማመሳጠር የቁጥር ፕን ወይም የይለፍ ቃል መተየብ ያስፈልግሃል። የፋብሪካው ውሂብ ዳግም አስጀምር በመተግበር በስተቀር ስልክህን አለማመሳጠር አትችልም፤ሁሉንም ውሂብ በማጥፋት።\n\n ምስጠራ አንድ ሰዓት ወይም ከዛ በላይ ሊፈጅ ይችላል። በተሞላ ባትሪ መጀመር አለብህ እና ምስጠራ እስኪጠናቀቅ ስልክህ እንደተሰካ ይሁን።የምስጠራውን ሂደት ካቋረጥክ፣ውሂብህን አንዳንዱን ወይም ሁሉንም ታጣለህ።"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"የመሣሪያ አስተዳደሮችን እይ ወይም አቦዝን"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"የተአማኒነት ወኪሎች"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"የተአማኒነት ወኪሎችን ይመልከቱ ወይም ገቢር ያልሆነ ያድርጉ"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"የማሳወቂያ መዳረሻ"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"መተግበሪያዎች ማሳወቂያዎችን ማንበብ አይችሉም"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"የ%d መተግበሪያ ማሳወቂያዎችን ማንበብ ይችላል"</item>
-    <item quantity="other" msgid="980049191810249052">"የ%d መተግበሪያዎች ማሳወቂያዎችን ማንበብ ይችላሉ"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"ምንም የማሳወቂያ አዳማጮች አልተጫኑም።"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> ይንቃ?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> በስርዓቱ ወይም በማንኛውም የተጫነ መተግበሪያ የተለጠፉ ማሳወቂያዎችን ማንበብ ይችላል፣ ይህን እንደ የእውቂያ ስሞች እና ለእርስዎ የተላኩ የመልዕክቶች ጽሑፍ ያለ የግል መረጃ ሊያካትት ይችላል። እንዲሁም እነዚህ ማሳወቂያዎችን ወይም በእነሱ ውስጥ ያሉ የነክቶ እርምጃ አዝራሮችን  ሊያሰናብት ይችላል።"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"የሁኔታ አቅራቢዎች"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ምንም መተግበሪያዎች ሁኔታዎችን አያቀርቡም"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d መተግበሪያ ሁኔታዎችን ያቀርባል"</item>
-    <item quantity="other" msgid="358057362115673258">"%d መተግበሪያዎች ሁኔታዎችን ያቀርባል"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"ምንም ሁኔታ አቅራቢዎች አልተጫኑም።"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> ይንቃ?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> በአይረብሹ ሁነታ ላይ የመውጫ ሁኔታዎችን ማከል ይችላል።"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ብሉቱዝ"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">" ብሉቱዝ አብራ"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"ብሉቱዝ"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ወደ አውታረ መረብ አያይዝ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"አውታረ መረብ እርሳ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"አውታረ መረብ ቀይር"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"የWi‑Fi አውታረ መረቡን የመቀየር ፍቃድ የሉዎትም።"</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS አለ"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"በ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"፣ በ<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> የተጠበቀ"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"የአውታረ መረብ ይለፍ ቃልዎን ያስገቡ።"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"የለም"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> የአካባቢ ትክክለኛነትን ለማሻሻል እና ለሌሎች ዓላማዎች የአውታረ መረብ መቃኘትን ማብራት ይፈልጋል፣ Wi-Fi ጠፍቶ ቢሆንም እንኳ።\n\nይሄ ለሁሉም መቃኘት ለሚፈልጉ መተግበሪያዎች ይፈቀድ?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ፍቀድ"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"መነሻ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"አሳይ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ድምፅ"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"ድምፆች"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"የሙዚቃ ማሳመሪያዎች"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"የስልክ ጥሪ ድምፅ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ፀጥ ሲል ንዘር"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ነባሪ የማሳወቂያ ድምጽ"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"የማሳወቂያ ብርሃን አሳይ"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"ከፍተኛ ትኩረት ያለው ከሆነ ብቅ አድርግ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"የስልክ ጥሪ ድምፅ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ማሳወቂያ"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"ሙዚቃ ድምጸ ከል አድርግ &amp; ሌላ ማህደረ  መረጃ"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"የማሳወቂያ ድምፅ አጥፋ"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"ማንቂያ ደወሎችን ድምጸ ከል አድርግ"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"በሚደወልበት ጊዜ ንዘር"</string>
     <string name="dock_settings" msgid="1820107306693002541">"ትከል"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">" ቅንብሮችን ትከል"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"ኦዲዮ"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"ብሩህነት"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"የማያ ብሩህነት አስተካክል"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"አንቀላፋ"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"የUSB አራሚ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB ሲያያዝ የአርም ሁኔታ"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"የዩ ኤስ ቢ ስህተት ማረም ፈቀዳዎችን ይሻሩ"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"የኃይል ምናሌ ሳንካ ሪፖርቶች"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"የሳንካ ሪፖርት ለመውሰድ የኃይል ምናሌ ውስጥ አማራጩን ያካትቱ"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"ነቅተህ ቆይ"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ማያኃይል በመሙላት ላይበፍፁም አይተኛም"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"የብሉቱዝ HCI ስለላ ምዝግብ ማስታወሻን ያንቁ"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ቅላፄ"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"የሚነገረው ፅሁፍ ድምፅ ላይ ተፅዕኖ ያሳድራል"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ቋንቋ"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"የስርዓት ቋንቋ ተጠቀም"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"ቋንቋ አልተመረጠም"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"ለሚነገረው ፅሁፍ ቋንቋ-ተኮር ድምፅ አዘጋጅ"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"ምሳሌውን አዳምጥ"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"የ4G MAC አድራሻ"</string>
     <string name="enter_password" msgid="4131758584074246224">"ማከማቻ ለመፍታት የይለፍ ቃል ተይብ"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"በድጋሚ ሞክር::"</string>
     <string name="delete" msgid="4219243412325163003">"ሰርዝ"</string>
     <string name="misc_files" msgid="6720680815969643497">"ልዩ ልዩ ፋይሎች"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"የቅርጸ-ቁምፊ መጠን ይቀይሩ"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"መታ አድርገው ይክፈሉ"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"አንድ ጊዜ ብቻ መታ በማድረግ ይክፈሉ"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"የፊት መተግበሪያ ምረጥ"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"ተጨማሪ ይወቁ"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"መተግበሪያዎችን አግኝ"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"እንደ ምርጫዎ ሆኖ ይዘጋጅ?"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"የቅርብ ጊዜ ፍለጋዎች"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ውጤቶች"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"የwifi wi-fi አውታረ መረብ ግንኙነት"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"መሣሪያ ሲቆለፍ"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ሚስጥራዊነት ያለው የማሳወቂያ ይዘት ደብቅ"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ሁሉንም የማሳወቂያ ይዘቶችን አሳይ"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"አትረብሽ"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"አትረብሽ"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"ማሳወቂያዎች"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"ማስተካከያዎች"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"የመተግበሪያ ማሳወቂያዎች"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"የWiFi NFC መለያ ያዋቅሩ"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"ጻፍ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ለመጻፍ አንድ መለያ መታ ያድርጉ..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"ልክ ያልሆነ የይለፍ ቃል፣ እንደገና ይሞክሩ።"</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"ውሂብ በNFC መለያ ላይ መጻፍ አልተቻለም። ችግሩ ከቀጠለ የተለየ መለያ ይሞክሩ"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"የNFC መለያ ሊጻፍበት የሚችል አይደለም። እባክዎ የተለየ መለያ ይጠቀሙ።"</string>
     <string name="default_sound" msgid="8821684447333687810">"ነባሪ ድምፅ"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"አትረብሽ"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"የስልክ ጥሪ ድምፅ"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"በሚደወልበት ጊዜ ንዘር"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"የማሳወቂያ ብርሃን አሳይ"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ሁሉንም የማሳወቂያ ይዘቶችን አሳይ"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ሚስጥራዊነት ያለው የማሳወቂያ ይዘት ደብቅ"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"የመተግበሪያ ማሳወቂያዎች"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"መተግበሪያዎች ማሳወቂያዎችን ማንበብ አይችሉም"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"የ%d መተግበሪያ ማሳወቂያዎችን ማንበብ ይችላል"</item>
+    <item quantity="other" msgid="980049191810249052">"የ%d መተግበሪያዎች ማሳወቂያዎችን ማንበብ ይችላሉ"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"ምንም የማሳወቂያ አዳማጮች አልተጫኑም።"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> ይንቃ?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> በስርዓቱ ወይም በማንኛውም የተጫነ መተግበሪያ የተለጠፉ ማሳወቂያዎችን ማንበብ ይችላል፣ ይህን እንደ የእውቂያ ስሞች እና ለእርስዎ የተላኩ የመልዕክቶች ጽሑፍ ያለ የግል መረጃ ሊያካትት ይችላል። እንዲሁም እነዚህ ማሳወቂያዎችን ወይም በእነሱ ውስጥ ያሉ የነክቶ እርምጃ አዝራሮችን  ሊያሰናብት ይችላል።"</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"የሁኔታ አቅራቢዎች"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ምንም መተግበሪያዎች ሁኔታዎችን አያቀርቡም"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d መተግበሪያ ሁኔታዎችን ያቀርባል"</item>
+    <item quantity="other" msgid="358057362115673258">"%d መተግበሪያዎች ሁኔታዎችን ያቀርባል"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"ምንም ሁኔታ አቅራቢዎች አልተጫኑም።"</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> ይንቃ?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> በአይረብሹ ሁነታ ላይ የመውጫ ሁኔታዎችን ማከል ይችላል።"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"መተግበሪያዎችን በመጫን ላይ..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"ማሳወቂያዎችን አሳይ"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"ከፍተኛ ቅድሚያ የሚሰጠው"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ተከናውኗል"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"ጠፍቷል"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"በርቷል"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"ይህን እስኪያጠፉት ድረስ"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"ከሚከተሉት በስተቀር ሁሉንም ማቋረጦች አግድ፦"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"ማታ ላይ"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"ሌላ ራስ-ሰር ስራ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"በራስ-ሰር አብራ"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">"፣"</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"በጭራሽ"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"የስልክ ጥሪዎች"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"መልዕክቶች"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"የሚጀምርበት ጊዜ"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"የሚያበቃበት ጊዜ"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ቀጣዩ ቀን"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"የመተግበሪያ ማሳወቂያዎች"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"የማሳወቂያ ቅንብሮች"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ስለዚህ መሣሪያ ግብረመልስ ላክ"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index ef6672a..67cf3d1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"لقد أصبحت الآن مطور برامج!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"لا حاجة لذلك، فأنت مطور برامج فعلاً."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"اللاسلكي والشبكات"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"الجهاز"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"شخصي"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"النظام"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"اللاسلكية والشبكات"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"الجهاز"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"شخصي"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"النظام"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"تشغيل اللاسلكي"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"إيقاف اللاسلكي"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"‏تشغيل الرسائل القصيرة SMS عبر الرسائل الفورية"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"التشفير"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"تشفير الجهاز اللوحي"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"تشفير الهاتف"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"‏يلزم توفير رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفير الجهاز اللوحي في كل مرة يتم فيها تشغيله"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"‏يلزم توفير رقم تعريف شخصي (PIN) رقمي أو كلمة مرور لفك تشفير الهاتف في كل مرة يتم فيها تشغيله"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"مشفّر"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الجهاز اللوحي، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير جهازك اللوحي إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات.\n\nتستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل الجهاز اللوحي بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"يمكنك تشفير الحسابات والإعدادات والتطبيقات التي تم تنزيلها وبياناتها والوسائط والملفات الأخرى. بعد تشفير الهاتف، يلزمك إدخال رقم تعريف شخصي رقمي أو كلمة مرور لإلغاء تشفيره عند كل مرة تجري فيها تشغيله: يتعذر عليك إلغاء تشفير هاتفك إلا عند إجراء إعادة ضبط بحسب بيانات المصنع وهو ما يؤدي إلى محو جميع البيانات.\n\nتستغرق عملية التشفير ساعة أو أكثر. يجب البدء ببطارية مشحونة والإبقاء على توصيل هاتفك بمصدر الكهرباء حتى تنتهي عملية التشفير. إذا تمت مقاطعة عملية التشفير، فستفقد بعض بياناتك أو كلها."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"يمكنك تشفير حساباتك وإعداداتك وتطبيقاتك التي تم تنزيلها وملفات بياناتها وملفات وسائطها وغيرها من الملفات. بعد تشفير جهازك اللوحي، ومع افتراض أنك اخترت إعداد قفل الشاشة (باستخدام نمط أو رقم تعريف شخصي أو كلمة مرور رقمية)، ستحتاج لإلغاء قفل الشاشة لفك تشفير الجهاز اللوحي في كل مرة يتم فيها تشغيله. الطريقة الأخرى الوحيدة لفك التشفير هي إعادة الضبط بحسب بيانات المصنع، مما يؤدي إلى محو جميع بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. يتعين عليك بدء عملية التشفير ببطارية مشحونة وتوصيل الجهاز اللوحي بمصدر طاقة طوال فترة العملية؛ حتى لا تفقد بعض بياناتك أو جميعها عند حدوث عطل."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"يمكنك تشفير حساباتك وإعداداتك وتطبيقاتك التي تم تنزيلها وملفات بياناتها وملفات وسائطها وغيرها من الملفات. بعد تشفير هاتفك، ومع افتراض أنك اخترت إعداد قفل الشاشة (باستخدام نمط أو رقم تعريف شخصي أو كلمة مرور رقمية)، ستحتاج لإلغاء قفل الشاشة لفك تشفير الهاتف في كل مرة يتم فيها تشغيله. الطريقة الأخرى الوحيدة لفك التشفير هي إعادة الضبط بحسب بيانات المصنع، مما يؤدي إلى محو جميع بياناتك.\n\nيستغرق التشفير ساعة أو أكثر. يتعين عليك بدء عملية التشفير ببطارية مشحونة وتوصيل الهاتف بمصدر طاقة طوال فترة العملية؛ حتى لا تفقد بعض بياناتك أو جميعها عند حدوث عطل."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"تشفير الجهاز اللوحي"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"تشفير الهاتف"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"اشحن البطارية وأعد المحاولة."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"عرض مشرفي الأجهزة أو إلغاء تنشيطهم"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"الوكلاء المعتمدون"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"عرض الوكلاء المعتمدين أو إلغاء تنشيطهم"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"الدخول إلى الإشعارات"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"لا يُمكن للتطبيقات قراءة الإشعارات"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"‏يُمكن لتطبيق %d قراءة الإشعارات"</item>
-    <item quantity="other" msgid="980049191810249052">"‏يُمكن لتطبيقات %d قراءة الإشعارات"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"لم يتم تثبيت برامج لتلقّي الإشعارات الصوتية."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"هل ترغب في تمكين <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"سيتمكن <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> من قراءة جميع الإشعارات التي تمّ نشرها من قِبل النظام أو أي من التطبيقات المثبتة، والتي قد تنطوي على معلومات شخصية مثل أسماء جهات الاتصال ونص الرسائل المرسلة إليك. وسيتمكن أيضًا من تجاهل هذه الإشعارات أو لمس أزرار الإجراءات بداخلها."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"موفرو الحالات"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ليست هناك تطبيقات توفر الحالات"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"‏%d تطبيق يوفر الحالات"</item>
-    <item quantity="other" msgid="358057362115673258">"‏%d من التطبيقات توفر الحالات"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"لم يتم تثبيت أي موفر للحالات."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"هل ترغب في تمكين <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> سيتمكن من إضافة حالات الخروج إلى وضع \"الرجاء عدم الإزعاج\"."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"بلوتوث"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"تشغيل البلوتوث"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"بلوتوث"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال بالشبكة"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"حذف الشبكة"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"تعديل الشبكة"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"‏ليس لديك إذن لتغيير شبكة Wi‑Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS متاح)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، محمي باستخدام <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"أدخل كلمة مرور الشبكة."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"لا شيء"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏لتحسين مستوى دقة تحديد الموقع ولأغراض أخرى، يحتاج <xliff:g id="APP_NAME">%1$s</xliff:g> إلى تشغيل البحث عن الشبكات، حتى مع إيقاف Wi-Fi.\n\nهل تريد السماح بذلك لجميع التطبيقات التي تحتاج إلى فحص؟"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"سماح"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"الشاشة الرئيسية"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"عرض"</string>
     <string name="sound_settings" msgid="5534671337768745343">"الصوت"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"مستويات الصوت"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"تأثيرات موسيقية"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"مستوى صوت الرنين"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"اهتزاز عند تشغيل الوضع صامت"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"صوت الإشعار الافتراضي"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"ضوء الاشعار بالنبض"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"إشعار منبثق مع أولوية عالية"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"نغمة الرنين"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"التنبيه"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"كتم صوت الموسيقى والوسائط الأخرى"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"كتم صوت الإشعارات"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"كتم صوت الاشعارات"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"اهتزاز عند الرنين"</string>
     <string name="dock_settings" msgid="1820107306693002541">"إرساء"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"إعدادات الإرساء"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"إعدادات الصوت"</string>
@@ -758,8 +738,13 @@
     <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="2354961343555249270">"السطوع"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"ضبط سطوع الشاشة"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"السكون"</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>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"‏تصحيح أخطاء USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"‏وضع تصحيح الأخطاء عند توصيل USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"‏إلغاء عمليات تفويض تصحيح أخطاء USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"تقارير الخطأ في قائمة الطاقة"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"تضمين خيار في قائمة الطاقة لإنشاء تقرير الأخطاء"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"البقاء في الوضع النشط"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"لا يتم مطلقًا دخول الشاشة في وضع السكون أثناء الشحن"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"تمكين سجل تطفل بواجهة وحدة تحكم المضيف عبر بلوتوث"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"الجيل الرابع"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏عنوان 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"اكتب كلمة المرور لتشفير وحدة التخزين"</string>
+    <string name="enter_pin" msgid="286221169871526876">"أدخل رقم التعريف الشخصي لفك تشفير وحدة التخزين"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"ارسم نمطك لفك تشفير وحدة التخزين"</string>
     <string name="try_again" msgid="4272075051293936921">"أعد المحاولة."</string>
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6720680815969643497">"ملفات متنوعة"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"تغيير حجم الخط"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"انقر وادفع"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"الدفع بنقرة واحدة"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"تفضيل التطبيق الأمامي"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"مزيد من المعلومات"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"البحث عن تطبيقات"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"هل تريد تعيينه كتفضيل؟"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"عمليات البحث التي تمت مؤخرًا"</string>
     <string name="search_results_label" msgid="4163304782363526148">"النتائج"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏اتصال شبكة واي فاي wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"عند قفل الجهاز"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"إخفاء المحتوى المهم للإشعارات"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"عرض كل محتوى الإشعارات"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"الرجاء عدم الإزعاج"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"الرجاء عدم الإزعاج"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"الإشعارات"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"التعديلات"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"إشعارات التطبيقات"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"‏علامة NFC لإعداد WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"كتابة"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"انقر على كلمة علامة لكتابة..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"كلمة المرور غير صالحة، أعد المحاولة."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"‏تعذرت كتابة البيانات إلى علامة NFC. إذا استمرت المشكلة، فجرّب علامة مختلفة."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏علامة NFC ليست قابلة للكتابة. الرجاء استخدام علامة مختلفة."</string>
     <string name="default_sound" msgid="8821684447333687810">"الصوت الافتراضي"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"الأصوات والإشعارات"</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="zen_mode_settings_title" msgid="2689740350895257590">"الرجاء عدم الإزعاج"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"عند تلقي المكالمات والإشعارات"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"رنين"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"اهتزاز بدلاً من الرنين"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"عدم الرنين أو الاهتزاز"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"نغمة رنين الهاتف"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"نغمة رنبن الإشعارات الافتراضية"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"اهتزاز عند الرنين"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"إظهار الإشعارات"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"ضوء الاشعار بالنبض"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"عند قفل الجهاز"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"عرض كل محتوى الإشعارات"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"إخفاء المحتوى المهم للإشعارات"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"عدم عرض إشعارات على الإطلاق"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"عند تشغيل \"عدم الإزعاج\""</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"إخفاء الإشعارات الجديدة من القائمة"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"إظهار جميع الإشعارات في القائمة"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"إشعارات التطبيقات"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"أصوات اللمس"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"نغمات لوحة الاتصال"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"قفل الشاشة وإلغاء قفلها"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"أصوات عمليات اللمس الأخرى"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"الاهتزاز عند اللمس"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"الدخول إلى الإشعارات"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"لا يُمكن للتطبيقات قراءة الإشعارات"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"‏يُمكن لتطبيق %d قراءة الإشعارات"</item>
+    <item quantity="other" msgid="980049191810249052">"‏يُمكن لتطبيقات %d قراءة الإشعارات"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"لم يتم تثبيت برامج لتلقّي الإشعارات الصوتية."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"هل ترغب في تمكين <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"سيتمكن <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> من قراءة جميع الإشعارات التي تمّ نشرها من قِبل النظام أو أي من التطبيقات المثبتة، والتي قد تنطوي على معلومات شخصية مثل أسماء جهات الاتصال ونص الرسائل المرسلة إليك. وسيتمكن أيضًا من تجاهل هذه الإشعارات أو لمس أزرار الإجراءات بداخلها."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"موفرو الحالات"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ليست هناك تطبيقات توفر الحالات"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"‏%d تطبيق يوفر الحالات"</item>
+    <item quantity="other" msgid="358057362115673258">"‏%d من التطبيقات توفر الحالات"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"لم يتم تثبيت أي موفر للحالات."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"هل ترغب في تمكين <xliff:g id="SERVICE">%1$s</xliff:g>؟"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> سيتمكن من إضافة حالات الخروج إلى وضع \"الرجاء عدم الإزعاج\"."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"جارٍ تحميل التطبيقات..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"إظهار الإشعارات"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"أولوية عالية"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"عرض على رأس القائمة"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"إخفاء المحتوى الحساس عند قفل الجهاز"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"محظور"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"رأس القائمة"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"حساس"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"تم"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"إيقاف"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"تشغيل"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"لحين تعطيل هذا الإعداد"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"حظر جميع المقاطعات باستثناء"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"في الليل"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"استخدام آلي آخر"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"تشغيل تلقائي"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">"،"</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">"،"</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"مطلقًا"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"مكالمات هاتفية"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"الرسائل"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"وقت البدء"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"وقت الانتهاء"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> في اليوم التالي"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"إشعارات التطبيقات"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"إعدادات الإشعارات"</string>
     <string name="device_feedback" msgid="3238056036766293294">"إرسال تعليقات حول هذا الجهاز"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 7ae523b..51cfa43 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Вече сте програмист!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не е необходимо – вече сте програмист."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"КАБЕЛНИ И БЕЗЖИЧНИ МРЕЖИ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"УСТРОЙСТВО"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНИ"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМНИ"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Включване на радио"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Изключване на радио"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Включване на SMS през услугата за незабавни съобщения"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифроване"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифроване на таблета"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифроване на телефона"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Изисква се цифров PIN код или парола за разшифроване на таблета ви при всяко включване"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Изисква се цифров PIN код или парола за разшифроване на телефона ви при всяко включване"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за таблета си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни.\n\nШифроването отнема най-малко един час. Трябва да започнете със заредена батерия и таблетът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифровате своите профили, настройки, изтеглени приложения и данните им, мултимедийни и други файлове. След като направите това за телефона си, трябва да въвеждате цифров ПИН код или парола, за да го разшифровате при всяко включване. Не можете да отмените процеса освен чрез възстановяване на фабричните настройки, което ще изтрие всичките ви данни.\n\nШифроването отнема най-малко един час. Трябва да започнете със заредена батерия и телефонът ви да е включен към захранването, докато процесът завърши. Ако го прекъснете, ще загубите някои или всичките си данни."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Преглед или деактивиране на администраторите на устройството"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Преглед или деактивиране на trust agents"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Достъп до известията"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Приложенията не могат да четат известията"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d приложение може да чете известията"</item>
-    <item quantity="other" msgid="980049191810249052">"%d приложения могат да четат известията"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Няма инсталирани слушатели на известия."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Да се активира ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ще може да чете всички известия, публикувани от системата или инсталирано приложение, които може да включват лична информация, като имена за връзка и текста на изпратените до вас съобщения. Също така ще може да отхвърля тези известия или да докосва бутоните за действие в тях."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Доставчици на условия"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Няма приложения, които предоставят условия"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d приложение предоставя условия"</item>
-    <item quantity="other" msgid="358057362115673258">"%d приложения предоставят условия"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Няма инсталирани доставчици на условия."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Да се активира ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ще може да добавя условия за изход към режима „Не ме безпокойте“."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включване на Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Свързване с мрежа"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Забравяне на мрежа"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Промяна на мрежа"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"Нямате разрешение да променяте Wi‑Fi мрежата."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Налице е WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защитено с <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Въведете паролата за мрежата."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"За да подобри точността на местоположението и за други цели, <xliff:g id="APP_NAME">%1$s</xliff:g> иска да включи сканирането за мрежи дори когато Wi-Fi е изключен.\n\nИскате ли да разрешите това за всички приложения, които искат да сканират?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешаване"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Начало"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дисплей"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Сила на звука"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Музикални ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Сила на звука при звънене"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрира при тих режим"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Стандартен звук за известяване"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсиране на светлината за известия"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Изскачане при висок приоритет"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Известие"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Спиране на музиката и другата мултимедия"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Спиране на известията"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Спиране на алармите"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Да вибрира при звънене"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Докинг станция"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Настройки за докинг станция"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Аудио"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"Яркост"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Наглася яркостта на екрана"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Спящ режим"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Отстраняване на грешки през USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим за отстраняване на грешки, когато е свързано USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Отмяна на упълномощаванията за отстраняване на грешки през USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Сигнали за програмни грешки в менюто за захранване"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Включване на опцията за получаване на сигнал за програмна грешка в менюто за захранване"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Да остане активен"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма да е в спящ режим при зареждане"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Активиране на регистрационния файл за анализ на пакетите в команден ред за Bluetooth с протокола HCI"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Височина"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Отразява се на тона на изговорения текст"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Език"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Използване на системния език"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Езикът не е избран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Задава глас за конкретен език за изговорения текст"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Чуйте пример"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"MAC адрес за 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Въведете паролата, за да разшифровате хранилището"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Опитайте отново."</string>
     <string name="delete" msgid="4219243412325163003">"Изтриване"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разни файлове"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Промяна на размера на шрифта"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Докоснете и платете"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Платете само с едно докосване"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Приложението на преден план да е с приоритет"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Научете повече"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Намиране на приложения"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Да се зададе ли като ваше предпочитание?"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Скорошни търсения"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Резултати"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"Връзка с WiFi/Wi-Fi мрежа"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Когато у-вото е заключено"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Скриване на деликатното съдържание в известията"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показване на цялото съдържание от известията"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Не ме безпокойте"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не ме безпокойте"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Известия"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Фини настройки"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известия за прилож."</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Настройване на маркер за КБП за WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Записване"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"За записване докоснете маркер..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Невалидна парола. Опитайте отново."</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Записването на данни в маркера за КБП не е възможно. Ако проблемът не се отстрани, опитайте с друг маркер"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Записването в маркера за КБП не е възможно. Моля, използвайте друг."</string>
     <string name="default_sound" msgid="8821684447333687810">"Стандартен звук"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не ме безпокойте"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Мелодия на телефон"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Да вибрира при звънене"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсиране на светлината за известия"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показване на цялото съдържание от известията"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Скриване на деликатното съдържание в известията"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Известия за приложенията"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Приложенията не могат да четат известията"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d приложение може да чете известията"</item>
+    <item quantity="other" msgid="980049191810249052">"%d приложения могат да четат известията"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Няма инсталирани слушатели на известия."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Да се активира ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ще може да чете всички известия, публикувани от системата или инсталирано приложение, които може да включват лична информация, като имена за връзка и текста на изпратените до вас съобщения. Също така ще може да отхвърля тези известия или да докосва бутоните за действие в тях."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Доставчици на условия"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Няма приложения, които предоставят условия"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d приложение предоставя условия"</item>
+    <item quantity="other" msgid="358057362115673258">"%d приложения предоставят условия"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Няма инсталирани доставчици на условия."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Да се активира ли <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ще може да добавя условия за изход към режима „Не ме безпокойте“."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Приложенията се зареждат..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Показване на известията"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Висок приоритет"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Изключено"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Включено"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Докато не изключите това"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Блокиране на всички прекъсвания освен"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"През нощта"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Друго автоматизиране"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматично включване"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никога"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Телефонни обаждания"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Съобщения"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Начален час"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Краен час"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> на следващия ден"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Известия за прилож."</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки за известяване"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Изпращане на отзиви за устройството"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 761a4c6..45daae7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ara ja ets un desenvolupador"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No és necessari, ja ets un desenvolupador"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"Connexions sense fil i xarxes"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIU"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Connexions sense fil i xarxes"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Dispositiu"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Activa el senyal mòbil"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desactiva el senyal mòbil"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Activa SMS a través d\'IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptació"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptació de la tauleta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encripta el telèfon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Sol·licita un PIN numèric o una contrasenya per desencriptar la tauleta cada vegada que s\'engegui"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Sol·licita un PIN numèric o una contrasenya per desencriptar el telèfon cada vegada que s\'engegui"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pots encriptar els comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptada la teva tauleta, has d\'introduir un PIN numèric o una contrasenya per desencriptar-la cada vegada que l\'engeguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades).\n\nEl procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis la tauleta connectada fins que no s\'hagi completat l\'encriptació. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pots encriptar els comptes, les configuracions, les aplicacions baixades i les seves dades, els elements multimèdia i altres fitxers. Una vegada encriptat el telèfon, necessitaràs un PIN numèric o contrasenya per desencriptar-lo cada vegada que l\'encenguis (només podràs desencriptar-la restablint les dades de fàbrica i esborrant-ne totes les dades).\n\nEl procés d\'encriptació triga fins a una hora. Cal que iniciïs aquest procés amb la bateria carregada i que mantinguis el telèfon connectat fins que no s\'hagi completat l\'encriptació. Si s\'interromp el procés d\'encriptació, perdràs totes les teves dades o bé una part."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Pots encriptar els teus comptes, la configuració, les aplicacions baixades i les seves dades, el contingut multimèdia i altres fitxers. Després d\'encriptar la tauleta, sempre que hagis configurat una pantalla de bloqueig (és a dir, un patró o un PIN o contrasenya numèrics), hauràs de desbloquejar la pantalla per desencriptar la tauleta cada vegada que l\'engeguis. L\'única manera alternativa per desencriptar-la és dur a terme un restabliment de les dades de fàbrica, el qual esborrarà totes les teves dades.\n\nEl procés d\'encriptació dura una hora com a mínim. Has de començar amb la bateria carregada i mantenir connectat el telèfon durant tot el procés. Si s\'interromp el procés, pot ser que perdin algunes de les teves dades (o totes)."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Pots encriptar els teus comptes, la configuració, les aplicacions baixades i les seves dades, el contingut multimèdia i altres fitxers. Després d\'encriptar el telèfon, sempre que hagis configurat una pantalla de bloqueig (és a dir, un patró o un PIN o contrasenya numèrics), hauràs de desbloquejar la pantalla per desencriptar el telèfon cada vegada que l\'engeguis. L\'única manera alternativa per desencriptar-lo és dur a terme un restabliment de les dades de fàbrica, el qual esborrarà totes les teves dades.\n\nEl procés d\'encriptació dura una hora com a mínim. Has de començar amb la bateria carregada i mantenir connectat el telèfon durant tot el procés. Si s\'interromp el procés, pot ser que perdin algunes de les teves dades (o totes)."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encripta la tauleta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encripta el telèfon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carrega la bateria i torna-ho a provar."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Mostra o desactiva els administradors de dispositiu"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agents de confiança"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Mostra o desactiva els agents de confiança."</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Accés a les notificacions"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les aplicacions no poden llegir notificacions"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicació pot llegir notificacions."</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicacions poden llegir notificacions."</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"No hi ha cap detector de notificacions instal·lat."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vols activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions que publiqui el sistema o qualsevol aplicació instal·lada, que poden contenir informació personal com ara noms de contactes i el text dels missatges que rebeu. També podrà ometre-les o tocar els botons d\'acció que continguin."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveïdors de condicions"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No hi ha cap aplicació que proporcioni condicions."</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplicació proporciona condicions."</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplicacions proporcionen condicions."</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No hi ha cap proveïdor de condicions instal·lat."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vols activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrà afegir condicions de sortida al mode No molesteu."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activa el Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connecta\'t a 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>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"No tens permís per canviar la xarxa Wi‑Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida amb <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Escriu la contrasenya de la xarxa."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Cap"</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_confirm_allow" msgid="5355973075896817232">"Permet"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Pàgina d\'inici"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"So"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"To de trucada"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volum"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectes musicals"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra quan estigui en silenci"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"So de notificació predeterminat"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Llum de notificació"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Emergent amb prioritat alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"So de trucada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificació"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Silencia la música i altres fitxers multimèdia"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Silencia les notificacions"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Silencia les alarmes"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar en sonar"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Configuració de la base"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Àudio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Canvia d\'orientació automàticament en girar el telèfon"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Canvia l\'orientació automàticament en girar la tauleta"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Canvia d\'orientació automàticament en girar el telèfon"</string>
-    <string name="brightness" msgid="2354961343555249270">"Brillantor"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Repòs"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Depuració USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Activa el mode de depuració quan el dispositiu estigui connectat per USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revoca autoritzacions depuració USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Informe d\'error al menú d\'engegada"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclou una opció al menú d\'engegada per generar un informe d\'error"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no entra mai en mode de repòs si el dispositiu està carregant-se"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activa el registre de cerca HCI de Bluetooth"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"adreça MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Escriu la contrasenya per desxifrar l\'emmagatzematge"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Introdueix el PIN per desencriptar l\'emmagatzematge"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Dibuixa el patró per desencriptar l\'emmagatzematge"</string>
     <string name="try_again" msgid="4272075051293936921">"Torna-ho a provar."</string>
     <string name="delete" msgid="4219243412325163003">"Suprimeix"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fitxers diversos"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Canvi del cos de lletra"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toca i paga"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Paga amb només un toc"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Prioritza l\'aplicació en primer pla"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Més informació"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Cerca aplicacions"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Vols establir-ho com a preferència?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Cerques recents"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultats"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"connexió xarxa wifi wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Amb el dispositiu bloq."</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Amaga el contingut confidencial de les notificac."</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut a les notificacions."</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"No molesteu"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molesteu"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notificacions"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Retocs"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificacions de l\'aplicació"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configuració de l\'etiqueta NFC per a Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <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>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"No es poden escriure dades a l\'etiqueta NFC. Si el problema continua, prova-ho amb una altra etiqueta."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"No es pot escriure a l\'etiqueta NFC. Fes servir una altra etiqueta."</string>
     <string name="default_sound" msgid="8821684447333687810">"So predeterminat"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Sons i notificacions"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volum de multimèdia"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum de l\'alarma"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volum del to"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molesteu"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Quan les trucades i notificacions es reben"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Trucada"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibra en lloc de sonar"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Sense so ni vibració"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"To de trucada"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"So de notificació predeterminat"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar en sonar"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Es mostren notificacions"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Llum de notificació"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Amb el dispositiu bloquejat"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut a les notificacions."</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Amaga el contingut confidencial de les notificac."</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"No mostris cap notificació"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quan està en mode de no molestar"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Amaga les notificacions noves de la llista"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostra totes les notificacions de la llista"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificacions de l\'aplicació"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Sons en tocar"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons de teclat"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Bloqueig i desbloqueig de pantalla"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Altres sons tàctils"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrar en tocar"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Accés a les notificacions"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les aplicacions no poden llegir notificacions"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplicació pot llegir notificacions."</item>
+    <item quantity="other" msgid="980049191810249052">"%d aplicacions poden llegir notificacions."</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"No hi ha cap detector de notificacions instal·lat."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vols activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrà llegir totes les notificacions que publiqui el sistema o qualsevol aplicació instal·lada, que poden contenir informació personal com ara noms de contactes i el text dels missatges que rebeu. També podrà ometre-les o tocar els botons d\'acció que continguin."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveïdors de condicions"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No hi ha cap aplicació que proporcioni condicions."</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d aplicació proporciona condicions."</item>
+    <item quantity="other" msgid="358057362115673258">"%d aplicacions proporcionen condicions."</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"No hi ha cap proveïdor de condicions instal·lat."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vols activar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrà afegir condicions de sortida al mode No molesteu."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"S\'estan carregant les aplicacions..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostra les notificacions"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioritat alta"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Mostra-ho a la part superior de la llista"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Amaga el contingut delicat quan el dispositiu estigui bloquejat"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloquejat"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Part sup. de llista"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delicat"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fet"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Desactivat"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Activat"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Fins que no ho desactivis"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloqueja totes les interrupcions excepte"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"A la nit"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Altres automatitzacions"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activació automàtica"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mai"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Trucades"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Missatges"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora d\'inici"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalització"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> del dia següent"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificacions de l\'aplicació"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuració de les notificacions"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Comentaris sobre aquest dispositiu"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 4473ba3..4a6f1d3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Voilà! Stal se z vás vývojář."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Není potřeba, již jste vývojář."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÁTOVÁ PŘIPOJENÍ A SÍTĚ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ZAŘÍZENÍ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"OSOBNÍ"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTÉM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Bezdrátová připojení a sítě"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Zařízení"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Osobní"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Systém"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Zapnout rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Vypnout rádio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Zapnout zprávy SMS prostřednictvím IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrování"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovat tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrování telefonu"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Při každém zapnutí tabletu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Při každém zapnutí telefonu vyžadovat kód PIN nebo heslo za účelem dešifrování"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrováno"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování tabletu je třeba při každém zapnutí zadat číselný kód PIN nebo heslo, kterým ho opět dešifrujete. Zašifrování tabletu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data.\n\nProces šifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte tablet připojený ke zdroji napájení, dokud se šifrování nedokončí. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Účty, nastavení, stažené aplikace a jejich data, média a jiné soubory můžete zašifrovat. Po zašifrování musíte při každém zapnutí telefonu vložit číselný kód PIN nebo heslo, abyste ho opět dešifrovali. Zašifrování telefonu lze zrušit pouze obnovením továrních dat, při kterém budou vymazána všechna vaše data.\n\nProces zašifrování trvá hodinu i více. Začněte s nabitou baterií a ponechte telefon připojený ke zdroji napájení, dokud nebude šifrování dokončeno. Pokud proces šifrování přerušíte, může dojít ke ztrátě některých nebo všech vašich dat."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Své účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete zašifrovat. Pokud tablet zašifrujete a nastavili jste zámek obrazovky (bezpečnostní gesto, číselný PIN nebo heslo), bude třeba jej při každém zapnutí dešifrovat odemknutím obrazovky. Jediným dalším způsobem dešifrování je obnovení továrních dat, při kterém budou všechna vaše data smazána.\n\nŠifrování trvá hodinu nebo i déle. Šifrování je potřeba zahájit s nabitou baterií a během šifrování je potřeba ponechat tablet připojený ke zdroji napájení. Pokud šifrování přerušíte, přijdete o některá nebo všechna svá data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Své účty, nastavení, stažené aplikace a jejich data, média a další soubory můžete zašifrovat. Pokud telefon zašifrujete a nastavili jste zámek obrazovky (bezpečnostní gesto, číselný PIN nebo heslo), bude třeba jej při každém zapnutí dešifrovat odemknutím obrazovky. Jediným dalším způsobem dešifrování je obnovení továrních dat, při kterém budou všechna vaše data smazána.\n\nŠifrování trvá hodinu nebo i déle. Šifrování je potřeba zahájit s nabitou baterií a během šifrování je potřeba ponechat telefon připojený ke zdroji napájení. Pokud šifrování přerušíte, přijdete o některá nebo všechna svá data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovat tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovat telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabijte baterii a zkuste to znovu."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Zobrazit nebo deaktivovat správce zařízení"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Zástupci důvěryhodnosti"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Zobrazit nebo deaktivovat zástupce důvěryhodnosti"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Přístup k oznámením"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikace nesmí číst oznámení"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikace může číst oznámení"</item>
-    <item quantity="other" msgid="980049191810249052">"Aplikace mohou číst oznámení (celkem %d)"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nejsou nainstalovány žádné aplikace poslouchající oznámení."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Chcete zapnout <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bude moci číst všechna oznámení zveřejněná systémem nebo jakoukoli nainstalovanou aplikací. Oznámení mohou obsahovat osobní údaje jako kontaktní jména nebo texty zpráv, které jsou vám odesílány. Aplikace bude také moci tato oznámení zavřít nebo klepnout na tlačítka akcí v oznámeních."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Poskytovatelé podmínek"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Žádné aplikace neposkytují podmínky"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Aplikace poskytující podmínky: %d"</item>
-    <item quantity="other" msgid="358057362115673258">"Aplikace poskytující podmínky: %d"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nejsou nainstalováni žádní poskytovatelé podmínek."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Chcete zapnout službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Poskytovatel podmínek <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bude do režimu Nerušit moci přidat podmínky ukončení."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnout Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Připojit k síti"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstranit záznam sítě"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upravit síť"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Chcete-li zobrazit dostupné sítě, zapněte Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Vyhledávání sítí Wi-Fi…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemáte oprávnění ke změně sítě Wi-Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozici)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečení: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečení <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Zadejte heslo sítě."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Žádné"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnout vyhledávání sítí (kvůli lepšímu určení polohy i kvůli jiným účelům) a hledat sítě i v případě, že je vypnut modul Wi-Fi.\n\nChcete tuto možnost povolit všem aplikacím, které chtějí vyhledávat sítě?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povolit"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Plocha"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobrazení"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitost"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hudební efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitost vyzvánění"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovat v tichém režimu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Výchozí zvuk oznámení"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Blikat kontrolkou oznámení"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Prioritní ve vyskak. okně"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Vyzváněcí tón"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Oznámení"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Vypnout zvuk hudby a jiných médií"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Vypnout zvuk oznámení"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Vypnout zvuk budíků"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrace při vyzvánění"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokovací stanice"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Nastavení doku"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Zvuk"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Při otáčení telefonu automaticky přepínat orientaci"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Při otáčení tabletu automaticky přepínat orientaci"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Při otáčení telefonu automaticky přepínat orientaci"</string>
-    <string name="brightness" msgid="2354961343555249270">"Jas"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Ladění USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Povolit režim ladění s připojeným zařízením USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Zrušit autorizace k ladění USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Hlášení chyb z hlavní nabídky"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Zahrnout v hlavní nabídce možnost k vytvoření chybového hlášení"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Nevypínat obrazovku"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povolit protokol Bluetooth HCI"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa MAC sítě 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Chcete-li obsah úložiště dešifrovat, zadejte heslo."</string>
+    <string name="enter_pin" msgid="286221169871526876">"Dešifrujte úložiště zadáním kódu PIN"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Dešifrujte úložiště nakreslením gesta"</string>
     <string name="try_again" msgid="4272075051293936921">"Zkuste to znovu."</string>
     <string name="delete" msgid="4219243412325163003">"Smazat"</string>
     <string name="misc_files" msgid="6720680815969643497">"Různé soubory"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Změna velikosti písma"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby mobilem"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Plaťte pouhým dotykem"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Upřednostnit aplikaci v popředí"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Další informace"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Hledat aplikace"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Nastavit jako předvolbu?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Poslední vyhledávání"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Výsledky"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi síť připojení"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Když je zařízení zamčeno"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrýt citlivý obsah oznámení"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazit veškerý obsah oznámení"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Nerušit"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nerušit"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Oznámení"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Vylepšení"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Oznámení aplikací"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Nastavení štítku NFC Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Zapsat"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na štítek zahájíte zápis..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Neplatné heslo, zkuste to znovu."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Zápis dat na štítek NFC se nezdařil. Pokud problém přetrvává, zkuste jiný štítek."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Na štítek NFC nelze zapisovat. Zkuste jiný štítek."</string>
     <string name="default_sound" msgid="8821684447333687810">"Výchozí zvuk"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Zvuky a oznámení"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Hlasitost médií"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitost budíku"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Hlasitost vyzvánění"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nerušit"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Při příchozím hovoru nebo oznámení"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Vyzvánět"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Namísto vyzvánění vibrovat"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Nevyzvánět ani nevibrovat"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Vyzváněcí tón telefonu"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Výchozí tón oznámení"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrace při vyzvánění"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Zobrazování oznámení"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Blikat kontrolkou oznámení"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Když je zařízení zamčeno"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazit veškerý obsah oznámení"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrýt citlivý obsah oznámení"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Oznámení vůbec nezobrazovat"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Když je zapnut režim Nerušit"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Skrýt v seznamu nová oznámení"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Zobrazit v seznamu všechna oznámení"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Oznámení aplikací"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Zvuky při dotyku"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tóny číselníku"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Uzamknutí a odemknutí obrazovky"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Ostatní zvuky při dotyku"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Při dotyku vibrovat"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Přístup k oznámením"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikace nesmí číst oznámení"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplikace může číst oznámení"</item>
+    <item quantity="other" msgid="980049191810249052">"Aplikace mohou číst oznámení (celkem %d)"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nejsou nainstalovány žádné aplikace poslouchající oznámení."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Chcete zapnout <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bude moci číst všechna oznámení zveřejněná systémem nebo jakoukoli nainstalovanou aplikací. Oznámení mohou obsahovat osobní údaje jako kontaktní jména nebo texty zpráv, které jsou vám odesílány. Aplikace bude také moci tato oznámení zavřít nebo klepnout na tlačítka akcí v oznámeních."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Poskytovatelé podmínek"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Žádné aplikace neposkytují podmínky"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"Aplikace poskytující podmínky: %d"</item>
+    <item quantity="other" msgid="358057362115673258">"Aplikace poskytující podmínky: %d"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nejsou nainstalováni žádní poskytovatelé podmínek."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Chcete zapnout službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Poskytovatel podmínek <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bude do režimu Nerušit moci přidat podmínky ukončení."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Načítání aplikací..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Zobrazit oznámení"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Vysoká priorita"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Zobrazit na začátku seznamu"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Skrýt citlivý obsah, když je zařízení zamčeno"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Zablokováno"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Začátek seznamu"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Důvěrné"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Vypnuto"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Zapnuto"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokud tuto funkci nevypnete"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokovat všechna vyrušení kromě"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"V noci"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Jiná automatizace"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaticky zapnout"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikdy"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonní hovory"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Zprávy"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Čas zahájení"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončení"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> další den"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Oznámení aplikací"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavení oznámení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odeslat názor o tomto zařízení"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 913ed86..cc57070 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nu er du udvikler."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det behøver du ikke. Du er allerede udvikler."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETVÆRK"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ENHED"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONLIGT"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Trådløst og netværk"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Enhed"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Personlig"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"System"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Slå radio til"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Slå radio fra"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Slå sms via IMS til"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter telefon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din tablet, hver gang du tænder for den"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Kræv en numerisk pinkode eller adgangskode for at dekryptere din telefon, hver gang du tænder for den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypteret"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din tablet, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun dekryptere din tablet ved at udføre en gendannelse af fabriksdata, som sletter alle dine data.\n\nKrypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din tablet forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din telefon, skal du indtaste en numerisk pinkode eller adgangskode for at dekryptere den, hver gang du tænder for den. Du kan kun  dekryptere din telefon ved at udføre en gendannelse af fabriksdata, som sletter alle dine data.\n\nKrypteringen tager mindst en time. Når du starter krypteringen, skal batteriet være fuldt opladet, og du skal sørge for, at din telefon forbliver sluttet til strøm, indtil krypteringen er gennemført. Hvis du afbryder krypteringen, mister du nogle eller alle data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din tablet, forudsat at du har oprettet en skærmlås (dvs. et mønster eller en numerisk pinkode eller adgangskode), skal du låse skærmen op for at dekryptere din tablet, hver gang du tænder for den. Den eneste anden måde at dekryptere på er ved at udføre en gendannelse af fabriksdata, som sletter alle dine data.\n\nKryptering tager en time eller mere. Du skal starte med et opladet batteri og have din tablet tilsluttet strøm under hele processen. Hvis du fjernet stikket, vil du miste nogle af eller alle dine data."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Du kan kryptere dine konti, indstillinger, downloadede apps og deres data, medier og andre filer. Når du krypterer din telefon, forudsat at du har oprettet en skærmlås (dvs. et mønster eller en numerisk pinkode eller adgangskode), skal du låse skærmen op for at dekryptere telefonen, hver gang du tænder for den. Den eneste anden måde at dekryptere på er ved at udføre en gendannelse af fabriksdata, som sletter alle dine data.\n\nKryptering tager en time eller mere. Du skal starte med et opladet batteri og have din telefon tilsluttet strøm under hele processen. Hvis du fjernet stikket, vil du miste nogle af eller alle dine data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lad dit batteri op, og prøv igen."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Vis eller deaktiver enhedsadministratorer"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Se eller deaktivere trust agents"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Underretningsadgang"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps kan ikke læse underretninger"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Appen %d kan læse underretninger"</item>
-    <item quantity="other" msgid="980049191810249052">"Appene %d kan læse underretninger"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Ingen underretningslyttere er installeret."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Skal <xliff:g id="SERVICE">%1$s</xliff:g> aktiveres?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> vil kunne læse alle underretninger, der er sendt af systemet eller en hvilken som helst installeret app, som kan indeholde personlige oplysninger, som f.eks. kontaktpersoner og teksten i beskeder, der sendes til dig. Den vil også kunne afvise disse underretninger eller trykke på handlingsknapper i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Tjenester til formidling af betingelser"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ingen apps formidler betingelser"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app formidler betingelser"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps formidler betingelser"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Der er ikke installeret nogen tjenester til formidling af betingelser."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Skal <xliff:g id="SERVICE">%1$s</xliff:g> aktiveres?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan tilføje afslutningsbetingelser til tilstanden Vil ikke forstyrres."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå Bluetooth til"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Opret forbindelse til netværk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glem netværk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Rediger netværk"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Se tilgængelige netværk ved at aktivere Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Søger efter Wi-Fi-netværk..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har ikke tilladelse til at ændre Wi-Fi-netværket."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS er tilgængelig)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Indtast din adgangskode til netværket."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"For bl.a. at kunne angive en mere nøjagtig placering vil <xliff:g id="APP_NAME">%1$s</xliff:g> gerne aktivere netværkssøgning, selv når Wi-Fi er deaktiveret.\n\nVil du tillade dette for alle apps, der gerne vil søge?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillad"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Startskærm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skærm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Ringetone for telefon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lydstyrke"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Lydstyrke for opkald"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved lydløs"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standardlyd for underretninger"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Blink ved nye underretninger"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop op, hvis høj prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Underretning"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Slå lyden fra for musik og andre medier"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Slå lyden fra for underretninger"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Slå lyden fra for alarmer"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrer ved opringning"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dockingstation"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Indstillinger for dockingstation"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Lyd"</string>
@@ -751,15 +731,20 @@
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Afspil ikke lyd, når telefonen isættes og fjernes fra dockingstation"</string>
     <string name="account_settings" msgid="6403589284618783461">"Konti"</string>
     <string name="search_settings" msgid="1910951467596035063">"Søg"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og -oversigt"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og -historik"</string>
     <string name="display_settings" msgid="7965901687241669598">"Skærm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Roter skærm automatisk"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Skift automatisk retning, når tabletcomputeren drejes"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Skift automatisk retning, når telefonen drejes"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Skift automatisk retning, når tabletcomputeren drejes"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Skift automatisk retning, når telefonen drejes"</string>
-    <string name="brightness" msgid="2354961343555249270">"Lysstyrke"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Dvale"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB-fejlretning"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Fejlretningstilstand, når USB er tilsluttet"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Tilbagekald tilladelser for USB-fejlfinding"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Rapportér fejl i menu for slukknap"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Gør det muligt at rapportere fejl i menuen for slukknappen"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Undgå dvale"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skærmen går ikke i dvale under opladning"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivér Bluetooth HCI snoop log"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Indtast en adgangskode for at dekryptere lageret"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Indtast din pinkode for dekryptere hukommelsen"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Tegn dit mønster for at dekryptere hukommelsen"</string>
     <string name="try_again" msgid="4272075051293936921">"Prøv igen."</string>
     <string name="delete" msgid="4219243412325163003">"Slet"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse filer"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Skift skriftstørrelse"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tryk og betal"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Betal med et enkelt tryk"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Prioriter app i forgrunden"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Få flere oplysninger"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Find apps"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Vil du angive dette som din præference?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Seneste søgninger"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultater"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netværk forbindelse"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Når enheden er låst"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skjul følsomt indhold i underretninger"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt indhold i underretninger"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Forstyr ikke"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Forstyr ikke"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Underretninger"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Justeringer"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appunderretninger"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Konfigurer NFC-tag for Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryk på et tag for at skrive..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Ugyldig adgangskode. Prøv igen."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Der kan ikke skrives data til NFC-tagget. Hvis problemet fortsætter, skal du prøve et andet tag"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Der kan ikke skrives til NFC-tagget. Brug et andet tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardlyd"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Lyde og underretninger"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Lydstyrke for medier"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmlydstyrke"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Lydstyrke for ringetone"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Forstyr ikke"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Når der modtages opkald og underretninger"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Ring"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrer i stedet for at ringe"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Ring eller vibrer ikke"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Ringetone for telefon"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardringetone for underretninger"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrer ved opringning"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Underretninger vises"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Blink ved nye underretninger"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Når enheden er låst"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt indhold i underretninger"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skjul følsomt indhold i underretninger"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Vis slet ingen underretninger"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Når Forstyr ikke er slået til"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Skjul nye underretninger på listen"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Vis alle underretninger på listen"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Appunderretninger"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Lyd ved berøring"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toner for numerisk tastatur"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Skærmlåsning og -oplåsning"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Andre lyde ved tryk"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrer ved berøring"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Underretningsadgang"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps kan ikke læse underretninger"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"Appen %d kan læse underretninger"</item>
+    <item quantity="other" msgid="980049191810249052">"Appene %d kan læse underretninger"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Ingen underretningslyttere er installeret."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Skal <xliff:g id="SERVICE">%1$s</xliff:g> aktiveres?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> vil kunne læse alle underretninger, der er sendt af systemet eller en hvilken som helst installeret app, som kan indeholde personlige oplysninger, som f.eks. kontaktpersoner og teksten i beskeder, der sendes til dig. Den vil også kunne afvise disse underretninger eller trykke på handlingsknapper i dem."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Tjenester til formidling af betingelser"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ingen apps formidler betingelser"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d app formidler betingelser"</item>
+    <item quantity="other" msgid="358057362115673258">"%d apps formidler betingelser"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Der er ikke installeret nogen tjenester til formidling af betingelser."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Skal <xliff:g id="SERVICE">%1$s</xliff:g> aktiveres?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan tilføje afslutningsbetingelser til tilstanden Vil ikke forstyrres."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Indlæser apps..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Vis underretninger"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Høj prioritet"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Vis øverst på listen"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Skjul følsomt indhold, når enheden er låst"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeret"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Øverst på listen"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Følsomme"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Udført"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Fra"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Til"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Indtil du slår denne indstilling fra"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloker alle afbrydelser undtagen"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Om natten"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Anden automation"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Slå automatisk til"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrig"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonopkald"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Beskeder"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> næste dag"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appunderretninger"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Indstillinger for underretninger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback om denne enhed"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 30899bd..883a81e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sie sind jetzt ein Entwickler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Okay, sind Sie bereits ein Entwickler."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"Drahtlos &amp; Netzwerke"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"Gerät"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"Nutzer"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Drahtlos &amp; Netzwerke"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Gerät"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Nutzer"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"System"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Mobilfunkverbindung aktivieren"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Mobilfunkverbindung deaktivieren"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"SMS über IMS aktivieren"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Verschlüsselung"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon verschlüsseln"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Numerische PIN oder Passwort festlegen, mit dem das Tablet beim Einschalten entschlüsselt werden muss"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerische PIN oder Passwort festlegen, mit dem das Telefon beim Einschalten entschlüsselt werden muss"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Verschlüsselt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Tablets ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Tablets nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Tablet angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps mit den dazugehörigen Daten sowie Multimedia- und andere Dateien verschlüsseln. Nach der Verschlüsselung Ihres Telefons ist bei jedem Einschalten die Eingabe einer PIN-Nummer oder eines Passworts erforderlich. Sie können die Verschlüsselung Ihres Telefons nur aufheben, indem Sie das Gerät auf die Werkseinstellungen zurücksetzen. Dabei werden alle Ihre Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Vergewissern Sie sich zu Beginn, dass Ihr Akku vollständig geladen ist, und lassen Sie Ihr Telefon angeschlossen, bis die Verschlüsselung abgeschlossen ist. Eine Unterbrechung dieses Vorgangs kann zu teilweisem oder vollständigem Datenverlust führen."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps und die zugehörigen Daten, Medienelemente und andere Dateien verschlüsseln. Nachdem Sie Ihr Tablet verschlüsselt haben, müssen Sie, sofern Sie eine Displaysperre eingerichtet haben (also ein Muster, eine numerische PIN oder ein Passwort), bei jedem Einschalten des Tablets das Display entsperren, um es zu entschlüsseln. Die einzige andere Entschlüsselungsmöglichkeit ist das Zurücksetzen auf die Werkseinstellungen. Hierdurch werden alle Ihre Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Bei Beginn muss der Akku aufgeladen sein und das Tablet muss sich während des gesamten Vorgangs im Netzbetrieb befinden. Wenn Sie den Vorgang unterbrechen, gehen einige oder alle Ihre Daten verloren."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps und die zugehörigen Daten, Medienelemente und andere Dateien verschlüsseln. Nachdem Sie Ihr Telefon verschlüsselt haben, müssen Sie, sofern Sie eine Displaysperre eingerichtet haben (also ein Muster, eine numerische PIN oder ein Passwort), bei jedem Einschalten des Telefons das Display entsperren, um es zu entschlüsseln. Die einzige andere Entschlüsselungsmöglichkeit ist das Zurücksetzen auf die Werkseinstellungen. Hierdurch werden alle Ihre Daten gelöscht.\n\nDie Verschlüsselung dauert mindestens eine Stunde. Bei Beginn muss der Akku aufgeladen sein und das Telefon muss sich während des gesamten Vorgangs im Netzbetrieb befinden. Wenn Sie den Vorgang unterbrechen, gehen einige oder alle Ihre Daten verloren."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon verschlüsseln"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laden Sie Ihren Akku auf und versuchen Sie es erneut."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Geräteadministratoren abrufen oder deaktivieren"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust Agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Trust Agents ansehen oder deaktivieren"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Benachrichtigungszugriff"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps können keine Benachrichtigungen lesen."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d App kann Benachrichtigungen lesen"</item>
-    <item quantity="other" msgid="980049191810249052">"%d Apps können Benachrichtigungen lesen"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Keine Benachrichtigungs-Listener installiert"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> darf alle Benachrichtigungen lesen, die vom System oder einer installierten App gesendet werden. Darin können personenbezogene Daten wie Kontaktnamen oder Inhalte der an Sie gesendeten Nachrichten enthalten sein. Der Listener kann diese Benachrichtigungen außerdem schließen oder Schaltflächen in den Benachrichtigungen betätigen."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Bedingungsanbieter"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Keine der Apps enthalten Bedingungen."</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d App enthält Bedingungen"</item>
-    <item quantity="other" msgid="358057362115673258">"%d Apps enthalten Bedingungen"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Es sind keine Bedingungsanbieter installiert."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kann Ausstiegsbedingungen zum Modus \"Nicht stören\" hinzufügen."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth aktivieren"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -591,6 +571,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Mit Netzwerk verbinden"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netzwerk entfernen"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netzwerk ändern"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"WLAN aktivieren, um verfügbare Netze abzurufen"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Suche nach WLAN-Netzwerken läuft…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Sie verfügen nicht über die Berechtigung zum Ändern des WLAN-Netzwerks."</string>
@@ -639,7 +621,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS verfügbar)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", gesichert mit <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Geben Sie Ihr Netzwerkpasswort ein."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Keine"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Zur Verbesserung der Standortgenauigkeit und zu anderen Zwecken möchte <xliff:g id="APP_NAME">%1$s</xliff:g> die Netzwerküberprüfung aktivieren, auch wenn das WLAN deaktiviert ist.\n\nMöchten Sie dies für alle Apps zulassen, die eine Überprüfung durchführen möchten?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zulassen"</string>
@@ -703,14 +686,12 @@
     <string name="home_settings" msgid="212375129455718176">"Startseite"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Töne"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Lautstärke"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekte"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Klingeltonlautstärke"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Im Lautlos-Modus vibrieren"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standard-Benachrichtigungston"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up bei hoher Priorität"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Klingelton"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Benachrichtigung"</string>
@@ -733,7 +714,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Musik &amp; andere Medien stummschalten"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Benachrichtigungen stummschalten"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Wecker stummschalten"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Beim Klingeln vibrieren"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dock-Einstellungen"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -759,8 +739,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ausrichtung beim Drehen des Telefons automatisch ändern"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ausrichtung beim Drehen des Tablets automatisch ändern"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Ausrichtung beim Drehen des Telefons automatisch ändern"</string>
-    <string name="brightness" msgid="2354961343555249270">"Helligkeit"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Ruhezustand"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
@@ -1344,8 +1329,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB-Debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss über USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Autorisierungen für USB-Debugging aufheben"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Fehlerberichte im Menü \"Ein/Aus\""</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Fügt die Option für den Fehlerbericht im Menü \"Ein/Aus\" hinzu"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Aktiv lassen"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI-Snoop-Protokoll aktivieren"</string>
@@ -1821,6 +1808,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G-MAC-Adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Passwort zum Entschlüsseln des Speichers eingeben"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Zum Entschlüsseln des Speichers PIN eingeben"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Zum Entschlüsseln des Speichers Muster zeichnen"</string>
     <string name="try_again" msgid="4272075051293936921">"Erneut versuchen"</string>
     <string name="delete" msgid="4219243412325163003">"Löschen"</string>
     <string name="misc_files" msgid="6720680815969643497">"Sonstige Dateien"</string>
@@ -2073,6 +2062,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Schriftgröße ändern"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Mobil bezahlen"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Einfach durch Tippen bezahlen"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"App im Vordergrund bevorzugen"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Weitere Informationen"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Apps suchen"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Als bevorzugte Einstellung festlegen?"</string>
@@ -2126,16 +2116,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Letzte Suchanfragen"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Ergebnisse"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wlan wifi wi-fi netzwerkverbindung"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Bei gesperrtem Gerät"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sensible Benachrichtigungsinhalte ausblenden"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Gesamten Nachrichteninhalt anzeigen"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Bitte nicht stören"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Bitte nicht stören"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Benachrichtigungen"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-Benachrichtigungen"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WLAN-NFC-Tag einrichten"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Schreiben"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Zum Schreiben auf ein Tag tippen…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Ungültiges Passwort. Bitte versuchen Sie es erneut."</string>
@@ -2143,19 +2125,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Es können keine Daten in das NFC-Tag geschrieben werden. Sollte das Problem weiterhin bestehen, versuchen Sie es mit einem anderen Tag."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"In das NFC-Tag kann nicht geschrieben werden. Bitte verwenden Sie ein anderes Tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardton"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Töne &amp; Benachr."</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Medienlautstärke"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Weckerlautstärke"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Klingeltonlautstärke"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Bitte nicht stören"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Wenn Anrufe und Benachrichtigungen eingehen"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Klingeln lassen"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibration statt Klingelton"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Weder klingeln lassen noch vibrieren"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Klingelton"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardton für Benachrichtigungen"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Beim Klingeln vibrieren"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Benachrichtigungen werden angezeigt"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Benachrichtigungslicht"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Bei gesperrtem Gerät"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Gesamten Nachrichteninhalt anzeigen"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sensible Benachrichtigungsinhalte ausblenden"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Keine Benachrichtigungen anzeigen"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Wenn \"Nicht stören\" aktiviert ist"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Neue Benachrichtigungen in Liste ausblenden"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Alle Benachrichtigungen in Liste anzeigen"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Töne bei Berührung"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Wähltastentöne"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Sperren &amp; Entsperren des Bildschirms"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Andere Berührungstöne"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Bei Berührung vibrieren"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Benachrichtigungszugriff"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps können keine Benachrichtigungen lesen."</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d App kann Benachrichtigungen lesen"</item>
+    <item quantity="other" msgid="980049191810249052">"%d Apps können Benachrichtigungen lesen"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Keine Benachrichtigungs-Listener installiert"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> darf alle Benachrichtigungen lesen, die vom System oder einer installierten App gesendet werden. Darin können personenbezogene Daten wie Kontaktnamen oder Inhalte der an Sie gesendeten Nachrichten enthalten sein. Der Listener kann diese Benachrichtigungen außerdem schließen oder Schaltflächen in den Benachrichtigungen betätigen."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Bedingungsanbieter"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Keine der Apps enthalten Bedingungen."</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d App enthält Bedingungen"</item>
+    <item quantity="other" msgid="358057362115673258">"%d Apps enthalten Bedingungen"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Es sind keine Bedingungsanbieter installiert."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> aktivieren?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kann Ausstiegsbedingungen zum Modus \"Nicht stören\" hinzufügen."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Apps werden geladen..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Benachrichtigungen anzeigen"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Hohe Priorität"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Ganz oben in der Liste anzeigen"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Bei gesperrtem Gerät sensible Inhalte ausblenden"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blockiert"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Oberste Priorität"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensibel"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fertig"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Aus"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"An"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Bis zur Deaktivierung"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Alle Unterbrechungen blockieren, außer:"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Nachts"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Sonstige Automatisierung"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatisch aktivieren"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nie"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonanrufe"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Nachrichten"</string>
@@ -2171,5 +2199,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Startzeit"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Endzeit"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Am nächsten Tag um <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-Benachrichtigungen"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Benachrichtigungseinstellungen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback zu diesem Gerät senden"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 57c88c3..d98f940 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Είστε πλέον προγραμματιστής!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Δεν χρειάζεται, είστε ήδη προγραμματιστής."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"ΑΣΥΡΜΑΤΟ και ΔΙΚΤΥΑ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ΣΥΣΚΕΥΗ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ΠΡΟΣΩΠΙΚΟΣ"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"ΣΥΣΤΗΜΑ"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Ασύρματο και δίκτυα"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Συσκευή"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Προσωπικό"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Σύστημα"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ενεργοποίηση πομπού"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Απενεργοποίηση πομπού"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Ενεργοποίηση SMS μέσω IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Κρυπτογράφηση"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Κρυπτογράφηση τηλεφώνου"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του tablet κάθε φορά που το ενεργοποιείτε"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Να απαιτείται ένας αριθμητικός κωδικός PIN ή ένας κωδικός πρόσβασης για την αποκρυπτογράφηση του τηλεφώνου σας κάθε φορά που το ενεργοποιείτε"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Κρυπτογραφημένο"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το tablet σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του tablet σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας.\n\nΗ κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη και το tablet σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές των οποίων έχετε πραγματοποιήσει λήψη και τα δεδομένα τους, τα μέσα και άλλα αρχεία σας. Αφού κρυπτογραφήσετε το τηλέφωνό σας, θα πρέπει κάθε φορά που το ενεργοποιείτε να πληκτρολογείτε ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης για την αποκρυπτογράφησή του. Δεν είναι δυνατή η αποκρυπτογράφηση του τηλεφώνου σας, εκτός αν πραγματοποιήσετε επαναφορά εργοστασιακών ρυθμίσεων, διαγράφοντας όλα τα δεδομένα σας.\n\nΗ κρυπτογράφηση διαρκεί μια ώρα ή και περισσότερο. Θα πρέπει να την ξεκινήσετε με την μπαταρία σας φορτισμένη, ενώ το τηλέφωνό σας θα πρέπει να είναι συνδεδεμένο σε πρίζα, έως ότου ολοκληρωθεί η κρυπτογράφηση. Αν διακόψετε τη διαδικασία κρυπτογράφησης, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές που έχετε λάβει και τα δεδομένα τους, τα πολυμέσα και άλλα αρχεία. Μετά την κρυπτογράφηση του tablet σας και με την προϋπόθεση ότι έχετε ορίσει έναν τύπο κλειδώματος οθόνης (όπως για παράδειγμα ένα μοτίβο, ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης), θα πρέπει κάθε φορά που ενεργοποιείτε το tablet να ξεκλειδώνετε την οθόνη για την αποκρυπτογράφησή του. Ο μοναδικός άλλος τρόπος να αποκρυπτογραφήσετε το tablet είναι η επαναφορά των εργοστασιακών ρυθμίσεων, η οποία διαγράφει το σύνολο των δεδομένων σας.\n\nΗ διαδικασία κρυπτογράφησης διαρκεί μία ώρα ή και περισσότερο. Θα πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και να έχετε το tablet συνδεδεμένο σε πρίζα σε όλη τη διάρκεια της διαδικασίας. Αν διακόψετε τη διαδικασία, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Μπορείτε να κρυπτογραφήσετε τους λογαριασμούς, τις ρυθμίσεις, τις εφαρμογές που έχετε λάβει και τα δεδομένα τους, τα πολυμέσα και άλλα αρχεία. Μετά την κρυπτογράφηση του τηλεφώνου σας και με την προϋπόθεση ότι έχετε ορίσει έναν τύπο κλειδώματος οθόνης (όπως για παράδειγμα ένα μοτίβο, ένα αριθμητικό PIN ή έναν κωδικό πρόσβασης), θα πρέπει κάθε φορά που ενεργοποιείτε το τηλέφωνο να ξεκλειδώνετε την οθόνη για την αποκρυπτογράφησή του. Ο μοναδικός άλλος τρόπος να αποκρυπτογραφήσετε το τηλέφωνο είναι η επαναφορά των εργοστασιακών ρυθμίσεων, η οποία διαγράφει το σύνολο των δεδομένων σας.\n\nΗ διαδικασία κρυπτογράφησης διαρκεί μία ώρα ή και περισσότερο. Θα πρέπει να ξεκινήσετε με φορτισμένη μπαταρία και να έχετε το τηλέφωνό συνδεδεμένο σε πρίζα σε όλη τη διάρκεια της διαδικασίας. Αν διακόψετε τη διαδικασία, θα χάσετε ορισμένα ή όλα τα δεδομένα σας."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Κρυπτογράφηση tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Κρυπτογράφηση τηλεφώνου"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Φορτίστε την μπαταρία σας και δοκιμάστε ξανά."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Προβολή ή απενεργοποίηση των διαχειριστών συσκευής"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Έμπιστοι αντιπρόσωποι"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Προβολή ή απενεργοποίηση trust agents"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Πρόσβαση σε ειδοποιήσεις"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Οι εφαρμογές δεν μπορούν να διαβάσουν ειδοποιήσεις"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d εφαρμογή μπορεί να διαβάσει ειδοποιήσεις"</item>
-    <item quantity="other" msgid="980049191810249052">"%d εφαρμογές μπορούν να διαβάσουν ειδοποιήσεις"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Δεν έχουν εγκατασταθεί υπηρεσίες ακρόασης ειδοποιήσεων."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ενεργοποίηση <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Η εφαρμογή <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> θα μπορεί να διαβάζει όλες τις ειδοποιήσεις που δημοσιεύει το σύστημα ή οποιαδήποτε εγκατεστημένη εφαρμογή, οι οποίες ενδέχεται να συμπεριλαμβάνουν προσωπικά στοιχεία, όπως ονόματα επαφών και κείμενα από μηνύματα που έχετε λάβει. Θα έχει επίσης τη δυνατότητα να απορρίπτει αυτές τις ειδοποιήσεις ή να αγγίζει τα κουμπιά ενεργειών που περιέχονται σε αυτές."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Πάροχοι συνθηκών"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Καμία εφαρμογή δεν παρέχει συνθήκες"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d εφαρμογή παρέχει συνθήκες"</item>
-    <item quantity="other" msgid="358057362115673258">"%d εφαρμογές παρέχουν συνθήκες"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Δεν εγκαταστάθηκαν πάροχοι συνθηκών."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ενεργοποίηση <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> θα έχει τη δυνατότητα να προσθέτει συνθήκες εξόδου στη λειτουργία \"Μην ενοχλείτε\"."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ενεργοποίηση Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Σύνδεση στο δίκτυο"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Διαγραφή δικτύου από τη μνήμη"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Τροποποίηση δικτύου"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"Δεν έχετε άδεια για αλλαγή του δικτύου Wi-Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Διαθέσιμο WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ασφαλισμένα με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ασφαλισμένο με <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Εισαγάγετε τον κωδικό πρόσβασης του δικτύου σας."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Καμία"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Για τη βελτίωση της ακρίβειας της τοποθεσίας σας και για άλλους σκοπούς, η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> επιθυμεί να ενεργοποιήσει τη σάρωση δικτύων, ακόμη και όταν το Wi-Fi είναι απενεργοποιημένο.\n\nΝα επιτρέπεται αυτή η ενέργεια για όλες τις εφαρμογές που επιθυμούν σάρωση;"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Να επιτραπεί"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Αρχική σελίδα"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Προβολή"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ήχος"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ρυθμίσεις έντασης"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Μουσικά εφέ"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ένταση ήχου ειδοποίησης"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Δόνηση στο αθόρυβο"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Φωτεινός παλμός ειδοποίησης"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Αναδ.παρ. για υψηλής προτερ."</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ήχος κλήσης"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ειδοποίηση"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Σίγαση μουσικής &amp; άλλων μέσων"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Σίγαση ειδοποιήσεων"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Σίγαση ειδοποιήσεων"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Δόνηση κατά το κουδούνισμα"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Βάση σύνδεσης"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Ρυθμίσεις βάσης σύνδεσης"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ήχος"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του τηλεφώνου"</string>
-    <string name="brightness" msgid="2354961343555249270">"Φωτεινότητα"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Απουσία δραστηριότητας"</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>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Εντοπισμός σφαλμάτων USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Λειτουργία εντοπισμού σφαλμάτων όταν το USB είναι συνδεδεμένο"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Ανάκληση εξουσιοδοτήσεων εντοπισμού σφαλμάτων USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Αναφορές σφαλμάτων μενού λειτουργίας"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Συμπερίληψη επιλογής στο μενού λειτουργίας για λήψη αναφοράς σφαλμάτων"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Παραμονή σε κανονική κατάσταση λειτουργίας"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Η οθόνη δεν θα μεταβαίνει ποτέ σε κατάσταση αδράνειας κατά τη φόρτιση"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ενεργοποίηση αρχείου καταγραφής παρακολούθησης Bluetooth HCI"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Διεύθυνση 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Εισαγάγετε κωδικό πρόσβασης για την αποκρυπτογράφηση του αποθηκευτικού χώρου"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Καταχωρίστε το PIN, για να αποκρυπτογραφήσετε το χώρο αποθήκευσης"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Σχεδιάστε το μοτίβο, για να αποκρυπτογραφήσετε το χώρο αποθήκευσης"</string>
     <string name="try_again" msgid="4272075051293936921">"Δοκιμάστε ξανά."</string>
     <string name="delete" msgid="4219243412325163003">"Διαγραφή"</string>
     <string name="misc_files" msgid="6720680815969643497">"Διάφορα αρχεία"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Αλλαγή μεγέθους γραμματοσειράς"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Πατήστε και πληρώστε"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Πληρώστε με ένα απλό πάτημα"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Προτίμηση εφαρμογών στο προσκήνιο"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Μάθετε περισσότερα"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Βρείτε εφαρμογές"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Ορισμός ως προτίμησης;"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Πρόσφατες αναζητήσεις"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Αποτελέσματα"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi σύνδεση δικτύου"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Κατά το κλείδωμα"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Απόκρυψη ευαίσθητου περιεχομένου ειδοποιήσεων"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Εμφάνιση ολόκληρου του περιεχομένου ειδοποιήσεων"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Μην ενοχλείτε"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Μην ενοχλείτε"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Ειδοποιήσεις"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Προσαρμογές"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ειδοποιήσεις εφαρμ."</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Ρύθμιση ετικέτας ΕΚΠ Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Εγγραφή"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Αγγίξτε μια ετικέτα για εγγραφή…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Μη έγκυρος κωδικός πρόσβασης, δοκιμάστε ξανά."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Δεν είναι δυνατή η εγγραφή δεδομένων στην ετικέτα ΕΚΠ. Εάν το πρόβλημα εξακολουθεί να παρουσιάζεται, δοκιμάστε μια διαφορετική ετικέτα"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Δεν υπάρχει δυνατότητα εγγραφής στην ετικέτα ΕΚΠ. Χρησιμοποιήστε μια διαφορετική ετικέτα."</string>
     <string name="default_sound" msgid="8821684447333687810">"Προεπιλεγμένος ήχος"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Ήχοι &amp; ειδοποιήσεις"</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="zen_mode_settings_title" msgid="2689740350895257590">"Μην ενοχλείτε"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Κατά τη λήψη κλήσεων και ειδοποιήσεων"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Ήχος κλήσης"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Δόνηση αντί για ήχο κλήσης"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Χωρίς ήχο κλήσης ή δόνηση"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Ήχος κλήσης τηλεφώνου"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Προεπιλεγμένος ήχος ειδοποίησης"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Δόνηση κατά το κουδούνισμα"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Εμφάνιση κοινοποιήσεων"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Φωτεινός παλμός ειδοποίησης"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Κατά το κλείδωμα της συσκευής"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Εμφάνιση ολόκληρου του περιεχομένου ειδοποιήσεων"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Απόκρυψη ευαίσθητου περιεχομένου ειδοποιήσεων"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Να μην εμφανίζονται ειδοποιήσεις"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\""</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Απόκρυψη νέων ειδοποιήσεων από τη λίστα"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Εμφάνιση όλων των ειδοποιήσεων στη λίστα"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Ειδοποιήσεις εφαρμογών"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Ήχοι αφής"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Ήχοι πληκτρολογίου κλήσης"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Κλείδωμα και ξεκλείδωμα οθόνης"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Άλλοι ήχοι αφής"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Δόνηση κατά την αφή"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Πρόσβαση σε ειδοποιήσεις"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Οι εφαρμογές δεν μπορούν να διαβάσουν ειδοποιήσεις"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d εφαρμογή μπορεί να διαβάσει ειδοποιήσεις"</item>
+    <item quantity="other" msgid="980049191810249052">"%d εφαρμογές μπορούν να διαβάσουν ειδοποιήσεις"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Δεν έχουν εγκατασταθεί υπηρεσίες ακρόασης ειδοποιήσεων."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ενεργοποίηση <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Η εφαρμογή <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> θα μπορεί να διαβάζει όλες τις ειδοποιήσεις που δημοσιεύει το σύστημα ή οποιαδήποτε εγκατεστημένη εφαρμογή, οι οποίες ενδέχεται να συμπεριλαμβάνουν προσωπικά στοιχεία, όπως ονόματα επαφών και κείμενα από μηνύματα που έχετε λάβει. Θα έχει επίσης τη δυνατότητα να απορρίπτει αυτές τις ειδοποιήσεις ή να αγγίζει τα κουμπιά ενεργειών που περιέχονται σε αυτές."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Πάροχοι συνθηκών"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Καμία εφαρμογή δεν παρέχει συνθήκες"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d εφαρμογή παρέχει συνθήκες"</item>
+    <item quantity="other" msgid="358057362115673258">"%d εφαρμογές παρέχουν συνθήκες"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Δεν εγκαταστάθηκαν πάροχοι συνθηκών."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ενεργοποίηση <xliff:g id="SERVICE">%1$s</xliff:g>;"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> θα έχει τη δυνατότητα να προσθέτει συνθήκες εξόδου στη λειτουργία \"Μην ενοχλείτε\"."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Φόρτωση εφαρμογών…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Εμφάνιση ειδοποιήσεων"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Υψηλής προτεραιότητας"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Εμφάνιση στην κορυφή της λίστας"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Απόκρυψη ευαίσθητου περιεχομένου όταν η συσκευή είναι κλειδωμένη"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Έχει αποκλειστεί"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Κορυφή της λίστας"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Ευαίσθητο"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Τέλος"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Ανενεργό"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Ενεργό"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Μέχρι να το απενεργοποιήσετε"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Αποκλεισμός όλων των διακοπών, εκτός από"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Τη νύχτα"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Άλλος αυτοματισμός"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Αυτόματη ενεργοποίηση"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ποτέ"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Τηλεφωνικές κλήσεις"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Μηνύματα"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ώρα έναρξης"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ώρα λήξης"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> επόμενη μέρα"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ειδοποιήσεις εφαρμ."</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ρυθμίσεις ειδοποιήσεων"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Αποστολή σχολίων για τη συσκευή"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 0690eed..adf0cca 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"You are now a developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; NETWORKS"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DEVICE"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Wireless &amp; Networks"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Device"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"System"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Turn on radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Turn off radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Turn on SMS over IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Require a numerical PIN or password to decrypt your tablet each time that you turn it on"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Require a numerical PIN or password to decrypt your phone each time that you turn it on"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your tablet, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can only decrypt your tablet by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your phone, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can\'t decrypt your phone except by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your tablet, assuming that you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the tablet every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in throughout the process. If you interrupt, you\'ll lose some or all of your data"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. After you encrypt your phone, assuming that you\'ve set up a screen lock (that is, a pattern or numeric PIN or password), you\'ll need to unlock the screen to decrypt the phone every time you power it on. The only other way to decrypt is to perform a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in throughout the process. If you interrupt, you\'ll lose some or all of your data."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encrypt tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encrypt phone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Please charge your battery and try again."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"View or deactivate device administrators"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"View or deactivate trust agents"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Notification access"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps cannot read notifications"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app can read notifications"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apps can read notifications"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"No notification listeners are installed."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app provides conditions"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps provide conditions"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> will be able to add exit conditions to Do not disturb mode."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Turn on Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connect to network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Forget network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"To see available networks, turn Wi‑Fi on."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Searching for Wi‑Fi networks…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"You don\'t have permission to change the Wi‑Fi network."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Enter your network password."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringer volume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default notification sound"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up if high priority"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Mute music &amp; other media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Mute notifications"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Mute alarms"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrate when ringing"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dock settings"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Switch orientation automatically when rotating phone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Switch orientation automatically when rotating tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Switch orientation automatically when rotating phone"</string>
-    <string name="brightness" msgid="2354961343555249270">"Brightness"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode when USB is connected"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revoke USB debugging authorisations"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Power menu bug reports"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Include option in power menu for taking a bug report"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Stay awake"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"Type password to decrypt storage"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Enter your PIN to decrypt storage"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Draw your pattern to decrypt storage"</string>
     <string name="try_again" msgid="4272075051293936921">"Try again."</string>
     <string name="delete" msgid="4219243412325163003">"Delete"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc. files"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tap &amp; pay"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Pay with just a tap"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Favour foreground app"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Learn more"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Find apps"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recent searches"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"When device is locked"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hide sensitive notification content"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Do not disturb"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Do not disturb"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notifications"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Set up Wi-Fi NFC Tag"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Invalid password, try again."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Unable to write data to NFC tag. If the problem persists, try a different tag"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Sounds &amp; Notifications"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Media volume"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm volume"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Ring volume"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Do not disturb"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"When calls and notifications arrive"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Ring"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrate instead of ringing"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Don\'t ring or vibrate"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrate when ringing"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Showing notifications"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"When device is locked"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hide sensitive notification content"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Don\'t show notifications at all"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"When do not disturb is on"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Hide new notifications from the list"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Show all notifications in the list"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Touch sounds"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Screen locking &amp; unlocking"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Other touch sounds"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrate on touch"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps cannot read notifications"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d app can read notifications"</item>
+    <item quantity="other" msgid="980049191810249052">"%d apps can read notifications"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"No notification listeners are installed."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d app provides conditions"</item>
+    <item quantity="other" msgid="358057362115673258">"%d apps provide conditions"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> will be able to add exit conditions to Do not disturb mode."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Show notifications"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"High priority"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Display at the top of the list"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Hide sensitive content when device is locked"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocked"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Top of list"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitive"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Finished"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Off"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"On"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Until you turn this off"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Block all interruptions except"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"At night"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Other automation"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatically turn on"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Phone calls"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 0690eed..ee4d881 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"You are now a developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No need, you are already a developer."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; NETWORKS"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DEVICE"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Turn on radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Turn off radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Turn on SMS over IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryption"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encrypt tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encrypt phone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Require a numerical PIN or password to decrypt your tablet each time that you turn it on"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Require a numerical PIN or password to decrypt your phone each time that you turn it on"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encrypted"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your tablet, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can only decrypt your tablet by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"You can encrypt your accounts, settings, downloaded apps and their data, media and other files. Once you encrypt your phone, you need to type a numeric PIN or password to decrypt it each time you switch it on. You can\'t decrypt your phone except by performing a factory data reset, erasing all your data.\n\nEncryption takes an hour or more. You must start with a charged battery and keep your phone plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encrypt tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encrypt phone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Please charge your battery and try again."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"View or deactivate device administrators"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"View or deactivate trust agents"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Notification access"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps cannot read notifications"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app can read notifications"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apps can read notifications"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"No notification listeners are installed."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app provides conditions"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps provide conditions"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> will be able to add exit conditions to Do not disturb mode."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Turn on Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connect to network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Forget network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"To see available networks, turn Wi‑Fi on."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Searching for Wi‑Fi networks…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"You don\'t have permission to change the Wi‑Fi network."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS available)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", secured with <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Enter your network password."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"None"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"To improve location accuracy and for other purposes, <xliff:g id="APP_NAME">%1$s</xliff:g> wants to turn on network scanning, even when Wi-Fi is off.\n\nAllow this for all apps that want to scan?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Allow"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sound"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Music effects"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringer volume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrate when silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default notification sound"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up if high priority"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Mute music &amp; other media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Mute notifications"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Mute alarms"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrate when ringing"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dock settings"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Switch orientation automatically when rotating phone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Switch orientation automatically when rotating tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Switch orientation automatically when rotating phone"</string>
-    <string name="brightness" msgid="2354961343555249270">"Brightness"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode when USB is connected"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revoke USB debugging authorisations"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Power menu bug reports"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Include option in power menu for taking a bug report"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Stay awake"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
@@ -1820,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"Type password to decrypt storage"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Try again."</string>
     <string name="delete" msgid="4219243412325163003">"Delete"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc. files"</string>
@@ -2072,6 +2069,8 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Change font size"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tap &amp; pay"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Pay with just a tap"</string>
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Learn more"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Find apps"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Set as your preference?"</string>
@@ -2125,16 +2124,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recent searches"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Results"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"When device is locked"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hide sensitive notification content"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Do not disturb"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Do not disturb"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notifications"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Set up Wi-Fi NFC Tag"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Write"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tap a tag to write..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Invalid password, try again."</string>
@@ -2142,19 +2133,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Unable to write data to NFC tag. If the problem persists, try a different tag"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC tag is not writeable. Please use a different tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default sound"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Do not disturb"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Phone ringtone"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrate when ringing"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hide sensitive notification content"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps cannot read notifications"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d app can read notifications"</item>
+    <item quantity="other" msgid="980049191810249052">"%d apps can read notifications"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"No notification listeners are installed."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> will be able to read all notifications posted by the system or any installed app, which may include personal information such as contact names and the text of messages sent to you. It will also be able to dismiss these notifications or touch action buttons within them."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Condition providers"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"No apps provide conditions"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d app provides conditions"</item>
+    <item quantity="other" msgid="358057362115673258">"%d apps provide conditions"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"No condition providers are installed."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Enable <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> will be able to add exit conditions to Do not disturb mode."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Loading apps..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Show notifications"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"High priority"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Finished"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Off"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"On"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Until you turn this off"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Block all interruptions except"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"At night"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Other automation"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatically turn on"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Never"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Phone calls"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
@@ -2170,5 +2234,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Start time"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"End time"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> next day"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App notifications"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Notification settings"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send feedback about this device"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bbec6bb..76bdaa1 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"¡Ya eres programador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, ya eres programador."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Encender la radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Apagar la radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Activar SMS por IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar Tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar dispositivo"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesitas un PIN numérico o contraseña para descifrar tu tablet cada vez que la enciendes"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Se necesita un PIN numérico o contraseña para descifrar tu dispositivo cada vez que lo enciendes"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Una vez que hayas encriptado la tablet, debes ingresar un PIN o una contraseña numérica para desencriptarla cada vez que la enciendas. No puedes desencriptar tu tablet a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener la tablet conectada hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, tus parámetros de configuración, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Luego de encriptar tu dispositivo, tienes que escribir un PIN o contraseña numéricos cada vez que lo enciendes para desencriptarlo. No puedes desencriptar tu dispositivo a menos que restablezcas su configuración de fábrica y borres, así, todos tus datos.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con la batería cargada y mantener el dispositivo conectado hasta que finalice. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar dispositivo"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga tu batería e inténtalo nuevamente."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar los administradores de dispositivo"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agentes de confianza"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Ver o desactivar agentes de confianza"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Acceso a notificaciones"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Las aplicaciones no pueden leer las notificaciones."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Cantidad de aplicaciones que pueden leer notificaciones: %d"</item>
-    <item quantity="other" msgid="980049191810249052">"Cantidad de aplicaciones que pueden leer notificaciones: %d"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"No hay detectores de notificaciones instalados."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"¿Habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrá leer todas las notificaciones publicadas por el sistema o por cualquier aplicación instalada. Las notificaciones pueden contener información personal, como nombres de contacto y el texto de los mensajes que recibes. También podrá rechazar estas notificaciones o tocar los botones de acción dentro de ellas."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveedores de condiciones"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ninguna aplicación proporciona condiciones"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"La aplicación %d proporciona condiciones"</item>
-    <item quantity="other" msgid="358057362115673258">"Las aplicaciones %d proporcionan condiciones"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No hay ningún proveedor de condiciones instalado."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"¿Habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrá agregar condiciones de salida al modo No molestar."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar a la red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Olvidar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar la red"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver las redes disponibles, activa Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Buscando redes Wi-Fi…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"No tienes permiso para cambiar la red Wi‑Fi."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WSP disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ingresa la contraseña de red."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes, incluso cuando la conexión Wi-Fi esté desactivada.\n\n¿Quieres permitir esto para todas las aplicaciones que deseen buscar redes?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Página principal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de la música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencioso"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Aparecer con prioridad alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono de llamada"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Silenciar música y otros archivos multimedia"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Silenciar notificaciones"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Silenciar alarmas"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Configuración de la base"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambiar la orientación automáticamente al girar el dispositivo"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambiar la orientación automáticamente al girar el tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Cambiar la orientación automáticamente al girar el dispositivo"</string>
-    <string name="brightness" msgid="2354961343555249270">"Brillo"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Depuración por USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuración cuando se conecta el USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revocar autorizaciones de depur. USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Inform. de err. en el menú Encendido"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opción de realizar un informe de errores en el menú de encendido"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer activo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca quedará inactiva mientras el dispositivo se esté cargando."</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Registro de búsq. de HCI de Bluetooth"</string>
@@ -1820,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC de 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Escribe la contraseña para desencriptar el almacenamiento"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Inténtalo de nuevo."</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"Archivos variados"</string>
@@ -2072,6 +2069,8 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Presionar y pagar"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Envía tu pago con solo presionar."</string>
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Más información"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Buscar aplicaciones"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"¿Establecer como preferencia?"</string>
@@ -2125,16 +2124,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Búsquedas recientes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Con dispositivo bloqueado"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar contenido confidencial de notificaciones"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de notificaciones"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"No molestar"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molestar"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notificaciones"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustes"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurar etiqueta NFC Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Escribir"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Presiona una etiqueta para editarla…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"La contraseña no es válida. Vuelve a intentarlo."</string>
@@ -2142,19 +2133,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"No se pudieron escribir datos en la etiqueta NFC. Si el problema persiste, prueba con una etiqueta diferente."</string>
     <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="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molestar"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Tono de llamada"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de notificaciones"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar contenido confidencial de notificaciones"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Las aplicaciones no pueden leer las notificaciones."</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"Cantidad de aplicaciones que pueden leer notificaciones: %d"</item>
+    <item quantity="other" msgid="980049191810249052">"Cantidad de aplicaciones que pueden leer notificaciones: %d"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"No hay detectores de notificaciones instalados."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"¿Habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrá leer todas las notificaciones publicadas por el sistema o por cualquier aplicación instalada. Las notificaciones pueden contener información personal, como nombres de contacto y el texto de los mensajes que recibes. También podrá rechazar estas notificaciones o tocar los botones de acción dentro de ellas."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveedores de condiciones"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ninguna aplicación proporciona condiciones"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"La aplicación %d proporciona condiciones"</item>
+    <item quantity="other" msgid="358057362115673258">"Las aplicaciones %d proporcionan condiciones"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"No hay ningún proveedor de condiciones instalado."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"¿Habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrá agregar condiciones de salida al modo No molestar."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostrar notificaciones"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioridad alta"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Desactivado"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Activado"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hasta que lo desactives"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloquear interrupciones, excepto"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Por la noche"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Otra automatización"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automáticamente"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Llamadas telefónicas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
@@ -2170,5 +2234,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Día siguiente (<xliff:g id="FORMATTED_TIME">%s</xliff:g>)"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Configuración de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envía comentarios del dispositivo"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index a248767..b3fd842 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"¡Ahora están activadas las opciones de desarrollo!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"No es necesario, están activadas las opciones de desarrollo."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"CONEXIONES INALÁMBRICAS Y REDES"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Conexiones inalámbricas y redes"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Activar señal móvil"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desactivar señal móvil"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Activar SMS por IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptación"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar teléfono"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Solicitar una contraseña o un PIN numérico para descifrar el tablet cada vez que se encienda"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Solicitar una contraseña o un PIN numérico para descifrar el teléfono cada vez que se encienda"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el tablet, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del tablet.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el tablet conectado hasta que acabe. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puedes encriptar tus cuentas, tus ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros tipos de archivos. Cuando hayas encriptado el teléfono, debes introducir un PIN o una contraseña para descifrarlo cada vez que lo enciendas. Solo podrás deshacer la operación restableciendo los datos de fábrica y borrando todos los datos del teléfono.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar este proceso con una batería cargada y mantener el teléfono conectado hasta que acabe. Si se interrumpe el proceso de encriptación, perderás tus datos total o parcialmente."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Puedes encriptar tus cuentas, los ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de encriptar el tablet, siempre que hayas configurado una pantalla de bloqueo (es decir, un patrón o una contraseña o un PIN numéricos), tendrás que desbloquear la pantalla para descifrar el tablet cada vez que lo enciendas. También puedes descifrar el dispositivo restableciendo los datos de fábrica, pero se borrarán todos tus datos.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar el proceso con una batería cargada y mantener el tablet enchufado. Si se interrumpe el proceso, perderás tus datos de forma total o parcial"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Puedes encriptar tus cuentas, los ajustes, las aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de encriptar el teléfono, siempre que hayas configurado una pantalla de bloqueo (es decir, un patrón o una contraseña o un PIN numéricos), tendrás que desbloquear la pantalla para descifrar el teléfono cada vez que lo enciendas. También puedes descifrar el dispositivo restableciendo los datos de fábrica, pero se borrarán todos tus datos.\n\nEl proceso de encriptación tarda aproximadamente una hora. Debes iniciar el proceso con una batería cargada y mantener el teléfono enchufado. Si se interrumpe el proceso, perderás tus datos de forma total o parcial."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar teléfono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carga la batería y vuelve a intentarlo."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver o desactivar administradores de dispositivo"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agentes de confianza"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Ver o desactivar agentes de confianza"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Acceso a notificaciones"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Las aplicaciones no pueden leer notificaciones"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicación puede leer notificaciones."</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicaciones pueden leer notificaciones."</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"No hay detectores de notificaciones instalados."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"¿Quieres habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrá leer todas las notificaciones que el sistema o cualquier aplicación instalada publiquen. Estas notificaciones pueden incluir información personal, como nombres de contactos y texto de mensajes que hayas recibido. También podrá ignorar estas notificaciones o tocar botones de acción de las mismas."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveedores de condiciones"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ninguna aplicación proporciona condiciones"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"La aplicación %d proporciona condiciones"</item>
-    <item quantity="other" msgid="358057362115673258">"Las aplicaciones %d proporcionan condiciones"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"No se ha instalado ningún proveedor de condiciones."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"¿Quieres habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrá añadir condiciones de salida al modo No molestar."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Ajustes de Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Establecer conexión con red"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Borrar red"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar red"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver redes disponibles, activa el Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Buscando redes Wi-Fi…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"No tienes permiso para cambiar la red Wi‑Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegida con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Introduce la contraseña de la red."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Ninguna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para mejorar la precisión de la ubicación y para otros fines, <xliff:g id="APP_NAME">%1$s</xliff:g> quiere activar la búsqueda de redes aunque la conexión Wi-Fi esté desactivada.\n\n¿Permitir para todas las aplicaciones que quieran buscar redes?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Inicio"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Pantalla"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sonido"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumen"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efectos de música"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volumen del timbre"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en modo silencio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sonido de notificación predeterminado"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Usar LED de notificaciones"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Aparecer con prioridad alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Silenciar música y otros archivos multimedia"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Silenciar notificaciones"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Silenciar alarmas"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Base"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Ajustes de la base"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambiar orientación al girar el tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Cambiar orientación automáticamente al girar el teléfono"</string>
-    <string name="brightness" msgid="2354961343555249270">"Brillo"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Suspender después de"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Depuración USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Activar el modo de depuración cuando el dispositivo esté conectado por USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revocar autorizaciones depur. USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Informe de error menú encendido"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opción en el menú de encendido para generar un informe de error"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Pantalla activa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca entra en modo de suspensión si el dispositivo se está cargando"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Registro de búsqueda de HCI Bluetooth"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Dirección MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduce la contraseña para descifrar el almacenamiento."</string>
+    <string name="enter_pin" msgid="286221169871526876">"Introduce el PIN para descifrar el almacenamiento"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Dibuja el patrón para descifrar el almacenamiento"</string>
     <string name="try_again" msgid="4272075051293936921">"Inténtalo de nuevo."</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"Archivos variados"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambiar tamaño de fuente"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tocar y pagar"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Paga con solo dar un toque"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Favorecer aplicación en primer plano"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Más información"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Buscar aplicaciones"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"¿Establecer como preferencia?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Búsquedas recientes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi, red, conexión"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Con dispositivo bloqueado"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar notificaciones de carácter sensible"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas las notificaciones"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"No molestar"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molestar"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notificaciones"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Cambios"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurar etiqueta NFC Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Editar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toca una etiqueta para editarla..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Contraseña no válida. Vuelve a intentarlo."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Error al escribir datos en la etiqueta NFC. Si el problema persiste, prueba con otra etiqueta"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"No se puede editar la etiqueta NFC. Prueba con otra etiqueta."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sonido predeterminado"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Sonidos/notificaciones"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volumen multimedia"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volumen de alarma"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volumen del tono"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"No molestar"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Al recibir llamadas o notificaciones"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Sonar"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrar en lugar de sonar"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"No sonar ni vibrar"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Tono del teléfono"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Tono de notificación predeterminado"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Mostrando notificaciones"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Usar LED de notificaciones"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Con dispositivo bloqueado"</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 notificaciones de carácter sensible"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"No mostrar notificaciones"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Cuando el modo no molestar esté activado"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ocultar notificaciones nuevas de la lista"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostrar todas las notificaciones en la lista"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Sonidos táctiles"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonos del teclado"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Al bloquear y desbloquear la pantalla"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Otros sonidos táctiles"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrar al tocar"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Las aplicaciones no pueden leer notificaciones"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplicación puede leer notificaciones."</item>
+    <item quantity="other" msgid="980049191810249052">"%d aplicaciones pueden leer notificaciones."</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"No hay detectores de notificaciones instalados."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"¿Quieres habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> podrá leer todas las notificaciones que el sistema o cualquier aplicación instalada publiquen. Estas notificaciones pueden incluir información personal, como nombres de contactos y texto de mensajes que hayas recibido. También podrá ignorar estas notificaciones o tocar botones de acción de las mismas."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Proveedores de condiciones"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ninguna aplicación proporciona condiciones"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"La aplicación %d proporciona condiciones"</item>
+    <item quantity="other" msgid="358057362115673258">"Las aplicaciones %d proporcionan condiciones"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"No se ha instalado ningún proveedor de condiciones."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"¿Quieres habilitar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> podrá añadir condiciones de salida al modo No molestar."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Cargando aplicaciones..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostrar notificaciones"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioridad alta"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Mostrar al principio de la lista"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ocultar contenido de carácter sensible cuando el dispositivo está bloqueado"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueada"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Principio de lista"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Listo"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"No"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Sí"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hasta apagar el dispositivo"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloquear todas las interrupciones menos"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Por la noche"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Otra automatización"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activar automáticamente"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Llamadas de teléfono"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensajes"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de inicio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de finalización"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Día siguiente a las <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. aplicaciones"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ajustes de notificaciones"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Dar tu opinión sobre el dispositivo"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index fd4399f..9bae09f 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Olete nüüd arendaja!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ei ole vaja, olete juba arendaja."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRAADITA ÜHENDUS JA VÕRGUD"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"SEADE"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ISIKLIK"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SÜSTEEM"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Lülita raadio sisse"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Lülita raadio välja"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Lülitage sisse SMS üle IMS-i"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Krüpteerimine"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tahvelarvuti krüpteerimine"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoni krüpteerimine"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli tahvelarvuti dekrüpteerimiseks"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Igal telefoni sisselülitamisel on vaja numbrilist PIN-koodi või parooli telefoni dekrüpteerimiseks"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krüpteeritud"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui tahvelarvuti on krüpteeritud, peate iga kord seadet sisse lülitades selle dekrüpteerimiseks sisestama numbrilise PIN-koodi või parooli. Tahvelarvuti krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed.\n\nKrüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja tahvelarvuti sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa või kõik oma andmed."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Saate krüpteerida oma kontosid, seadeid, allalaaditud rakendusi ja nende andmeid ning meediumi- ja muid faile. Kui telefon on krüpteeritud, peate iga kord seda sisse lülitades sisestama dekrüpteerimiseks numbrilise PIN-koodi või parooli. Telefoni krüpteeringut ei saa tühistada, välja arvatud tehaseandmete lähtestamisega, millega kustutatakse kõik teie andmed.\n\nKrüpteerimine võtab aega tunni või rohkem. Aku peab olema täis ja telefon sisse lülitatud, kuni krüpteerimine on lõpule viidud. Kui katkestate krüpteerimistoimingu, kaotate osa andmeid või kõik andmed."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krüpteeri tahvelarvuti"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krüpteeri telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laadige akut ja proovige uuesti."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Seadme ülemate kuvamine või desaktiveerimine"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Usaldusväärsed agendid"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Usaldusväärsete agentide kuvamine või inaktiveerimine"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Juurdepääs märguannetele"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Rakendused ei suuda märguandeid lugeda"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d rakendus suudab lugeda märguandeid"</item>
-    <item quantity="other" msgid="980049191810249052">"%d rakendust suudab lugeda märguandeid"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Märguannete kuulamisteenuseid pole installitud."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Kas lubada <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Teenus <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> suudab lugeda kõiki süsteemi või installitud rakenduse postitatud märguandeid. Sinna hulka võivad kuuluda ka isiklikud andmed, nagu kontaktide nimed ja teile saadetud sõnumite tekst. See võib nendest märguannetest ka loobuda või nendes olevaid toimingunuppe puudutada."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Tingimuste esitajad"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ükski rakendus ei esita tingimusi"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d rakendus esitab tingimused"</item>
-    <item quantity="other" msgid="358057362115673258">"%d rakendust esitavad tingimused"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ühtki tingimuste esitajat ei ole installitud."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Kas luban teenuse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> võib režiimile Mitte segada väljumistingimusi lisada."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Lülitage Bluetooth sisse"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Loo võrguühendus"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unusta võrk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Võrgu muutmine"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Saadavate võrkude kuvamiseks lülitage WiFi sisse."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"WiFi-võrkude otsimine ..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Teil pole WiFi-võrgu muutmiseks luba."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS on saadaval"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", kaitstud turbega <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Sisestage võrgu parool."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Puudub"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Täpsema asukoha ja muude toimingute jaoks tahab rakendus <xliff:g id="APP_NAME">%1$s</xliff:g> võrkude skannimise sisse lülitada, isegi kui WiFi on välja lülitatud.\n\nKas lubada see kõigi rakenduste jaoks, mis skannida tahavad?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Luba"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Avaekraan"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Kuva"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Heli"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Helitugevused"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muusikaefektid"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Helina helitugevus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibreeri hääletus režiimis"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Märguande vaikeheli"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuv teatise tuli"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Kõrge priorit. kuvatakse hüpik"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Helin"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Teatis"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Muusika ja muude meediumide summutamine"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Teatiste summutamine"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Äratuste summutamine"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreerimine helina ajal"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokk"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Doki seaded"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Heli"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Muuda telefoni pööramisel automaatselt orientatsiooni"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tahvelarvuti pööramisel automaatselt paigutuse ümberlülitamine"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Muuda telefoni pööramisel automaatselt orientatsiooni"</string>
-    <string name="brightness" msgid="2354961343555249270">"Eredus"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Reguleeri ekraani heledust"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Unerežiim"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustapilt"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB silumine"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Silumisrežiim, kui USB on ühendatud"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Tühista USB silumisvolitused"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Toitemenüü veaaruanded"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Kaasa toitemenüüs veaaruande tegemise valik"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Jää sisselülitatuks"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekraan ei lähe kunagi laadimise ajal unerežiimi"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Luba Bluetoothi HCI jälgimise logi"</string>
@@ -1820,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-aadress"</string>
     <string name="enter_password" msgid="4131758584074246224">"Mälu dekrüpteerimiseks sisestage parool"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Proovige uuesti."</string>
     <string name="delete" msgid="4219243412325163003">"Kustuta"</string>
     <string name="misc_files" msgid="6720680815969643497">"Mitmesugused failid"</string>
@@ -2072,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Fondi suuruse muutmine"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Puuduta ja maksa"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Makske vaid ühe puudutusega"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Eelista esiplaanil olevat rakendust"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Lisateave"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Rakenduste otsimine"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Kas määrata eelistuseks?"</string>
@@ -2125,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Hiljutised otsingud"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Tulemused"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wifi-võrgu ühendus"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Kui seade on lukus"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Märguande tundliku sisu peitmine"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Märguande kogu sisu kuvamine"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Mitte segada"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Mitte segada"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Märguanded"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Kohendused"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Rakenduse märguanded"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WiFi NFC-kiibi seadistamine"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Kirjuta"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjutamiseks puudutage kiipi ..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Vale parool, proovige uuesti."</string>
@@ -2142,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC-kiibile ei saa andmeid kirjutada. Kui probleem püsib, proovige muud kiipi"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-kiip ei ole kirjutatav. Kasutage muud kiipi."</string>
     <string name="default_sound" msgid="8821684447333687810">"Vaikeheli"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Mitte segada"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Telefoni helin"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreerimine helina ajal"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuv teatise tuli"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Märguande kogu sisu kuvamine"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Märguande tundliku sisu peitmine"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Rakenduse märguanded"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Rakendused ei suuda märguandeid lugeda"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d rakendus suudab lugeda märguandeid"</item>
+    <item quantity="other" msgid="980049191810249052">"%d rakendust suudab lugeda märguandeid"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Märguannete kuulamisteenuseid pole installitud."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Kas lubada <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Teenus <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> suudab lugeda kõiki süsteemi või installitud rakenduse postitatud märguandeid. Sinna hulka võivad kuuluda ka isiklikud andmed, nagu kontaktide nimed ja teile saadetud sõnumite tekst. See võib nendest märguannetest ka loobuda või nendes olevaid toimingunuppe puudutada."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Tingimuste esitajad"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ükski rakendus ei esita tingimusi"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d rakendus esitab tingimused"</item>
+    <item quantity="other" msgid="358057362115673258">"%d rakendust esitavad tingimused"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Ühtki tingimuste esitajat ei ole installitud."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Kas luban teenuse <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> võib režiimile Mitte segada väljumistingimusi lisada."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Rakenduste laadimine ..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Kuva märguanded"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Kõrge prioriteet"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Väljas"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Sees"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Kuni lülitate selle välja"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokeeri kõik katkestused, v.a"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Öösel"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Muud seadmed"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaatne sisselülitus"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mitte kunagi"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonikõned"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sõnumid"</string>
@@ -2170,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Algusaeg"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Lõppaeg"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> järgmisel päeval"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Rakenduse märguanded"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Märguandeseaded"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Seadme kohta tagasiside saatmine"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 18768fe..99fa90c 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"شما اکنون یک برنامه‌نویس هستید!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"نیازی نیست، شما در حال حاضر یک برنامه‌نویس هستید."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"بی‌سیم و شبکه‌ها"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"دستگاه"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"شخصی"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"سیستم"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"روشن کردن رادیو"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"خاموش کردن رادیو"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"‏فعال کردن پیامک در IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"رمزگذاری"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"رمزگذاری رایانهٔ لوحی"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"رمزگذاری تلفن"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"هر بار که رایانهٔ لوحی خود را روشن می‌کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"هر بار که تلفن خود را روشن می‌کنید، برای رمزگشایی به یک پین عددی یا رمز ورود نیاز دارید"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"رمز گذاری شده"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که رایانهٔ لوحی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود. به هیچ وجه نمی‌توانید رمزگذاری رایانهٔ لوحی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند.\n\nعملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و رایانهٔ لوحی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"شما می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و داده‌های آن‌ها، رسانه و فایل‌های دیگر خود را رمزگذاری کنید. هنگامی که گوشی خود را رمزگذاری کردید، هر بار که آن را روشن می‌کنید باید یک پین عددی یا یک گذرواژه را وارد کنید تا رمزگشایی شود. به هیچ وجه نمی‌توانید رمزگذاری گوشی خود را لغو کنید مگر اینکه به تنظیمات کارخانه بازنشانی کنید که این کار هم تمام داده‌های شما را حذف می‌کند.\n\nعملیات رمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این کار را زمانی آغاز کنید که باتری دارای شارژ کامل باشد و گوشی باید تا پایان کار رمزگذاری به برق وصل باشد. اگر در روند رمزگذاری تداخلی به وجود بیاورید، تمام یا بعضی از داده‌های خود را از دست خواهید داد."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"مشاهده یا غیر فعال کردن سرپرست های دستگاه"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"‏نمایش یا غیرفعال کردن trust agents"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"دسترسی به اعلان"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"برنامه‌ها نمی‌توانند اعلان‌ها را بخوانند"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"‏%d برنامه می‌تواند اعلان‌ها را بخواند"</item>
-    <item quantity="other" msgid="980049191810249052">"‏%d برنامه‌‌ می‌توانند اعلان‌ها را بخوانند"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"هیچ شنونده اعلانی نصب نشده است."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> فعال‌ شود؟"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> می‌تواند تمام اعلان‌های پست شده از طرف سیستم یا هر یک از برنامه‌های نصب شده را بخواند، که ممکن است حاوی اطلاعات شخصی مانند نام مخاطبین و متن پیام‌های ارسال شده به شما باشد. همچنین می‌تواند این اعلان‌ها را رد کند یا امکان لمس دکمه‌های عملکردی موجود در آنها را فراهم کند."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ارائه‌دهندگان شرایط"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"هیچ برنامه‌ای ارائه‌دهنده شرایط نیست"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"‏برنامه %d ارائه‌دهنده شرایط است"</item>
-    <item quantity="other" msgid="358057362115673258">"‏برنامه‌های %d ارائه‌دهنده شرایط هستند"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"هیچ ارائه‌دهنده شرایطی نصب نیست."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> فعال‌ شود؟"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> قادر خواهد بود شرایط خروج را به حالت «مزاحم نشوید» اضافه کند."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"بلوتوث"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"روشن کردن بلوتوث"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"بلوتوث"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"اتصال به شبکه"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"فراموش کردن شبکه"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"اصلاح کردن شبکه"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"‏‫اجازه ندارید شبکه Wi‑Fi را تغییر دهید."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS در دسترس است)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"، ایمن شده با <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"گذرواژه شبکه خود را وارد کنید."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"هیچکدام"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏برای بهبود دقت موقعیت مکانی و مقاصد دیگر، <xliff:g id="APP_NAME">%1$s</xliff:g> می‌خواهد اسکن کردن شبکه را فعال کند، حتی هنگامی که Wi-Fi خاموش است.\n\nاین مورد را برای همه برنامه‌هایی که می‌خواهند اسکن کنند مجاز می‌کنید؟"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"مجاز"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"صفحه اصلی"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"صفحهٔ نمایش"</string>
     <string name="sound_settings" msgid="5534671337768745343">"صدا"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"میزان صدا"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"جلوه‌های موسیقی"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"میزان صدای زنگ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"لرزش در حالت بی‌صدا"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"صدای اعلان پیش‌فرض"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"چراغ اعلان چشمک بزند"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"بازشدن در صورت بالابودن اولویت"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"آهنگ زنگ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"اعلان"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"بی‌صدا کردن موسیقی و سایر رسانه‌ها"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"بی‌صدا کردن اعلان‌ها"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"بی‌صدا کردن زنگ هشدار"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"لرزش هنگام زنگ زدن"</string>
     <string name="dock_settings" msgid="1820107306693002541">"جایگاه"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"تنظیمات جایگاه"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"صوتی"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"روشنایی"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"تنظیم روشنایی صفحه"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"حالت خواب"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"‏رفع عیب USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"‏با اتصال USB حالت رفع عیب فعال شود"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"‏لغو مجوزهای اشکال‌زدایی USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"گزارش‌های اشکال در منوی نیرو"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"گزینه‌ای در منوی نیرو برای گرفتن گزارش اشکال اضافه شود"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"بیدار ماندن"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"صفحه هرگز در حین شارژ شدن به حالت خواب نمی‌رود"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"‏فعال کردن گزارش تجسس Bluetooth HCI"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"زیر و بمی صدا"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"بر صدای متن گفته شده تأثیر می‌گذارد"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"زبان"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"استفاده از زبان سیستم"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"زبان انتخاب نشده است"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"صدای خاص یک زبان را برای متن گفتاری تنظیم می‌کند"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"به نمونه‌ای گوش کنید"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏آدرس 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"برای رمزگشایی حافظه گذرواژه را تایپ کنید"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"دوباره امتحان کنید."</string>
     <string name="delete" msgid="4219243412325163003">"حذف"</string>
     <string name="misc_files" msgid="6720680815969643497">"فایل‌های متفرقه"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"تغییر اندازه قلم"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ضربه و پرداخت"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"فقط با یک ضربه پرداخت کنید"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"برنامه ترجیحی در پیش‌زمینه"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"بیشتر بدانید"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"یافتن برنامه‌ها"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"به عنوان روش ترجیحی شما تنظیم شود؟"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"جستجوهای اخیر"</string>
     <string name="search_results_label" msgid="4163304782363526148">"نتایج"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi ‏اتصال شبکه wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"وقتی دستگاه قفل است"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"پنهان کردن محتوای حساس اعلان"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"نمایش همه محتوای اعلان"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"مزاحم نشوید"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"مزاحم نشوید"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"اعلان‌ها"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"اعلان‌های برنامه"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"‏تنظیم برچسب NFC برای WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"نوشتن"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ضربه زدن روی یک برچسب برای نوشتن..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"گذرواژه نادرست است، دوباره امتحان کنید."</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"‏نوشتن داده برای برچسب NFC ممکن نیست. اگر مشکل ادامه یافت، یک برچسب متفاوت را امتحان کنید"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏برچسب NFC قابل نوشتن نیست. لطفاً از یک برچسب متفاوت استفاده کنید."</string>
     <string name="default_sound" msgid="8821684447333687810">"صدای پیش‌فرض"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"مزاحم نشوید"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"آهنگ زنگ تلفن"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"لرزش هنگام زنگ زدن"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"چراغ اعلان چشمک بزند"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"نمایش همه محتوای اعلان"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"پنهان کردن محتوای حساس اعلان"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"اعلان‌های برنامه"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"برنامه‌ها نمی‌توانند اعلان‌ها را بخوانند"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"‏%d برنامه می‌تواند اعلان‌ها را بخواند"</item>
+    <item quantity="other" msgid="980049191810249052">"‏%d برنامه‌‌ می‌توانند اعلان‌ها را بخوانند"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"هیچ شنونده اعلانی نصب نشده است."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> فعال‌ شود؟"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> می‌تواند تمام اعلان‌های پست شده از طرف سیستم یا هر یک از برنامه‌های نصب شده را بخواند، که ممکن است حاوی اطلاعات شخصی مانند نام مخاطبین و متن پیام‌های ارسال شده به شما باشد. همچنین می‌تواند این اعلان‌ها را رد کند یا امکان لمس دکمه‌های عملکردی موجود در آنها را فراهم کند."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"ارائه‌دهندگان شرایط"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"هیچ برنامه‌ای ارائه‌دهنده شرایط نیست"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"‏برنامه %d ارائه‌دهنده شرایط است"</item>
+    <item quantity="other" msgid="358057362115673258">"‏برنامه‌های %d ارائه‌دهنده شرایط هستند"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"هیچ ارائه‌دهنده شرایطی نصب نیست."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> فعال‌ شود؟"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> قادر خواهد بود شرایط خروج را به حالت «مزاحم نشوید» اضافه کند."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"در حال بارگیری برنامه..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"نمایش اعلان‌ها"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"اولویت بالا"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"انجام شد"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"خاموش"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"روشن"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"تا وقتی آن را خاموش کنید"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"مسدود کردن همه وقفه‌ها به استثنا"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"در شب"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"موارد دیگر تنظیم خودکار"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"روشن کردن خودکار"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">"،"</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"هرگز"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"تماس‌های تلفنی"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"پیام‌ها"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"زمان شروع"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"زمان پایان"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> روز بعد"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"اعلان‌های برنامه"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"تنظیمات اعلان"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ارسال بازخورد درباره این دستگاه"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f74fcc4..ee37b2b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Olet nyt kehittäjä!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ei tarvitse klikata, olet jo kehittäjä."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"LANGATTOMAT YHTEYDET JA VERKOT"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"LAITE"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"HENKILÖKOHTAINEN"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"JÄRJESTELMÄ"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Käynnistä radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Sammuta radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Ota tekstiviestit käyttöön IMS:n kautta"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Salaus"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Salaa tablet-laite"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Salaa puhelin"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Vaatii PIN-koodin tai salasanan, jonka avulla tablet-laitteesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Vaatii PIN-koodin tai salasanan, jonka avulla puhelimesi salaus puretaan aina kytkiessäsi sen virran päälle"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun tablet-laitteesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa tablet-laitteesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan.\n\nSalaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja tablet-laitteen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Voit salata tilisi, asetuksesi, lataamasi sovellukset ja niiden tiedot sekä media- ja muut tiedostot. Kun puhelimesi on salattu, sinun tulee antaa PIN-koodi tai salasana poistaaksesi salauksen aina kytkiessäsi laitteen virran päälle. Voit poistaa puhelimesi salauksen vain palauttamalla siihen tehdasasetukset, jolloin kaikki tietosi poistetaan.\n\nSalaus kestää vähintään tunnin. Se tulee aloittaa täydellä akulla, ja puhelimen tulee olla kytkettynä laturiin koko salauksen ajan. Jos keskeytät salauksen, menetät laitteesi tietoja."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Salaa tablet-laite"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Salaa puhelin"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lataa akku ja yritä uudelleen."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Näytä tai poista käytöstä laitteen ylläpitäjiä"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Luotettavat tahot"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Tarkastele luotettavia tahoja tai poista niitä käytöstä"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Pääsy ilmoituksiin"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Sovellukset eivät voi lukea ilmoituksia"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Sovellus %d voi lukea ilmoituksia"</item>
-    <item quantity="other" msgid="980049191810249052">"Sovellukset %d voivat lukea ilmoituksia"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Ilmoituskuuntelijoita ei ole asennettu."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pystyy lukemaan kaikki järjestelmän tai asennetun sovelluksen julkaisemat ilmoitukset, joihin voi sisältyä henkilökohtaisia tietoja, kuten kontaktien nimiä ja sinulle lähetettyjen viestien tekstiä. Se voi myös ohittaa nämä ilmoitukset tai niiden toimintopainikkeet."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Ehtojen toimituspalvelut"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ei ehtojen toimituspalveluja"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d toimii ehtojen toimituspalveluna"</item>
-    <item quantity="other" msgid="358057362115673258">"%d toimivat ehtojen toimituspalveluina"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ehtojen toimituspalveluja ei ole asennettu."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> voi lisätä lopetusehtoja Älä häiritse -tilaan."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ota Bluetooth-yhteys käyttöön"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Yhdistä verkkoon"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Unohda verkko"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Muokkaa verkkoa"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Näet käyt. olevat verkot, kun otat wifin käyttöön."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Haetaan wifi-verkkoja…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Käyttöoikeutesi eivät riitä wifi-verkon muuttamiseen."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS käytettävissä)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", salaus: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Kirjoita verkkosi salasana."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Ei mitään"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> haluaa parantaa sijainnin tarkkuutta ja suorittaa muita toimintoja ottamalla verkon etsinnän käyttöön, vaikka wifi-yhteys ei ole käytössä.\n\nAnnetaanko tämä lupa kaikille sovelluksille, jotka haluavat etsiä verkkoja?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Salli"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Etusivu"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Näyttö"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ääni"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Äänenvoimakkuudet"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musiikkitehosteet"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Soittoäänen voimakkuus"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Käytä värinää äänettömässä tilassa"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Ilmoituksen oletusääni"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuta ilmoitusvaloa"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Näytä tärkeät ruudussa"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Soittoääni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ilmoitus"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Mykistä musiikki ja muu media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Mykistä ilmoitukset"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Mykistä herätykset"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Värinä ja soittoääni"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Telakointi"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Telakointiasetukset"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ääni"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Vaihda suuntaa automaattisesti, kun puhelinta käännetään"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Vaihda suuntaa automaattisesti, kun puhelinta käännetään"</string>
-    <string name="brightness" msgid="2354961343555249270">"Kirkkaus"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Säädä näytön kirkkautta"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Virransäästö"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB-vianetsintä"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Vianetsintätila USB-liitännän ollessa käytössä"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Peruuta USB-vianetsinnän käyttöoikeudet"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Virheraportit virtavalikossa"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Lisää virtavalikkoon virheraportin teko -valinta"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Pysy käynnissä"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Näyttö ei sammu puhelimen latautuessa"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ota Bluetoothin HCI-tarkkailuloki käyttöön"</string>
@@ -1636,8 +1629,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Äänenkorkeus"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vaikuttaa puhutun tekstin äänenkorkeuteen"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Kieli"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Käytä järjestelmän kieltä"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Kieltä ei ole valittu"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Asettaa puhutulle tekstille kielikohtaisen äänen"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Kuuntele esimerkki"</string>
@@ -1829,6 +1821,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC -osoite"</string>
     <string name="enter_password" msgid="4131758584074246224">"Poista tallennustilan salaus antamalla salasana."</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Yritä uudelleen."</string>
     <string name="delete" msgid="4219243412325163003">"Poista"</string>
     <string name="misc_files" msgid="6720680815969643497">"Muut tiedostot"</string>
@@ -2081,6 +2077,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Muuta kirjasinkokoa"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Napauttamalla maksaminen"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Maksa helposti napauttamalla"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Käytä etualalla olevaa ohjelmaa"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Lisätietoja"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Löydä sovelluksia"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Valitaanko asetukseksi?"</string>
@@ -2134,16 +2131,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Viimeisimmät haut"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Tulokset"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi verkko yhteys"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Kun laite on lukittu"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Piilota henkilökohtainen ilmoitussisältö"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Näytä ilmoitusten koko sisältö"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Varattu"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Varattu"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Ilmoitukset"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Säädöt"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Sovellusilmoitukset"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi-yhteyden NFC-tunnisteen asetus"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Kirjoita"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kirjoita napauttamalla tunnistetta…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Virheellinen salasana, yritä uudelleen."</string>
@@ -2151,19 +2140,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Tietojen kirjoittaminen NFC-tunnisteeseen epäonnistui. Jos ongelma jatkuu, kokeile toista tunnistetta."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-tunnisteeseen ei voi kirjoittaa. Käytä toista tunnistetta."</string>
     <string name="default_sound" msgid="8821684447333687810">"Oletusääni"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Varattu"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Puhelimen soittoääni"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Värinä ja soittoääni"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuta ilmoitusvaloa"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Näytä ilmoitusten koko sisältö"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Piilota henkilökohtainen ilmoitussisältö"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Sovellusilmoitukset"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Sovellukset eivät voi lukea ilmoituksia"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"Sovellus %d voi lukea ilmoituksia"</item>
+    <item quantity="other" msgid="980049191810249052">"Sovellukset %d voivat lukea ilmoituksia"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Ilmoituskuuntelijoita ei ole asennettu."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pystyy lukemaan kaikki järjestelmän tai asennetun sovelluksen julkaisemat ilmoitukset, joihin voi sisältyä henkilökohtaisia tietoja, kuten kontaktien nimiä ja sinulle lähetettyjen viestien tekstiä. Se voi myös ohittaa nämä ilmoitukset tai niiden toimintopainikkeet."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Ehtojen toimituspalvelut"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ei ehtojen toimituspalveluja"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d toimii ehtojen toimituspalveluna"</item>
+    <item quantity="other" msgid="358057362115673258">"%d toimivat ehtojen toimituspalveluina"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Ehtojen toimituspalveluja ei ole asennettu."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Otetaanko <xliff:g id="SERVICE">%1$s</xliff:g> käyttöön?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> voi lisätä lopetusehtoja Älä häiritse -tilaan."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Ladataan sovelluksia…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Näytä ilmoitukset"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Erittäin tärkeä"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Valmis"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Ei käytössä"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Käytössä"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Kunnes poistat tämän käytöstä"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Estä kaikki keskeytykset paitsi"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Yöllä"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Muut automaattitoiminnot"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ota automaattisesti käyttöön"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ei koskaan"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Puhelinsoitot"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Viestit"</string>
@@ -2179,5 +2241,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Aloitusaika"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Päättymisaika"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> seuraavana päivänä"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Sovellusilmoitukset"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ilmoitusasetukset"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Lähetä palautetta tästä laitteesta"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 6bed670..232f8f1 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Inuti, vous êtes déjà un développeur."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"SANS FIL ET RÉSEAUX"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"APPAREIL"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONNEL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTÈME"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Allumer le signal radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Éteindre le signal radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Activer SMS over IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement (ou cryptage)"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Crypter le téléphone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exiger un NIP ou un mot de passe numérique pour décrypter la tablette à chaque fois qu\'elle est allumée"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exiger un NIP ou un mot de passe numérique pour décrypter le téléphone à chaque fois qu\'il est allumé"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un NIP ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données.\n\nLe chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et la tablette doit rester branchée jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un NIP ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données.\n\nLe chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et le téléphone doit rester branché jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Crypter le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Veuillez charger votre batterie, puis réessayer."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afficher ou désactiver les administrateurs de l\'appareil"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agents de confiance"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Afficher ou désactiver les agents de confiance"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Accès aux notifications"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les applications ne peuvent pas lire les notifications."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d application peut lire les notifications."</item>
-    <item quantity="other" msgid="980049191810249052">"%d applications peuvent lire les notifications."</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Aucun outil d\'écoute des notifications installé."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications publiées par le système ou toute application installée. Ces notifications peuvent comporter des informations personnelles, telles que des noms de contacts et le texte de messages qui vous ont été envoyés. L\'application pourra également masquer ces notifications ou sélectionner les boutons d\'action qu\'elles contiennent."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fournisseurs de conditions"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Aucune application ne fournit de conditions"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d application fournit des conditions"</item>
-    <item quantity="other" msgid="358057362115673258">"%d applications fournissent des conditions"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Aucun fournisseur de conditions n\'est installé."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> pourra ajouter des conditions de sortie au mode Ne pas déranger."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activer Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Activez le Wi-Fi pour voir les réseaux disponibles."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Recherche de réseaux Wi-Fi en cours…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Vous n\'avez pas l\'autorisation de modifier le réseau Wi‑Fi."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Entrez votre mot de passe réseau."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Aucun"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Effets musicaux"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Son de notification par défaut"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Faire clignoter le voyant de notification"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Fen. context. priorité élevée"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Couper le son de la musique et des autres médias"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Désactiver les notifications"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Couper le son des alarmes"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Mode Vibreur lorsque le tél. sonne"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Paramètres station d’accueil"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Changer automatiquement d\'orientation lors de la rotation"</string>
-    <string name="brightness" msgid="2354961343555249270">"Luminosité"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Débogage USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode débogage lorsqu\'un câble USB est connecté"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Annuler les autorisations relatives au débogage USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Rapports de bogue du menu de démarrage"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclure une option permettant d\'établir un rapport de bug dans le menu de démarrage"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Rester activé"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer le journal HCI Snoop Bluetooth"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ton"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Affecte le ton utilisé par la synthèse vocale"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Langue"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Utiliser la langue du système"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Langue non sélectionnée"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définit la langue utilisée par la syntèse vocale"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Écouter un échantillon"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Type password to decrypt storage"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Réessayer."</string>
     <string name="delete" msgid="4219243412325163003">"Supprimer"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fichiers divers"</string>
@@ -2075,6 +2071,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Toucher et payer"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Payez en un toucher sur l\'écran"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Privilégier l\'application au premier plan"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"En savoir plus"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Trouver des applications"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Définir comme application de paiement par défaut?"</string>
@@ -2128,16 +2125,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recherches récentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Résultats"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connexion réseau wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Si appareil verrouillé"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Ne pas déranger"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne pas déranger"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notifications"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustements"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. application"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurer une balise NFC Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Écrire"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Touchez une balise pour pour écrire..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Mot de passe non valide, veuillez réessayer."</string>
@@ -2145,19 +2134,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Impossible d\'écrire des données sur la balise NFC. Si le problème persiste, essayez avec une autre balise."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"La balise NFC n\'est pas accessible en écriture. Veuillez en utiliser un autre."</string>
     <string name="default_sound" msgid="8821684447333687810">"Son par défaut"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne pas déranger"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Mode Vibreur lorsque le tél. sonne"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Faire clignoter le voyant de notification"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les applications ne peuvent pas lire les notifications."</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d application peut lire les notifications."</item>
+    <item quantity="other" msgid="980049191810249052">"%d applications peuvent lire les notifications."</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Aucun outil d\'écoute des notifications installé."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications publiées par le système ou toute application installée. Ces notifications peuvent comporter des informations personnelles, telles que des noms de contacts et le texte de messages qui vous ont été envoyés. L\'application pourra également masquer ces notifications ou sélectionner les boutons d\'action qu\'elles contiennent."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Fournisseurs de conditions"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Aucune application ne fournit de conditions"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d application fournit des conditions"</item>
+    <item quantity="other" msgid="358057362115673258">"%d applications fournissent des conditions"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Aucun fournisseur de conditions n\'est installé."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activer <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> pourra ajouter des conditions de sortie au mode Ne pas déranger."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Afficher les notifications"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Priorité élevée"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminé"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Désactivée"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Activée"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Jusqu\'à la désactivation"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloquer toutes les interruptions, sauf"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"La nuit"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Autres automatisations"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activation automatique"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Jamais"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Appels téléphoniques"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
@@ -2173,5 +2235,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notif. application"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Commentaires sur cet appareil"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index cd24e24..ec492c5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Vous êtes désormais un développeur !"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Inutile, vous êtes déjà un développeur."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"SANS FIL ET RÉSEAUX"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"APPAREIL"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONNEL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTÈME"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Allumer le signal radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Éteindre le signal radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Activer SMS over IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Chiffrement"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Chiffrer le téléphone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer la tablette à chaque fois qu\'elle est allumée"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exiger un code PIN ou un mot de passe numérique pour déchiffrer le téléphone à chaque fois qu\'il est allumé"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre tablette chiffrée, vous devez saisir un code PIN ou un mot de passe numérique pour la déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre tablette qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données.\n\nLe chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et la tablette doit rester branchée jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Vous pouvez chiffrer vos comptes, vos paramètres, vos applications téléchargées, ainsi que leurs données, supports et autres fichiers. Une fois votre téléphone chiffré, vous devez saisir un code PIN ou un mot de passe numérique pour le déchiffrer à chaque fois que vous l\'allumez. Vous ne pouvez déchiffrer votre téléphone qu\'en rétablissant la configuration d\'usine, ce qui effacera l\'ensemble de vos données.\n\nLe chiffrement peut prendre une heure, voire plus. La batterie doit être chargée lors du démarrage du processus, et le téléphone doit rester branché jusqu\'à la fin. Si vous interrompez le processus, vous perdrez certaines de vos données, voire la totalité."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Chiffrer la tablette"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Chiffrer le téléphone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Veuillez charger votre batterie, puis réessayer."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afficher ou désactiver les administrateurs de l\'appareil"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agents de confiance"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Afficher ou désactiver les agents de confiance"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Accès aux notifications"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les applications ne peuvent pas lire les notifications."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d application peut lire les notifications."</item>
-    <item quantity="other" msgid="980049191810249052">"%d applications peuvent lire les notifications."</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Aucun outil d\'écoute des notifications installé."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activer <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications publiées par le système ou toute application installée. Ces notifications peuvent comporter des informations personnelles, telles que des noms de contacts et le texte de messages qui vous ont été envoyés. L\'application pourra également masquer ces notifications ou sélectionner les boutons d\'action qu\'elles contiennent."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fournisseurs de conditions"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Aucune application ne fournit de conditions."</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d application fournit des conditions."</item>
-    <item quantity="other" msgid="358057362115673258">"%d applications fournissent des conditions."</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Aucun fournisseur de conditions n\'est installé."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activer <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> pourra ajouter des conditions de sortie au mode Ne pas déranger."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activer le Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Se connecter au réseau"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Retirer le réseau"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifier le réseau"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Activez le Wi-Fi pour voir les réseaux disponibles."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Recherche de réseaux Wi-Fi en cours…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Vous n\'avez pas l\'autorisation de modifier le réseau Wi‑Fi."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponible)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sécurisé par <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Veuillez saisir votre mot de passe réseau."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Aucune"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pour améliorer la précision de la position et à d\'autres fins, <xliff:g id="APP_NAME">%1$s</xliff:g> souhaite activer la recherche de réseaux, même lorsque le Wi-Fi est désactivé.\n\nDonner cette autorisation à toutes les applications souhaitant activer la recherche de réseaux ?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Autoriser"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Accueil"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Affichage"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Son"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Effets musicaux"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume de la sonnerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer en mode silencieux"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Son de notification par défaut"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Ouvrir pop-up si priorité élevée"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Sonnerie"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Couper le son de la musique et des autres médias"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Couper le son des notifications"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Couper le son des alarmes"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreur quand téléphone sonne"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Station d\'accueil"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Paramètres station d\'accueil"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Changer automatiquement d\'orientation lors de la rotation de la tablette"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Changer automatiquement d\'orientation lors de la rotation du téléphone"</string>
-    <string name="brightness" msgid="2354961343555249270">"Luminosité"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Veille"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Débogage USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode débogage lorsqu\'un câble USB est connecté"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Annuler autorisations pour débog. USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Rapports de bug menu démarra."</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inclure une option permettant d\'établir un rapport de bug dans le menu de démarrage"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Rester activé"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement."</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer journaux HCI Bluetooth"</string>
@@ -1820,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresse MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Saisir le mot de passe pour déchiffrer la mémoire de stockage"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Réessayer"</string>
     <string name="delete" msgid="4219243412325163003">"Supprimer"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fichiers divers"</string>
@@ -2074,6 +2071,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Modifier la taille de la police"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Paiement sans contact"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Réglez vos achats d\'une simple pression sur l\'écran"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Privilégier l\'application au premier plan"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"En savoir plus"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Rechercher des applications"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Définir comme mode de paiement prioritaire ?"</string>
@@ -2127,16 +2125,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recherches récentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Résultats"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi réseau connexion"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Si appareil verrouillé"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Ne pas déranger"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne pas déranger"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notifications"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustements"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifications appli."</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurer un tag NFC Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Modifier"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Appuyer sur un tag pour le modifier…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Mot de passe erroné. Veuillez réessayer."</string>
@@ -2144,19 +2134,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Impossible de modifier des données sur le tag NFC. Si le problème persiste, essayez avec un autre tag."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Le tag NFC n\'est pas accessible en écriture. Veuillez en utiliser un autre."</string>
     <string name="default_sound" msgid="8821684447333687810">"Son par défaut"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne pas déranger"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Sonnerie du téléphone"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreur quand téléphone sonne"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Les applications ne peuvent pas lire les notifications."</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d application peut lire les notifications."</item>
+    <item quantity="other" msgid="980049191810249052">"%d applications peuvent lire les notifications."</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Aucun outil d\'écoute des notifications installé."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activer <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> pourra lire toutes les notifications publiées par le système ou toute application installée. Ces notifications peuvent comporter des informations personnelles, telles que des noms de contacts et le texte de messages qui vous ont été envoyés. L\'application pourra également masquer ces notifications ou sélectionner les boutons d\'action qu\'elles contiennent."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Fournisseurs de conditions"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Aucune application ne fournit de conditions."</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d application fournit des conditions."</item>
+    <item quantity="other" msgid="358057362115673258">"%d applications fournissent des conditions."</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Aucun fournisseur de conditions n\'est installé."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activer <xliff:g id="SERVICE">%1$s</xliff:g> ?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> pourra ajouter des conditions de sortie au mode Ne pas déranger."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Chargement des applications en cours…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Afficher les notifications"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Priorité élevée"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"OK"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Désactivé"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Activé"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Jusqu\'à désactivation"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloquer toutes les interruptions, sauf"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Le soir"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Autre automatisme"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activation automatique"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Jamais"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Appels téléphoniques"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messages"</string>
@@ -2172,5 +2235,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Heure de début"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Heure de fin"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> le lendemain"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifications appli."</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Paramètres de notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Envoyer commentaires sur appareil"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index b913395..d6ab002 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"अब आप डेवलपर बन गए हैं!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"आवश्यकता नहीं, आप पहले से ही डेवलपर हैं."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"वायरलेस और नेटवर्क"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"उपकरण"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"व्यक्तिगत"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"प्रणाली"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"वायरलेस और नेटवर्क"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"उपकरण"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"व्यक्तिगत"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"सिस्‍टम"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"रेडियो चालू करें"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"रेडियो बंद करें"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"IMS पर SMS चालू करें"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"एन्‍क्रिप्‍शन"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"हर बार अपना टेबलेट चालू करते समय आपको उसे सुरक्षित तरीके से प्रयोग करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"हर बार अपना फ़ोन चालू करते समय आपको उसे सुरक्षित तरीके से प्रयोग करने के लिए एक संख्‍यात्‍मक पिन या पासवर्ड की आवश्‍यकता होती है"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एन्‍िक्रप्ट किया गया"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप्स  और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना टेबलेट एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे सुरक्षित तरीके से प्रयोग करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते.\n\nसुरक्षित तरीका एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और सुरक्षित तरीका पूर्ण होने तक अपने टेबलेट को प्लग इन रखना चाहिए. यदि आप सुरक्षित तरीका प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप्स  और उनका डेटा, मीडिया, और अन्‍य फ़ाइलें एन्क्रिप्ट कर सकते हैं. जब आप अपना फ़ोन एन्क्रिप्ट कर लें, तो हर बार उसे चालू करने पर आपको उसे सुरक्षित तरीके से प्रयोग करने के लिए संख्यात्मक पिन या पासवर्ड लिखना होगा. आप अपना सभी डेटा मिटाकर, फ़ैक्टरी डेटा रीसेट किए जाने के अलावा अपने टेबलेट को डीक्रिप्ट नहीं कर सकते.\n\nसुरक्षित तरीका एक घंटा या अधिक समय लेता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और सुरक्षित तरीका पूर्ण होने तक अपने फ़ोन को प्लग इन रखना चाहिए. यदि आप सुरक्षित तरीका प्रक्रिया को बाधित करते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप्स और उनका डेटा, मीडिया, और अन्य फ़ाइलें एन्क्रिप्ट कर सकते हैं. अपना टेबलेट एन्क्रिप्ट करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (अर्थात् कोई पैटर्न या संख्यात्मक पिन या पासवर्ड) सेट कर लिया है, हर बार टेबलेट को चालू करते समय आपको उसे डीक्रिप्ट करने के लिए स्क्रीन को अनलॉक करना होगा. डीक्रिप्ट करने का एकमात्र अन्य तरीका, अपना सभी डेटा मिटाते हुए फ़ैक्टरी डेटा रीसेट की कार्रवाई करना है.\n\nएन्क्रिप्शन में एक घंटा या इससे अधिक समय लग सकता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और पूरी प्रक्रिया के दौरान अपने टेबलेट को प्लग इन करके रखना होगा. यदि आप इसमें बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप्स और उनका डेटा, मीडिया तथा अन्य फ़ाइलें एन्क्रिप्ट कर सकते हैं. अपना फ़ोन एन्क्रिप्ट करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (अर्थात् कोई पैटर्न या संख्यात्मक पिन या पासवर्ड) सेट कर लिया है, हर बार फ़ोन को चालू करते समय आपको उसे डीक्रिप्ट करने के लिए स्क्रीन को अनलॉक करना होगा. डीक्रिप्ट करने का एकमात्र अन्य तरीका, अपना सभी डेटा मिटाते हुए फ़ैक्टरी डेटा रीसेट की कार्रवाई करना है.\n\nएन्क्रिप्शन में एक घंटा या इससे अधिक समय लग सकता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और पूरी प्रक्रिया के दौरान अपने फ़ोन को प्लग इन करके रखना होगा. यदि आप इसमें बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"अपनी बैटरी चार्ज करें और पुन: प्रयास करें."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"उपकरण व्‍यवस्‍थापकों को देखें या निष्‍क्रिय करें"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ट्रस्ट एजेंट"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"ट्रस्ट एजेंट देखें या निष्क्रिय करें"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"सूचना की एक्सेस"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप्स  सूचनाएं नहीं पढ़ सकते"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ऐप्स  सूचनाएं पढ़ सकता है"</item>
-    <item quantity="other" msgid="980049191810249052">"%d ऐप्स  सूचनाएं पढ़ सकते हैं"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"कोई सूचना श्रवणकर्ता इंस्टॉल नहीं है."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करें?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> सिस्टम द्वारा या इंस्टॉल किए गए किसी भी ऐप्स  द्वारा पोस्ट की गई ऐसी सूचनाएं पढ़ सकेगा, जिनमें संपर्क नाम तथा आपको भेजे गए संदेशों की सामग्री जैसी व्यक्तिगत जानकारी शामिल हो सकती है. वह इन सूचनाओं को ख़ारिज भी कर सकेगा या उनमें मौजूद स्पर्श कार्यवाही बटन स्पर्श कर सकेगा."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"स्थिति प्रदाता"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"कोई भी ऐप्स स्थितियां प्रदान नहीं करता"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ऐप्स स्थितियां प्रदान करता है"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ऐप्स स्थितियां प्रदान करते हैं"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"कोई भी स्थिति प्रदाता इंस्टॉल नहीं किया गया है."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करें?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> परेशान न करें मोड में अतिरिक्त शर्तें जोड़ सकेगा."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth चालू करें"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"नेटवर्क से कनेक्‍ट करें"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"नेटवर्क भूलें"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"नेटवर्क बदलें"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"आपको Wi‑Fi नेटवर्क बदलने की अनुमति नहीं है."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS उपलब्‍ध)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> द्वारा सुरक्षित"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> द्वारा सुरक्षित"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"अपना नेटवर्क पासवर्ड डालें."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"कोई नहीं"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"स्थान की सटीकता को बेहतर बनाने और अन्य प्रयोजनों के लिए, Wi-Fi बंद होने पर भी <xliff:g id="APP_NAME">%1$s</xliff:g> नेटवर्क स्कैनिंग को चालू करना चाहता है.\n\nइसकी अनुमति उन सभी ऐप्स  के लिए दें जो स्कैन करना चाहते हैं?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"अनुमति दें"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"होम"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"स्क्रीन सेटिंग देखें"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ध्वनि"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"आवाज़"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"संगीत प्रभाव"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"रिंगर वॉल्‍यूम"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"मौन होने पर कंपन करें"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"सामान्य सूचना ध्वनि"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"पल्‍स सूचना लाइट"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"उच्च प्राथमिकता होने पर पॉप अप"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"रिंगटोन"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"सूचना"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"संगीत और अन्‍य मीडिया म्‍यूट करें"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"सूचनाएं म्‍यूट करें"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"अलार्म म्‍यूट करें"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"रिंग आने पर कंपन करें"</string>
     <string name="dock_settings" msgid="1820107306693002541">"डॉक"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"डॉक सेटिंग"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"ऑडियो"</string>
@@ -758,8 +738,13 @@
     <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="2354961343555249270">"स्क्रीन की रोशनी"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की रोशनी एडजस्ट करें"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"प्रयोग में नहीं"</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>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB डीबग करना"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"डीबग मोड जब USB कनेक्‍ट किया गया हो"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"USB डीबगिंग प्राधिकरणों को निरस्त करें"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"पावर मेनू बग रिपोर्ट"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"बग रिपोर्ट लेने के लिए पावर मेनू में विकल्‍प शामिल करें"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"सचेत रहें"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होने के दौरान स्‍क्रीन कभी निष्‍क्रिय नहीं होगी"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI स्‍नूप लॉग सक्षम करें"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC पता"</string>
     <string name="enter_password" msgid="4131758584074246224">"संग्रहण डीक्रिप्‍ट करने के लिए पासवर्ड लिखें"</string>
+    <string name="enter_pin" msgid="286221169871526876">"संग्रहण डीक्रिप्ट करने के लिए अपना पिन डालें"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"संग्रहण डीक्रिप्ट करने के लिए अपना प्रतिमान आरेखित करें"</string>
     <string name="try_again" msgid="4272075051293936921">"पुन: प्रयास करें."</string>
     <string name="delete" msgid="4219243412325163003">"हटाएं"</string>
     <string name="misc_files" msgid="6720680815969643497">"विविध फ़ाइलें"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"अक्षरों का आकार बदलें"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"टैप करें और भुगतान करें"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"बस एक टैप के साथ भुगतान करें"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"अग्रभाग ऐप्स का समर्थन करें"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"अधिक जानें"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"एप्‍लिकेशन ढूंढें"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"अपनी प्राथमिकता के रूप में सेट करें?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"हाल ही की खोजें"</string>
     <string name="search_results_label" msgid="4163304782363526148">"परिणाम"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi नेटवर्क कनेक्शन"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"जब उपकरण लॉक किया गया हो"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील सूचना सामग्री छिपाएं"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी सूचना सामग्री दिखाएं"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"परेशान न करें"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"परेशान न करें"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"सूचनाएं"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"ट्वीक"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ऐप्स सूचनाएं"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WiFi NFC टैग सेट करना"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"लिखें"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"लिखने के लिए टैग टैप करें..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"अमान्य पासवर्ड, पुनः प्रयास करें."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC टैग में डेटा लिखने में असमर्थ. यदि समस्या बनी रहती है, तो कोई भिन्न टैग आज़माकर देखें"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC टैग लिखने योग्य नहीं है. कृपया किसी भिन्न टैग का उपयोग करें."</string>
     <string name="default_sound" msgid="8821684447333687810">"डिफ़ॉल्‍ट ध्‍वनि"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"ध्वनियां और सूचनाएं"</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="zen_mode_settings_title" msgid="2689740350895257590">"परेशान न करें"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"कॉल और सूचनाएं आने पर"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"रिंग करें"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"रिंग करने के बजाय कंपन करें"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"रिंग या कंपन न करें"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"फ़ोन रिंगटोन"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"डिफ़ॉल्ट सूचना रिंगटोन"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"रिंग आने पर कंपन करें"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"सूचनाएं दिखाई जा रही हैं"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"पल्‍स सूचना लाइट"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"जब उपकरण लॉक किया गया हो"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी सूचना सामग्री दिखाएं"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील सूचना सामग्री छिपाएं"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"सूचनाएं बिल्कुल न दिखाएं"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"परेशान न करें के चालू होने पर"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"सूची में से नई सूचनाएं छिपाएं"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"सूची में सभी सूचनाएं दिखाएं"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"ऐप्स सूचनाएं"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"स्‍पर्श ध्‍वनियां"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"डायल पैड टोन"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"स्क्रीन लॉक करना और अनलॉक करना"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"अन्य स्पर्श ध्वनियां"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"स्‍पर्श पर कंपन करें"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"सूचना की एक्सेस"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ऐप्स  सूचनाएं नहीं पढ़ सकते"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d ऐप्स  सूचनाएं पढ़ सकता है"</item>
+    <item quantity="other" msgid="980049191810249052">"%d ऐप्स  सूचनाएं पढ़ सकते हैं"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"कोई सूचना श्रवणकर्ता इंस्टॉल नहीं है."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करें?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> सिस्टम द्वारा या इंस्टॉल किए गए किसी भी ऐप्स  द्वारा पोस्ट की गई ऐसी सूचनाएं पढ़ सकेगा, जिनमें संपर्क नाम तथा आपको भेजे गए संदेशों की सामग्री जैसी व्यक्तिगत जानकारी शामिल हो सकती है. वह इन सूचनाओं को ख़ारिज भी कर सकेगा या उनमें मौजूद स्पर्श कार्यवाही बटन स्पर्श कर सकेगा."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"स्थिति प्रदाता"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"कोई भी ऐप्स स्थितियां प्रदान नहीं करता"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d ऐप्स स्थितियां प्रदान करता है"</item>
+    <item quantity="other" msgid="358057362115673258">"%d ऐप्स स्थितियां प्रदान करते हैं"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"कोई भी स्थिति प्रदाता इंस्टॉल नहीं किया गया है."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> सक्षम करें?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> परेशान न करें मोड में अतिरिक्त शर्तें जोड़ सकेगा."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"ऐप्स लोड हो रहे हैं..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"सूचनाएं दिखाएं"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"उच्च प्राथमिकता"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"सूची के शीर्ष पर दिखाएं"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"उपकरण के लॉक होने पर संवेदनशील सामग्री छिपाएं"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"अवरोधित"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"सूची का शीर्ष"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"संवेदनशील"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"पूर्ण"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"बंद"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"चालू"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"जब तक आप इसे बंद नहीं कर देते"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"इसे छोड़कर सभी बाधाओं को अवरुद्ध करें"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"रात में"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"अन्य स्वचालन"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"स्वचालित रूप से चालू"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"कभी नहीं"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"फ़ोन कॉल"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"संदेश"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"प्रारंभ समय"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"समाप्ति समय"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"अगले दिन <xliff:g id="FORMATTED_TIME">%s</xliff:g> पर"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ऐप्स सूचनाएं"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"सूचना सेटिंग"</string>
     <string name="device_feedback" msgid="3238056036766293294">"इस उपकरण के बारे में फ़ीडबैक भेजें"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 120a70d..d10226c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sad ste razvojni programer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nema potrebe, već ste razvojni programer."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEŽIČNO POVEZIVANJE i MREŽE"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"UREĐAJ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"OSOBNO"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SUSTAV"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Bežično povezivanje i mreže"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Uređaj"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Osobno"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Sustav"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Uključi radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Isključi radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Uključi SMS putem IMS-a"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripcija"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kriptiraj tablet računalo"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kriptiraj telefon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Traži brojčani PIN ili zaporku za dekripciju tablet računala svaki put kada se uključi"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Traži brojčani PIN ili zaporku za dekripciju telefona svaki put kada se uključi"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kriptirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja tabletnog računala morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite: svoje tabletno računalo možete dešifrirati samo vraćanjem u tvorničko stanje čime se brišu svi vaši podaci.\n\nEnkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i tabletno računalo držati priključeno dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatkovne, multimedijske i ostale datoteke. Nakon kriptiranja telefona morate upisati numerički PIN ili zaporku kako biste ga dešifrirali svaki put kada ga uključite. Svoj telefon možete dešifrirati samo vraćanjem na tvorničke postavke čime se brišu svi vaši podaci.\n\nEnkripcija traje jedan sat ili dulje. Morate započeti s napunjenom baterijom i telefon držati priključen dok se enkripcija ne završi. Ako prekinete postupak enkripcije, izgubit ćete neke ili sve svoje podatke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatke, medijske i ostale datoteke. Nakon kriptiranja tableta, ako ste postavili zaključavanje zaslona (uzorak, brojčani PIN ili zaporku), morat ćete otključati zaslon da biste dekriptirali tablet svaki put kada ga uključite. Jedini je drugi način dekriptiranja vraćanje na tvorničko stanje, čime se brišu svi podaci.\n\nKriptiranje traje sat vremena ili dulje. Morate početi s napunjenom baterijom i tablet cijelo vrijeme mora biti priključen na napajanje. Ako prekinete postupak, izgubit ćete neke ili sve podatke."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Možete kriptirati svoje račune, postavke, preuzete aplikacije i njihove podatke, medijske i ostale datoteke. Nakon kriptiranja telefona, ako ste postavili zaključavanje zaslona (uzorak, brojčani PIN ili zaporku), morat ćete otključati zaslon da biste dekriptirali telefon svaki put kada ga uključite. Jedini je drugi način dekriptiranja vraćanje na tvorničko stanje, čime se brišu svi podaci.\n\nKriptiranje traje sat vremena ili dulje. Morate početi s napunjenom baterijom i telefon cijelo vrijeme mora biti priključen na napajanje. Ako prekinete postupak, izgubit ćete neke ili sve podatke."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kriptiraj tablet uređaj"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kriptiraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napunite bateriju i pokušajte ponovo."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Administratori za prikaz ili deaktivaciju uređaja"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Pouzdani predstavnici"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Prikaz ili deaktivacija pouzdanih predstavnika"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Pristup obavijesti"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne mogu čitati obavijesti"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikacija može čitati obavijesti"</item>
-    <item quantity="other" msgid="980049191810249052">"Ovoliko aplikacija može čitati obavijesti: %d"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nema instaliranih slušatelja obavijesti."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Omogućiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> moći će čitati sve obavijesti koje objavi sustav ili bilo koja instalirana aplikacija, a obavijesti mogu uključivati osobne podatke, primjerice, imena kontakata i tekstove poruka koje su vam poslane. Također će moći odbaciti te obavijesti ili dodirnuti gumbe za radnju u njima."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Davatelji uvjeta"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nijedna aplikacija ne pruža uvjete"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikacija pruža uvjete"</item>
-    <item quantity="other" msgid="358057362115673258">"Broj aplikacija koje pružaju uvjete: %d"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nije instaliran nijedan davatelj uvjeta."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Želite li omogućiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Davatelj uvjeta <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> moći će dodati uvjete za izlaz načinu Ne ometaj."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Uključi Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Poveži s mrežom"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zaboravi mrežu"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Izmijeni mrežu"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Da biste vidjeli dostupne mreže, uključite Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Traženje Wi-Fi mreža…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemate dopuštenje za promjenu Wi‑Fi mreže."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS dostupan)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", osigurano značajkom <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Unesite mrežnu zaporku."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Nema"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Radi poboljšanja preciznosti lokacije kao i u druge svrhe aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> želi uključiti pregledavanje mreže, čak i kada je Wi-Fi isključen.\n\nŽelite li to dozvoliti za sve aplikacije koje žele izvoditi pregledavanje?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dopusti"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Početna"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Prikaz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnoća"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Glazbeni efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnoća zvona"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibracija ako je bešumno"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Zadani zvuk obavijesti"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsno svjetlo obavijesti"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Skočni za visoki prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvuk zvona"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obavijest"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Isključivanje zvuka glazbe i drugih medija"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Isključivanje zvuka obavijesti"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Isključivanje zvuka alarma"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrira dok zvoni"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Priključna stanica"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Postavke priključne stanice"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Promijeni orijentaciju automatski kod rotacije telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Promijeni orijentaciju automatski kod rotacije telefona"</string>
-    <string name="brightness" msgid="2354961343555249270">"Svjetlina"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Podesite svjetlinu zaslona"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Mirovanje"</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>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Uklanjanje pogreške USB-a"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Uklanjanje pogrešaka s priključenim USB-om"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Opoziv autorizacija za uklanjanje pogrešaka USB-a"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Izvješća o bugovima u izborniku napajanja"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"U izbornik napajanja uključi opciju za izradu izvješća o bugovima"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Ne pokreći mirovanje"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Zaslon nikad neće prijeći u mirovanje tijekom punjenja"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogući zapisnik naredbe \"snoop\" za Bluetooth HCI"</string>
@@ -1628,8 +1615,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Visina glasa"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Utječe na ton izgovorenog teksta"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Upotrijebi jezik sustava"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik nije odabran"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Postavlja jezik govora"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušajte primjer"</string>
@@ -1821,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresa"</string>
     <string name="enter_password" msgid="4131758584074246224">"Unesite zaporku za dešifriranje pohrane"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Unesite PIN za dekriptiranje pohrane"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Nacrtajte uzorak za dekriptiranje pohrane"</string>
     <string name="try_again" msgid="4272075051293936921">"Pokušajte ponovo."</string>
     <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
     <string name="misc_files" msgid="6720680815969643497">"Razne datoteke"</string>
@@ -2073,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Promjena veličine fonta"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Dodirni i plati"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Platite samo jednim dodirom"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Daj prednost aplikaciji u prednjem planu"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Saznajte više"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Traženje aplikacija"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Želite li to postaviti kao željeni način?"</string>
@@ -2126,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Nedavna pretraživanja"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultati"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi mreža veza"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Kada je uređaj zaključan"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sakrij osjetljiv sadržaj obavijesti"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavijesti"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Ne ometaj"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne ometaj"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Obavijesti"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Prilagođavanja"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obavijest aplikacije"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Postavljanje oznake NFC za WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Piši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dodirnite oznaku da biste zapisali podatke..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Nevažeća zaporka, pokušajte ponovo."</string>
@@ -2143,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Nije moguće zapisati podatke u oznaku NFC. Ako problem potraje, pokušajte upotrijebiti drugačiju oznaku."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"U oznaku NFC ne mogu se zapisati podaci. Upotrijebite drugačiju oznaku."</string>
     <string name="default_sound" msgid="8821684447333687810">"Zadani zvuk"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Zvukovi i obavijesti"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Glasnoća medija"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Glasnoća alarma"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Glasnoća zvona"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne ometaj"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Kada stignu pozivi i obavijesti"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Zvono"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibracija umjesto zvona"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Bez zvona i vibracije"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvona telefona"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Zadana melodija zvona za obavijesti"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrira dok zvoni"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Prikaz obavijesti"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsno svjetlo obavijesti"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Kada je uređaj zaključan"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavijesti"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sakrij osjetljiv sadržaj obavijesti"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Uopće ne prikazuj obavijesti"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kada je uključen način Ne ometaj"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Sakrivanje novih obavijesti na popisu"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Prikazivanje svih obavijesti na popisu"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Zvukovi dodirivanja"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonovi površine za biranje brojeva"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Zaključavanje i otključavanje zaslona"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Ostali zvukovi dodirivanja"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibracija na dodir"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Pristup obavijestima"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne mogu čitati obavijesti"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplikacija može čitati obavijesti"</item>
+    <item quantity="other" msgid="980049191810249052">"Ovoliko aplikacija može čitati obavijesti: %d"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nema instaliranih slušatelja obavijesti."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Omogućiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> moći će čitati sve obavijesti koje objavi sustav ili bilo koja instalirana aplikacija, a obavijesti mogu uključivati osobne podatke, primjerice, imena kontakata i tekstove poruka koje su vam poslane. Također će moći odbaciti te obavijesti ili dodirnuti gumbe za radnju u njima."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Davatelji uvjeta"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nijedna aplikacija ne pruža uvjete"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d aplikacija pruža uvjete"</item>
+    <item quantity="other" msgid="358057362115673258">"Broj aplikacija koje pružaju uvjete: %d"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nije instaliran nijedan davatelj uvjeta."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Želite li omogućiti uslugu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Davatelj uvjeta <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> moći će dodati uvjete za izlaz načinu Ne ometaj."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Učitavanje aplikacija..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Prikaži obavijesti"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Visoki prioritet"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Prikaži na vrhu popisa"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Sakrij osjetljive sadržaje kada je uređaj zaključan"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Na vrhu popisa"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Osjetljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotovo"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Isključeno"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Uključeno"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dok to ne isključite"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokiraj sve prekide osim"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Noću"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Ostale vrste automatizacije"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatski uključi"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikada"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonski pozivi"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Poruke"</string>
@@ -2171,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Vrijeme početka"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Vrijeme završetka"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sutra"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obavijest aplikacije"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Postavke obavijesti"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošalji povr. informacije o uređaju"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index cbe24c1..0c57a19 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ön mostantól már fejlesztő!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nincs rá szükség, Ön már fejlesztő."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"VEZETÉK NÉLKÜLI és EGYÉB HÁLÓZATOK"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ESZKÖZ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"SZEMÉLYES"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"RENDSZER"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Vezeték nélküli és egyéb hálózatok"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Eszköz"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Személyes"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Rendszer"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Rádió bekapcsolása"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Rádió kikapcsolása"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Kapcsolja be az SMS-t az IMS-en keresztül"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Titkosítás"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Táblagép titkosítása"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefon titkosítása"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"A táblagép titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"A telefon titkosításának feloldásához kérjen minden bekapcsoláskor egy számokból álló PIN kódot vagy jelszót"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Titkosítva"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja táblagépét, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: táblagépének titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejezéséig hagyja töltőn a táblagépet. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Titkosíthatja a fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha titkosítja telefonját, akkor minden bekapcsolásakor be kell írnia egy numerikus PIN kódot vagy jelszót a titkosítás feloldásához: telefonjának titkosítását nem tudja visszavonni, kivéve, ha visszaállítja a gyári adatokat, és minden adatot töröl a gépről.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen hozzá, és a titkosítás befejeződéséig hagyja töltőn a telefonját. Ha megszakítja a titkosítási folyamatot, akkor elveszíti néhány vagy az összes adatát."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha képernyőzárat állít be (mintával, számjegyekből álló PIN kóddal vagy jelszóval) táblagépe titkosítását követően, minden bekapcsoláskor fel kell oldania a képernyő zárolását a táblagép titkosításának feloldásához. A titkosítás feloldásának egyetlen további módja a gyári adatok visszaállítása, amely során valamennyi adat törlődik.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen neki, és az egész folyamat során tartsa a táblagépet hálózati áramforráshoz csatlakoztatva. Ha megszakítja a folyamatot, az az adatok részleges vagy teljes elvesztésével járhat."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Titkosíthatja fiókjait, beállításait, letöltött alkalmazásait és azok adatait, illetve média- és egyéb fájljait. Ha képernyőzárat állít be (mintával, számjegyekből álló PIN kóddal vagy jelszóval) telefonja titkosítását követően, minden bekapcsoláskor fel kell oldania a képernyő zárolását a telefon titkosításának feloldásához. A titkosítás feloldásának egyetlen további módja a gyári adatok visszaállítása, amely során valamennyi adat törlődik.\n\nA titkosítás legalább egy órát vesz igénybe. Feltöltött akkumulátorral kezdjen neki, és az egész folyamat során tartsa a telefont hálózati áramforráshoz csatlakoztatva. Ha megszakítja a folyamatot, az az adatok részleges vagy teljes elvesztésével járhat."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Táblagép titkosítása"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon titkosítása"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Töltse fel az akkumulátort, és próbálja újra."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Az eszköz rendszergazdáinak megtekintése vagy deaktiválása"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agent szoftverek"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Trust agent szoftverek megtekintése vagy deaktiválása"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Hozzáférés értesítésekhez"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Az alkalmazások nem tudják olvasni az értesítéseket"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d alkalmazás tudja olvasni az értesítéseket"</item>
-    <item quantity="other" msgid="980049191810249052">"%d alkalmazás tudja olvasni az értesítéseket"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nincs telepítve értesítésfigyelő."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> a rendszer és minden telepített alkalmazás által küldött összes értesítést el tudja majd olvasni. Ezekben lehetnek személyes adatok, például ismerősök nevei és az Ön részére küldött SMS-ek szövegei. Ezeket az értesítéseket el is vetheti, illetve a bennük lévő műveletgombokat megérintheti."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Feltételbiztosítók"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Egy alkalmazás sem biztosít feltételeket"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d alkalmazás biztosít feltételeket"</item>
-    <item quantity="other" msgid="358057362115673258">"%d alkalmazás biztosít feltételeket"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nincsenek telepített feltételbiztosítók."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"A(z) <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> szolgáltató hozzáadhat majd kilépési feltételeket a „Ne zavarjanak” módhoz."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth bekapcsolása"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Csatlakozás hálózathoz"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Hálózat elfelejtése"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Hálózat módosítása"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kapcsolja be a Wi-Fit a hálózatok megjelenítéséhez"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fi hálózatok keresése..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nincs jogosultsága a Wi‑Fi hálózat módosítására."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS elérhető)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> védelemmel"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Adja meg hálózati jelszavát."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Nincs"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"A helymeghatározás pontosságának javítása és egyéb célok érdekében a(z) <xliff:g id="APP_NAME">%1$s</xliff:g> szeretné engedélyezni a hálózatkeresést még kikapcsolt Wi-Fi mellett is.\n\nEngedélyezi ezt az összes olyan alkalmazásnál, amely keresést akar végezni?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Engedélyezés"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Főoldal"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Megjelenítés"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Hang"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hangerő"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Zenei hatások"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Csengetés hangereje"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rezgés néma üzemmódban"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Alapértelmezett értesítési hang"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Villogó értesítő fény"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"A magas prioritású jelenjen meg"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Csengőhang"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Értesítés"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Zene és egyéb média elnémítása"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Értesítések elnémítása"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Riasztások elnémítása"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Csörgéskor rezegjen"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokkolás"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dokkolási beállítások"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Hang"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tájolás automatikus váltása a telefon elfordításakor"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tájolás automatikus váltása a táblagép forgatásakor"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Tájolás automatikus váltása a telefon elfordításakor"</string>
-    <string name="brightness" msgid="2354961343555249270">"Fényerő"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"A képernyő fényerejének beállítása"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Alvó mód"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB hibakeresés"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Hibakeresés mód USB csatlakoztatásakor"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"USB-s hibakeresésre vonatkozó engedélyek visszavonása"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Hibajelentések az energiaellátási menüben"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Lehetőség az energiaellátási menüben a hibajelentésekre"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Nem kapcsolódik ki"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A képernyő soha nem kapcsol ki töltés során"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop napló engedélyezése"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-cím"</string>
     <string name="enter_password" msgid="4131758584074246224">"Írja be a jelszót a tároló kódolásának feloldásához"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Adja meg a PIN kódot a tároló titkosításának feloldásához"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Rajzolja meg a mintát a tároló titkosításának feloldásához"</string>
     <string name="try_again" msgid="4272075051293936921">"Próbálja újra."</string>
     <string name="delete" msgid="4219243412325163003">"Törlés"</string>
     <string name="misc_files" msgid="6720680815969643497">"Egyéb fájlok"</string>
@@ -2074,6 +2063,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Betűméret módosítása"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Érintéssel való fizetés"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Fizetés egy szimpla érintéssel"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Az előtérben lévő alkalmazás előnyben részesítése"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"További információ"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Alkalmazások keresése"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Beállítja előnyben részesítettként?"</string>
@@ -2127,16 +2117,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Legutóbbi keresések"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Találatok"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi, wi-fi hálózati kapcsolat"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Ha az eszköz zárolva van"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Bizalmas értesítések elrejtése"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Az összes értesítés megjelenítése"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Ne zavarjanak"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne zavarjanak"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Értesítések"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Trükkök"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Alkalmazásértesítések"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi- és NFC-címke beállítása"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Írás"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Az íráshoz érintsen meg egy címkét…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Érvénytelen jelszó, próbálja újra."</string>
@@ -2144,19 +2126,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Nem sikerült írni az NFC-címkére. Ha a probléma továbbra is fennáll, próbálkozzon egy másik címkével"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Az NFC-címke nem írható. Használjon egy másik címkét."</string>
     <string name="default_sound" msgid="8821684447333687810">"Alapértelmezett hang"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Hang és értesítések"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Média hangereje"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ébresztés hangereje"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Csengés hangereje"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne zavarjanak"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Hívások és értesítések érkezésekor"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Csengetés"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Csengetés helyett rezgés"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Nincs csengetés vagy rezgés"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Telefon csengőhangja"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Értesítések alapértelmezett csengőhangja"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Csörgéskor rezegjen"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Értesítések megjelenítése"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Villogó értesítő fény"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Ha az eszköz le van zárva"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Az összes értesítés megjelenítése"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Bizalmas értesítések elrejtése"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Semmilyen értesítés ne jelenjen meg"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Ha a „Ne zavarjanak” mód aktív"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Új értesítések elrejtése a listából"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Valamennyi értesítés megjelenítése a listában"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Alkalmazásértesítések"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Érintés hangja"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"A tárcsázó hangjai"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Képernyő lezárása és feloldása"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"További hangok érintéses műveletekhez"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Érintéskor rezegjen"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Hozzáférés értesítésekhez"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Az alkalmazások nem tudják olvasni az értesítéseket"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d alkalmazás tudja olvasni az értesítéseket"</item>
+    <item quantity="other" msgid="980049191810249052">"%d alkalmazás tudja olvasni az értesítéseket"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nincs telepítve értesítésfigyelő."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> a rendszer és minden telepített alkalmazás által küldött összes értesítést el tudja majd olvasni. Ezekben lehetnek személyes adatok, például ismerősök nevei és az Ön részére küldött SMS-ek szövegei. Ezeket az értesítéseket el is vetheti, illetve a bennük lévő műveletgombokat megérintheti."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Feltételbiztosítók"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Egy alkalmazás sem biztosít feltételeket"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d alkalmazás biztosít feltételeket"</item>
+    <item quantity="other" msgid="358057362115673258">"%d alkalmazás biztosít feltételeket"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nincsenek telepített feltételbiztosítók."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Engedélyezi a(z) <xliff:g id="SERVICE">%1$s</xliff:g> szolgáltatást?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"A(z) <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> szolgáltató hozzáadhat majd kilépési feltételeket a „Ne zavarjanak” módhoz."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Alkalmazások betöltése…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Értesítések megjelenítése"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Magas prioritás"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Megjelenítés a lista elején"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Bizalmas információk elrejtése, ha az eszköz le van zárva"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Letiltva"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"A lista elején"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Bizalmas"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kész"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Ki"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Be"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Amíg ki nem kapcsolja ezt"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Minden tiltása kivéve a következőt"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Éjszaka"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Egyéb automatizálás"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatikus bekapcsolás"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Soha"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonhívások"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Üzenetek"</string>
@@ -2172,5 +2200,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Kezdés ideje"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Befejezés ideje"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> a következő napon"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Alkalmazásértesítések"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Értesítési beállítások"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Visszajelzés küldése az eszközről"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index b8a3b36..86e6360 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Դուք արդեն ծրագրավորո՛ղ եք:"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Կարիք չկա, դուք արդեն իսկ ծրագրավորող եք:"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"ԱՆԼԱՐ ԿԱՊ ԵՎ ՑԱՆՑԵՐ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"Սարք"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"Անձնական"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"Համակարգ"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Միացնել ռադիոն"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Անջատել ռադիոն"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"IMS-ը փոխարինել SMS-ով"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Կոդավորում"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Կոդավորել գրասալիկը"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Կոդավորել հեռախոսը"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Պահանջել թվային PIN կամ գաղտնաբառ` ձեր գրասալիկը ապակոդավորելու համար ամեն անգամ այն միացնելիս"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Պահանջել թվային PIN կամ գաղտնաբառ` ձեր հեռախոսը ապակոդավորելու համար ամեն անգամ այն միացնելիս"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Կոդավորված է"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Կարող եք կոդավորել ձեր հաշիվները, կարգավորումները, ներբեռնած հավելվածներն ու դրանց տվյալները, մեդիա և այլ ֆայլերը: Մեկ անգամ գրասալիկը կոդավորելուց հետո հարկավոր է մուռքագրել PIN կամ գաղտնաբառ ապակոդավորման համար` ամեն անգամ այն միացնելիս. գրասալիկը ապակոդավորել չեք կարող, բացառությամբ, երբ գործարանային տվյալների վերականգնում է տեղի ունենում, երբ ջնջվում են ձեր բոլոր տվյալները:\n\nԿոդավորումը մեկ ժամ կամ ավել կարող է տևել: Պետք է սկսել գործընթացն ամբողջովին լիցքավորված մարտկոցով, և մինչ կոդավորման ավարտը գրասալիկը պետք է հոսանքին միացված լինի: Եթե ընդհատեք կոդավորման գործընթացը, կկորցնեք ձեր տվյալների մի մասը կամ տվյալներն ամբողջությամբ:"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Կարող եք կոդավորել ձեր հաշիվները, կարգավորումները, ներբեռնած հավելվածներն ու դրանց տվյալները, մեդիա և այլ ֆայլերը: Մեկ անգամ հեռախոսը կոդավորելուց հետո հարկավոր է մուտքագրել թվային PIN կամ գաղտնաբառ ապակոդավորման համար` ամեն անգամ հեռախոսը միացնելիս. հեռախոսը ապակոդավորել չեք կարող, բացառությամբ, երբ գործարանային տվյալների վերականգնում է տեղի ունենում, երբ ջնջվում են ձեր բոլոր տվյալները:\n\nԿոդավորումը մեկ ժամ կամ ավել կարող է տևել: Պետք է սկսել գործընթացն ամբողջովին լիցքավորված մարտկոցով, և մինչ կոդավորման ավարտը հեռախոսը պետք է հոսանքին միացված լինի: Եթե ընդհատեք կոդավորման գործընթացը, կկորցնեք ձեր տվյալների մի մասը կամ տվյալներն ամբողջությամբ:"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Դիտել կամ ապաակտիվացնել սարքի ադմինիստրատորին"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Վստահելի գործակալներ"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Դիտել կամ ապաակտիվացնել վստահելի գործակալներին"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Ծանուցումների մուտք"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ծրագրիը չի կարող կարդալ ծանուցումները"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ծրագիրը կարող է կարդալ ծանուցումները"</item>
-    <item quantity="other" msgid="980049191810249052">"%d հավելված կարող է կարդալ ծանուցումները"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Ծանուցման ունկնդիրներ տեղադրված չեն:"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Միացնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>-ը կկարողանա կարդալ համակարգի կամ ցանկացած տեղադրված ծրագրի կողմից փակցված բոլոր ծանուցումները, որոնք կարող են պարունակել այնպիսի անձնական տեղեկություններ, ինչպիսիք են կոնտակտների անունները և ձեզ ուղարկված հաղորդագրությունների պարունակությունը: Այն նաև կկարողանա մերժել այս ծանուցումները կամ հպված գործողության կոճակները իրենց մեջ:"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Պայմանների աղբյուրներ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ոչ մի ծրագիր պայմաններ չի տալիս"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ծրագիր տալիս է պայմաններ"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ծրագիր տալիս են պայմաններ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Պայմանների աղբյուրներ տեղադրված չեն:"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Միացնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը:"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>-ը կկարողանա ավելացնել պայմաններ «Չխանգարել» ռեժիմից դուրս գալու համար:"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Միացնել Bluetooth-ը"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Միանալ ցանցին"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Մոռանալ ցանցը"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Փոփոխել ցանցը"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"Դուք թույլտվություն չունեք փոխելու Wi‑Fi-ի ցանցը:"</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS-ը հասանելի է)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Պաշտպանված է <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-ով"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ապահովված <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-ի հետ"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Մուտքագրեք ձեր ցանցային գաղտնաբառը:"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Ոչ մեկը"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Տեղանքի ճշգրտությունը կատարելագործելու կամ այլ նպատակների համար` <xliff:g id="APP_NAME">%1$s</xliff:g>-ը ցանկանում է միացնել ցանցի սկանավորումը, նույնիսկ եթե Wi-Fi-ը անջատված է:\n\nԹույլատրե՞լ բոլոր սկանավորում ցանկացող ծրագրերին:"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Թույլատրել"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Հիմնական"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ցուցադրիչ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ձայն"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Հեռախոսի զանգերանգ"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Հնչողությունը"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Երաժշտության էֆեկտներ"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Զանգակի բարձրությունը"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Թրթռալ, երբ անձայն ռեժիմում է"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Ծանուցման լռելյայն ձայնը"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Ծանուցման լույսի թարթում"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Ելնի, եթե կարևոր է"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Զանգերանգ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Ծանուցում"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Համրեցնել երաժշտությունը &amp; այլ մեդիան"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Խլացնել ծանուցումները"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Համրեցնել ահազանգերը"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Թրթռալ զանգելիս"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Միակցել"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Հարակցման կարգավորումներ"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Աուդիո"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"Պայծառություն"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Կարգաբերել էկրանի պայծառությունը"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Քնել"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB վրիպազերծում"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Կարգաբերել ռեժիմը, երբ USB-ն միացված է"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Չեղարկել USB վրիպազերծման լիազորումները"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Սնուցման ցանկի սխալների զեկույցները"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Ընտրանքն ընդգրկեք հոսանքի ցանկում` վրիպակների մասին զեկուցելու համար"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Մնալ արթուն"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Էկրանը երբեք չի քնի լիցքավորման ընթացքում"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Միացնել Bluetooth HCI snoop log-ը"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Բարձրություն"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ազդում է հնչած տեքստի ձայներանգի վրա"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Լեզու"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Օգտագործել համակարգի լեզուն"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Լեզուն ընտրված չէ"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Կարգավորում է լեզվին բնորոշ ձայնը արտասանվող տեքստի համար"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Լսել օրինակը"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC հասցե"</string>
     <string name="enter_password" msgid="4131758584074246224">"Մուտքագրեք գաղտնաբառը՝ պահոցը ապակոդավելու համար"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Կրկին փորձեք:"</string>
     <string name="delete" msgid="4219243412325163003">"Ջնջել"</string>
     <string name="misc_files" msgid="6720680815969643497">"Խառը ֆայլեր"</string>
@@ -2018,8 +2014,7 @@
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Ստուգել վստահելի վկայագրերը"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Օգտվողներ"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Օգտվողներ &amp; պրոֆիլներ"</string>
-    <!-- no translation found for user_add_user_or_profile_menu (6923838875175259418) -->
-    <skip />
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Ավելացնել օգտվող կամ պրոֆիլ"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Ավելացնել օգտվող"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Սահմանափակված պրոֆիլ"</string>
     <string name="user_summary_managed_profile" msgid="5729429961989469287">"Կառավարվող պրոֆիլ"</string>
@@ -2074,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Փոխել տառաչափը"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Հպել և վճարել"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Վճարեք ընդամենը մեկ հպումով"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Նախապատվությունը տալ առջևի պլանի ծրագրին"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Մանրամասն"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Գտնել հավելվածներ"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Սահմանե՞լ որպես նախընտրանք:"</string>
@@ -2127,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Վերջին որոնումները"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Արդյունքներ"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ցանցային կապ"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Երբ սարքն արգելափակված է"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Թաքցնել գաղտնի բովանդակությունը"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ցուցադրել ծանուցման ողջ բովանդակությունը"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Չխանգարել"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Չխանգարել"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Ծանուցումներ"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Մեջբերումներ"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ծրագրերի ծանուցումներ"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Կարգավորեք WiFi NFC պիտակը"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Գրել"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Հպեք պիտակի վրա՝ գրելու համար..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Գաղտնաբառը սխալ է, կրկին փորձեք:"</string>
@@ -2144,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Անհնար է գրել տվյալները NFC պիտակում: Եթե ​​խնդիրը չկարգավորվի, փորձեք մեկ այլ պիտակ"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC պիտակում հնարավոր չէ գրել: Խնդրում ենք օգտագործել այլ պիտակ:"</string>
     <string name="default_sound" msgid="8821684447333687810">"Կանխադրված զանգերանգը"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Չխանգարել"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Հեռախոսի զանգերանգ"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Թրթռալ զանգելիս"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Ծանուցման լույսի թարթում"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ցուցադրել ծանուցման ողջ բովանդակությունը"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Թաքցնել գաղտնի բովանդակությունը"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Ծրագրերի ծանուցումներ"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ծրագրիը չի կարող կարդալ ծանուցումները"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d ծրագիրը կարող է կարդալ ծանուցումները"</item>
+    <item quantity="other" msgid="980049191810249052">"%d հավելված կարող է կարդալ ծանուցումները"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Ծանուցման ունկնդիրներ տեղադրված չեն:"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Միացնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g>-ը:"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>-ը կկարողանա կարդալ համակարգի կամ ցանկացած տեղադրված ծրագրի կողմից փակցված բոլոր ծանուցումները, որոնք կարող են պարունակել այնպիսի անձնական տեղեկություններ, ինչպիսիք են կոնտակտների անունները և ձեզ ուղարկված հաղորդագրությունների պարունակությունը: Այն նաև կկարողանա մերժել այս ծանուցումները կամ հպված գործողության կոճակները իրենց մեջ:"</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Պայմանների աղբյուրներ"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ոչ մի ծրագիր պայմաններ չի տալիս"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d ծրագիր տալիս է պայմաններ"</item>
+    <item quantity="other" msgid="358057362115673258">"%d ծրագիր տալիս են պայմաններ"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Պայմանների աղբյուրներ տեղադրված չեն:"</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Միացնե՞լ <xliff:g id="SERVICE">%1$s</xliff:g> ծառայությունը:"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>-ը կկարողանա ավելացնել պայմաններ «Չխանգարել» ռեժիմից դուրս գալու համար:"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Ծրագրերը բեռնվում են..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Ցուցադրել ծանուցումները"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Բարձր առաջնահերթություն"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Պատրաստ է"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Անջատված"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Միացված"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Քանի դեռ չեք անջատել"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Արգելափակել բոլոր ընդհատումները, բացի՝"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Գիշերը"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Այլ տիպի ավտոմատացում"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ավտոմատ միացնել"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Երբեք"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Հեռախոսազանգեր"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Հաղորդագրություններ"</string>
@@ -2172,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Մեկնարկի ժամը"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ավարտի ժամը"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> հաջորդ օրը"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Ծրագրերի ծանուցումներ"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ծանուցման կարգավորումներ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Ուղարկել կարծիք այս սարքի մասին"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index ab83396..45a3274 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sekarang Anda adalah seorang pengembang!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, Anda sudah menjadi pengembang."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"NIRKABEL &amp; JARINGAN"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"PERANGKAT"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PRIBADI"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Hidupkan radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Matikan radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Hidupkan SMS melalui IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Enkripsi"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Enkripsi tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Enkripsi ponsel"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi tablet tiap kali Anda menyalakannya"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau sandi angka untuk mengurai enkripsi ponsel tiap kali Anda menyalakannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Dienkripsi"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi tablet, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menyalakannya. Anda tidak dapat membatalkan enkripsi tablet kecuali dengan mengembalikannya ke setelan pabrik yang akan menghapus seluruh data Anda.\n\nEnkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan tablet dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda dapat mengenkripsi akun, setelan, apl yang diunduh dan datanya, media, serta file lainnya. Setelah mengenkripsi ponsel, Anda perlu memasukkan PIN numerik atau sandi untuk mendekripsinya setiap kali Anda menghidupkannya. Anda tidak dapat membatalkan enkripsi ponsel kecuali dengan mengembalikan ke setelan pabrik dan akan menghapus seluruh data Anda.\n\nEnkripsi memakan waktu satu jam atau lebih. Anda harus memulainya dengan baterai yang terisi penuh dan terus menghubungkan ponsel dengan sumber daya hingga enkripsi selesai. Jika Anda menghentikan proses enkripsi, Anda akan kehilangan sebagian atau seluruh data Anda."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Enkripsi tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Enkripsi ponsel"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Isi daya baterai Anda dan coba lagi."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Lihat atau nonaktifkan administrator perangkat"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agen kepercayaan"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Tampilkan atau nonaktifkan agen kepercayaan"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Akses pemberitahuan"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikasi tidak dapat membaca pemberitahuan"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikasi dapat membaca pemberitahuan"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplikasi dapat membaca pemberitahuan"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Tidak ada pendengar pemberitahuan yang terpasang."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Aktifkan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> akan dapat membaca semua pemberitahuan yang diposkan oleh sistem atau aplikasi apa pun yang terpasang, yang dapat meliputi informasi pribadi seperti nama kontak dan pesan teks yang dikirimkan kepada Anda. Pendengar pemberitahuan tersebut juga akan dapat menyingkirkan pemberitahuan ini atau menyentuh tombol tindakan di dalamnya."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Penyedia ketentuan"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Tidak ada aplikasi yang memberikan ketentuan"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikasi memberikan ketentuan"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplikasi memberikan ketentuan"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Tidak ada penyedia ketentuan yang dipasang."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Aktifkan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> akan dapat menambah ketentuan keluar ke mode Jangan ganggu."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Hidupkan Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Hubungkan ke jaringan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan jaringan"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah jaringan"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Lihat jaringan yang ada dengan menyalakan Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Menelusuri jaringan Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Anda tidak memiliki izin untuk mengubah jaringan Wi‑Fi."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", diamankan dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Masukkan sandi jaringan Anda."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Tidak Ada"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk meningkatkan ketepatan lokasi dan untuk tujuan lainnya, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin mengaktifkan pemindaian jaringan, bahkan saat Wi-Fi sedang tidak aktif.\n\nIzinkan ini untuk semua aplikasi yang ingin memindai?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Izinkan"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Beranda"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tampilan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Suara"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efek musik"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume dering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar saat senyap"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Suara pemberitahuan default"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Munculan jika prioritas tinggi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Bisukan musik &amp; media lain"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Bisukan pemberitahuan"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Bisukan alarm"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Bergetar saat berdering"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Setelan dok"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Berganti orientasi secara otomatis ketika memutar ponsel"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Ubah orientasi secara otomatis ketika memutar tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Berganti orientasi secara otomatis ketika memutar ponsel"</string>
-    <string name="brightness" msgid="2354961343555249270">"Kecerahan"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Sesuaikan kecerahan layar"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Debugging USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mode debug ketika USB tersambung"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Cabut otorisasi debug USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Laporan bug menu daya"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Menyertakan opsi dalam menu daya untuk mengambil laporan bug"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Tetap terjaga"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Layar tidak akan redup selama mengisi daya"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktifkan log pengintaian HCI Bluetooth"</string>
@@ -1821,6 +1814,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ketik sandi untuk mendekripsi penyimpanan"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Coba lagi."</string>
     <string name="delete" msgid="4219243412325163003">"Hapus"</string>
     <string name="misc_files" msgid="6720680815969643497">"File Serbaneka"</string>
@@ -2073,6 +2070,8 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Ubah ukuran font"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Ketuk &amp; bayar"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Bayar hanya dengan mengetuk"</string>
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Pelajari lebih lanjut"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Cari aplikasi"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Jadikan preferensi Anda?"</string>
@@ -2126,16 +2125,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Penelusuran terkini"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Hasil"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection sambungan jaringan"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Saat perangkat terkunci"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan konten pemberitahuan yang sensitif"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tampilkan semua konten pemberitahuan"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Jangan ganggu"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Jangan ganggu"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notifikasi"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Otak-atik"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan pemberitahuan"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Siapkan Tag NFC Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketuk tag untuk menulis..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Sandi tidak valid, coba lagi."</string>
@@ -2143,19 +2134,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Tidak dapat menulis data ke tag NFC. Jika masalah berlanjut, coba tag lain"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Tag NFC tidak dapat ditulisi. Gunakan tag lain."</string>
     <string name="default_sound" msgid="8821684447333687810">"Suara default"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Jangan ganggu"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Nada dering ponsel"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Bergetar saat berdering"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tampilkan semua konten pemberitahuan"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan konten pemberitahuan yang sensitif"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan aplikasi"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikasi tidak dapat membaca pemberitahuan"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplikasi dapat membaca pemberitahuan"</item>
+    <item quantity="other" msgid="980049191810249052">"%d aplikasi dapat membaca pemberitahuan"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Tidak ada pendengar pemberitahuan yang terpasang."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Aktifkan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> akan dapat membaca semua pemberitahuan yang diposkan oleh sistem atau aplikasi apa pun yang terpasang, yang dapat meliputi informasi pribadi seperti nama kontak dan pesan teks yang dikirimkan kepada Anda. Pendengar pemberitahuan tersebut juga akan dapat menyingkirkan pemberitahuan ini atau menyentuh tombol tindakan di dalamnya."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Penyedia ketentuan"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Tidak ada aplikasi yang memberikan ketentuan"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d aplikasi memberikan ketentuan"</item>
+    <item quantity="other" msgid="358057362115673258">"%d aplikasi memberikan ketentuan"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Tidak ada penyedia ketentuan yang dipasang."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Aktifkan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> akan dapat menambah ketentuan keluar ke mode Jangan ganggu."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Memuat aplikasi..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Tampilkan pemberitahuan"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioritas tinggi"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Nonaktif"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Aktif"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hingga Anda menonaktifkan ini"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokir semua gangguan kecuali"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Malam hari"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Automasi lain"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Otomatis aktif"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Tidak pernah"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Panggilan telepon"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pesan"</string>
@@ -2171,5 +2235,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Waktu mulai"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Waktu berakhir"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari berikutnya"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Setelan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Kirim masukan tentang perangkat ini"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 5a2d626..02065d6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Ora sei uno sviluppatore."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Non è necessario, sei già uno sviluppatore."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS E RETI"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONALE"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Wireless e reti"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Personali"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Attiva segnale cellulare"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Disattiva segnale cellulare"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Attiva SMS su IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Crittografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Esegui crittografia tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Esegui crittografia telefono"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Richiedi un PIN numerico o una password per decrittografare il tablet a ogni accensione"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Richiedi un PIN numerico o una password per decrittografare il telefono a ogni accensione"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Crittografato"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il tablet, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il tablet se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati.\n\nLa crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il tablet collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puoi crittografare i tuoi account, le impostazioni, le applicazioni scaricate e i relativi dati, file multimediali e altri file. Una volta crittografato il telefono, devi digitare un PIN numerico o una password per decrittografarlo ogni volta che lo accendi. Non puoi decrittografare il telefono se non eseguendo un ripristino dati di fabbrica, cancellando tutti i tuoi dati.\n\nLa crittografia potrebbe richiedere più di un\'ora. Devi iniziare con una batteria carica e tenere il telefono collegato fino al completamento della crittografia. Se interrompi la procedura, perderai alcuni o tutti i tuoi dati."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Puoi crittografare account, impostazioni, app scaricate e relativi dati, contenuti multimediali e altri file. Una volta crittografato il tablet, presumendo che tu abbia impostato il blocco schermo (una password o un PIN numerico o a pattern), devi sbloccare lo schermo per decrittografare il tablet a ogni accensione. L\'unico altro metodo di decrittografia consiste nell\'esecuzione di un ripristino dati di fabbrica, cancellando così tutti i dati memorizzati.\n\nLa procedura di crittografia richiede almeno un\'ora. Devi iniziarla con una batteria completamente carica e mantenere il tablet sempre collegato a una presa di corrente per tutta la durata della procedura. Qualora dovessi interromperla, perderai tutti i dati o parte di essi."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Puoi crittografare account, impostazioni, app scaricate e relativi dati, contenuti multimediali e altri file. Una volta crittografato il telefono, presumendo che tu abbia impostato il blocco schermo (una password o un PIN numerico o a pattern), devi sbloccare lo schermo per decrittografare il telefono a ogni accensione. L\'unico altro metodo di decrittografia consiste nell\'esecuzione di un ripristino dati di fabbrica, cancellando così tutti i dati memorizzati.\n\nLa procedura di crittografia richiede almeno un\'ora. Devi iniziarla con una batteria completamente carica e mantenere il telefono sempre collegato a una presa di corrente per tutta la durata della procedura. Qualora dovessi interromperla, perderai tutti i dati o parte di essi."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Esegui crittografia tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Esegui crittografia telefono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carica la batteria e riprova."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visualizza o disattiva amministratori dispositivo"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agent"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Visualizza o disattiva trust agent"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Accesso alle notifiche"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Le app non possono leggere le notifiche"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"L\'app %d può leggere le notifiche"</item>
-    <item quantity="other" msgid="980049191810249052">"Le app %d possono leggere le notifiche"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nessun listener di notifica installato."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Attivare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sarà in grado di leggere tutte le notifiche pubblicate dal sistema o da qualsiasi app installata, le quali potrebbero includere informazioni personali come i nomi dei contatti e il testo dei messaggi ricevuti. Sarà inoltre in grado di ignorare tali notifiche o di attivare pulsanti di azione al loro interno."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornitori di condizioni"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nessuna app fornisce condizioni"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app fornisce condizioni"</item>
-    <item quantity="other" msgid="358057362115673258">"%d app forniscono condizioni"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nessun fornitore di condizioni installato."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Attivare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> potrà aggiungere condizioni di uscita alla modalità Non disturbare."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Attiva Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connetti alla rete"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Elimina rete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modifica rete"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Per visualizzare le reti disponibili, attiva Wi‑Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Ricerca reti Wi‑Fi in corso…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Non disponi dell\'autorizzazione per cambiare la rete Wi-Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibile)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protetta con <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Inserisci la password di rete."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Nessuna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Per migliorare la precisione della posizione e per altri scopi, <xliff:g id="APP_NAME">%1$s</xliff:g> chiede di attivare la ricerca della rete, anche quando il Wi-Fi è disattivato.\n\nConsetirlo a tutte le app che vogliono eseguire la ricerca?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Consenti"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Home page"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Display"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Audio"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumi"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Effetti musicali"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume suoneria"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibra in modalità silenziosa"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Suono di notifica predefinito"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Luce di notifica pulsante"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Notif. popup per alta priorità"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Suoneria"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notifica"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Disattiva audio musica e altri contenuti multimediali"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Disattiva audio notifiche"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Disattiva audio allarmi"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrazione quando squilla"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Impostazioni dock"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Cambia automaticamente quando il cellulare viene ruotato"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Cambia automaticamente l\'orientamento quando il tablet viene ruotato"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Cambia automatic. l\'orientamento quando il cell. viene ruotato"</string>
-    <string name="brightness" msgid="2354961343555249270">"Luminosità"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Sospensione"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Debug USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modalità debug quando è connesso USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revoca autorizzazioni debug USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Segnalazioni di bug nel menu di accensione"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Includi opzione per aprire una segnalazione bug nel menu di accensione"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Rimani attivo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Lo schermo non va mai in stand-by se sotto carica"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Attiva log di esame HCI Bluetooth"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Indirizzo MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Digita la password per decrittografare l\'archivio"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Digita il PIN per decrittografare la memoria"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Disegna il tuo pattern per decrittografare la memoria"</string>
     <string name="try_again" msgid="4272075051293936921">"Riprova."</string>
     <string name="delete" msgid="4219243412325163003">"Elimina"</string>
     <string name="misc_files" msgid="6720680815969643497">"File vari"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Cambia le dimensioni del carattere"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Touch &amp; Pay"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Paga con un tocco"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Priorità alle app in primo piano"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Ulteriori informazioni"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Trova app"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Impostare come preferenza?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Ricerche recenti"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Risultati"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi connessione rete Wi-Fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Con dispositivo bloccato"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Nascondi contenuti sensibili della notifica"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti della notifica"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Non disturbare"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Non disturbare"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notifiche"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Regolazioni"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifiche app"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Imposta tag NFC WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Modifica"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tocca un tag per impostarlo..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Password non valida. Riprova."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Impossibile inserire dati nel tag NFC. Se il problema persiste, prova con un tag diverso."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Il tag NFC non è modificabile. Utilizza un tag diverso."</string>
     <string name="default_sound" msgid="8821684447333687810">"Suono predefinito"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Suoni e notifiche"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume app. multimediali"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume allarme"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume suoneria"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Non disturbare"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Quando ricevo chiamate e notifiche"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Suoneria"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrazione invece di suoneria"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Disattiva suoneria e vibrazione"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Suoneria telefono"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Suoneria predefinita notifiche"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrazione quando squilla"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Visualizzazione notifiche"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Luce di notifica pulsante"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Con dispositivo bloccato"</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_summary_disable" msgid="3001013816427963576">"Non visualizzare del tutto le notifiche"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quando è attivo Non disturbare"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Nascondi nuove notifiche dall\'elenco"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Visualizza tutte le notifiche nell\'elenco"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Suoni alla pressione"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toni tastierino"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Blocco e sblocco schermo"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Altri suoni alla pressione"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibra alla pressione"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Accesso alle notifiche"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Le app non possono leggere le notifiche"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"L\'app %d può leggere le notifiche"</item>
+    <item quantity="other" msgid="980049191810249052">"Le app %d possono leggere le notifiche"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nessun listener di notifica installato."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Attivare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sarà in grado di leggere tutte le notifiche pubblicate dal sistema o da qualsiasi app installata, le quali potrebbero includere informazioni personali come i nomi dei contatti e il testo dei messaggi ricevuti. Sarà inoltre in grado di ignorare tali notifiche o di attivare pulsanti di azione al loro interno."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornitori di condizioni"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nessuna app fornisce condizioni"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d app fornisce condizioni"</item>
+    <item quantity="other" msgid="358057362115673258">"%d app forniscono condizioni"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nessun fornitore di condizioni installato."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Attivare <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> potrà aggiungere condizioni di uscita alla modalità Non disturbare."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Caricamento app..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostra notifiche"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Alta priorità"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Visualizza all\'inizio dell\'elenco"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Nascondi contenuti sensibili quando il dispositivo è bloccato"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloccate"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Inizio dell\'elenco"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Riservate"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Fine"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Non attiva"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Attiva"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Fino alla disattivazione"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blocca tutte le interruzioni tranne"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Di notte"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Altra automazione"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Attiva automaticamente"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Mai"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonate"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Messaggi"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora di inizio"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora di fine"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> giorno successivo"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notifiche app"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Impostazioni di notifica"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Invia feedback sul dispositivo"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index c4b96d4..7a8717d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"אתה כעת מפתח!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"אין צורך, אתה כבר מפתח."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"אלחוטי ורשתות"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"מכשיר"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"אישי"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"מערכת"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"רשתות ותקשורת אלחוטית"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"מכשיר"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"אישי"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"מערכת"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"הפעל רדיו"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"כבה רדיו"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"‏הפעל SMS באמצעות IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"הצפנה"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"הצפן טאבלט"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"הצפן טלפון"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"‏דורש PIN מספרי או סיסמה לפענוח הטאבלט בכל הפעלה"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"‏דורש PIN מספרי או סיסמה לפענוח הטלפון בכל הפעלה"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"מוצפן"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"‏אתה יכול להצפין חשבונות, הגדרות, אפליקציות שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטאבלט שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטאבלט שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטאבלט מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"‏אתה יכול להצפין חשבונות, הגדרות, אפליקציות שהורדת ונתונים שלהם, מדיה וקבצים אחרים. לאחר שתצפין את הטלפון שלך, בכל פעם שתפעיל אותו תצטרך להקליד קוד PIN מספרי או סיסמה כדי לפענח את הנתונים. לא תוכל לבטל את הצפנת הטלפון שלך, אלא אם תבצע איפוס לנתוני יצרן. פעולה זו תמחק את כל הנתונים.\n\nההצפנה אורכת שעה לפחות. עליך לבצע הפעלה עם סוללה טעונה ולהשאיר את הטלפון מחובר עד לסיום ההצפנה. אם תפסיק את תהליך ההצפנה, תאבד את כל הנתונים או חלק מהם."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"‏ניתן להצפין חשבונות, הגדרות, אפליקציות שהורדת והנתונים שלהם, מדיה וקבצים אחרים. לאחר הצפנת הטאבלט, בהנחה שהגדרת נעילת מסך (כלומר, קו ביטול נעילה, מספר PIN או סיסמה), יהיה עליך לבטל את נעילת המסך כדי לפענח את הצפנת הטאבלט בכל פעם שתפעיל אותו. הדרך האחרת היחידה לפענוח ההצפנה היא לבצע איפוס לנתוני היצרן - פעולה שמוחקת את כל הנתונים.\n\nביצוע ההצפנה אורך שעה או יותר. יש להתחיל כשהסוללה טעונה במלואה ועל הטאבלט להישאר מחובר במשך כל התהליך. אם התהליך יופסק, ייתכן שתאבד חלק מהנתונים או את כולם."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"‏ניתן להצפין חשבונות, הגדרות, אפליקציות שהורדת והנתונים שלהם, מדיה וקבצים אחרים. לאחר הצפנת הטלפון, בהנחה שהגדרת נעילת מסך (כלומר, קו ביטול נעילה, מספר PIN או סיסמה), יהיה עליך לבטל את נעילת המסך כדי לפענח את הצפנת הטלפון בכל פעם שתפעיל אותו. הדרך האחרת היחידה לפענוח ההצפנה היא לבצע איפוס לנתוני היצרן - פעולה שמוחקת את כל הנתונים.\n\nביצוע ההצפנה אורך שעה או יותר. יש להתחיל כשהסוללה טעונה במלואה ועל הטלפון להישאר מחובר במשך כל התהליך. אם התהליך יופסק, ייתכן שתאבד חלק מהנתונים או את כולם."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"הצפן טאבלט"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"הצפן טלפון"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"טען את הסוללה ונסה שוב."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"הצג או השבת מנהלי התקנים"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"סוכני אמון"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"הצג או השבת סוכני אמון"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"גישה אל התראות"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא התראות"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"‏אפליקציה %d יכולה לקרוא התראות"</item>
-    <item quantity="other" msgid="980049191810249052">"‏%d אפליקציות יכולות לקרוא התראות"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"לא מותקנים מאזינים להתראות."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"האם להפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> יוכל לקרוא את כל ההתראות שפורסמו על ידי המערכת או על ידי אפליקציה מותקנת כלשהי, והדבר עשוי לכלול מידע אישי כמו שמות אנשי קשר ואת הטקסט בהודעות שנשלחו אליך. הוא יוכל גם לסגור את ההתראות האלה או להשתמש בלחצני פעולה בתוכן."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ספקי תנאים"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"אין אפליקציות המספקות תנאים"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"‏אפליקציה %d מספקת תנאים"</item>
-    <item quantity="other" msgid="358057362115673258">"‏%d אפליקציות מספקות תנאים"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"לא מותקנים ספקי תנאים."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"האם להפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> יוכל להוסיף תנאי יציאה למצב \'נא לא להפריע\'."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"‏הפעל את Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"התחבר לרשת"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"שכח רשת"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"שנה רשת"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"‏אין לך הרשאה לשנות את רשת ה-Wi-Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" ‏ (WPS זמין)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", מאובטח באמצעות <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"הזן את סיסמת הרשת שלך."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"ללא"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"‏לשיפור דיוק המיקום ולמטרות אחרות, <xliff:g id="APP_NAME">%1$s</xliff:g> רוצה להפעיל את סריקת הרשתות, גם כאשר ה-Wi-Fi כבוי.\n\nהאם להתיר זאת עבור כל האפליקציות שרוצות לסרוק?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"אפשר"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"דף הבית"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"תצוגה"</string>
     <string name="sound_settings" msgid="5534671337768745343">"צלילים"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"עוצמות קול"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"אפקטים מוסיקליים"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"עוצמת קול של צלצול"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"רטט במצב שקט"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"צליל ברירת מחדל להתראה"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"תאורת התראה של אות"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"חלון קופץ לעדיפות גבוהה"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"צלצול"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"התראה"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"השתק מוסיקה וסוגי מדיה אחרים"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"השתק התראות"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"השתק התראות קוליות"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"רטט בעת צלצול"</string>
     <string name="dock_settings" msgid="1820107306693002541">"עגינה"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"הגדרות עגינה"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"אודיו"</string>
@@ -758,8 +738,13 @@
     <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="2354961343555249270">"בהירות"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"התאם את בהירות המסך"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"שינה"</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>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"‏ניקוי באגים ב-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"‏מצב תיקון באגים כאשר USB מחובר"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"‏ביטול הרשאות לניקוי באגים ב-USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"‏דיווחי באגים ב-Power Menu"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"‏כלול אפשרות ב-Power Menu לביצוע דיווח על באג"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"השאר פועל"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"המסך לעולם לא יהיה במצב שינה במהלך טעינה"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"‏הפעלת Snoop Log של Bluetooth HCI"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"‏כתובת ‎4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"הקלד סיסמה לפענוח ההצפנה של אמצעי האחסון"</string>
+    <string name="enter_pin" msgid="286221169871526876">"‏צייר את מספר ה-PIN כדי לפענח את הצפנת האחסון"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"צייר את קו ביטול הנעילה כדי לפענח את הצפנת האחסון"</string>
     <string name="try_again" msgid="4272075051293936921">"נסה שוב."</string>
     <string name="delete" msgid="4219243412325163003">"מחק"</string>
     <string name="misc_files" msgid="6720680815969643497">"קובצי \'שונות\'"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"שנה גודל גופן"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"הקש ושלם"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"שלם באמצעות הקשה בלבד"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"תן עדיפות לאפליקציה בקדמה"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"למידע נוסף"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"חפש אפליקציות"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"האם להגדיר בתור ההעדפה שלך?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"חיפושים אחרונים"</string>
     <string name="search_results_label" msgid="4163304782363526148">"תוצאות"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"‏wifi wi-fi חיבור רשת"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"כשהמכשיר נעול"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"הסתר תוכן רגיש בהודעות"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"הצג את כל תוכן ההודעות"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"נא לא להפריע"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"נא לא להפריע"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"הודעות"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"שיפורים"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"הודעות אפליקציה"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"‏הגדר תג NFC עבור WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"כתוב"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"הקש על תג כדי לכתוב..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"סיסמה לא חוקית, נסה שוב."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"‏לא ניתן לכתוב נתונים לתג NFC. אם הבעיה נמשכת, נסה תג אחר"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"‏תג NFC אינו ניתן לכתיבה. השתמש בתג אחר."</string>
     <string name="default_sound" msgid="8821684447333687810">"צליל ברירת מחדל"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"צלילים והודעות"</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="zen_mode_settings_title" msgid="2689740350895257590">"נא לא להפריע"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"כשנכנסות שיחות והודעות"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"השמע צלצול"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"הפעל רטט במקום השמעת צלצול"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"אל תפעיל רטט או תשמיע צלצול"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"רינגטון של טלפון"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"רינגטון להודעות המוגדר כברירת מחדל"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"רטט בעת צלצול"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"הצגת הודעות"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"תאורת התראה של אות"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"כשהמכשיר נעול"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"הצג את כל תוכן ההודעות"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"הסתר תוכן רגיש בהודעות"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"אל תציג הודעות כלל"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"כשמצב \'נא לא להפריע\' פועל"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"אל תציג הודעות חדשות ברשימה"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"הצג את כל ההודעות ברשימה"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"צלילי מגע"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"צלילים של לוח חיוג"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"נעילה וביטול נעילה של המסך"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"צלילי מגע אחרים"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"רטט בעת מגע"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"גישה אל הודעות"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"אפליקציות לא יכולות לקרוא התראות"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"‏אפליקציה %d יכולה לקרוא התראות"</item>
+    <item quantity="other" msgid="980049191810249052">"‏%d אפליקציות יכולות לקרוא התראות"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"לא מותקנים מאזינים להתראות."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"האם להפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> יוכל לקרוא את כל ההתראות שפורסמו על ידי המערכת או על ידי אפליקציה מותקנת כלשהי, והדבר עשוי לכלול מידע אישי כמו שמות אנשי קשר ואת הטקסט בהודעות שנשלחו אליך. הוא יוכל גם לסגור את ההתראות האלה או להשתמש בלחצני פעולה בתוכן."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"ספקי תנאים"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"אין אפליקציות המספקות תנאים"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"‏אפליקציה %d מספקת תנאים"</item>
+    <item quantity="other" msgid="358057362115673258">"‏%d אפליקציות מספקות תנאים"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"לא מותקנים ספקי תנאים."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"האם להפעיל את <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> יוכל להוסיף תנאי יציאה למצב \'נא לא להפריע\'."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"טוען אפליקציות..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"הצג הודעות"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"עדיפות גבוהה"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"הצג בראש הרשימה"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"הסתר תוכן רגיש כשהמכשיר נעול"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"חסום"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"ראש הרשימה"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"רגיש"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"בוצע"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"כבוי"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"פועל"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"עד שתכבה"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"חסום את כל ההפרעות, מלבד"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"בלילה"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"אוטומציה אחרת"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"הפעל אוטומטית"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"אף פעם"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"שיחות טלפון"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"הודעות"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"שעת התחלה"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"שעת סיום"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> למחרת"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"הודעות אפליקציה"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"הגדרות התראה"</string>
     <string name="device_feedback" msgid="3238056036766293294">"שלח משוב על המכשיר הזה"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 7b76cf6..9684773 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"これでデベロッパーになりました！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"必要ありません。既にデベロッパーです。"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線とネットワーク"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"端末"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ユーザー設定"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"システム"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"無線通信をON"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"無線通信をOFF"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"SMS over IMSをONにする"</string>
@@ -334,11 +338,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"暗号化"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"タブレットの暗号化"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"端末の暗号化"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"電源を入れるたびに数値のPINまたはパスワードを入力してタブレットを復号化する必要がある"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"電源を入れるたびに数値のPINまたはパスワードを入力して端末を復号化する必要がある"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"暗号化されています"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、タブレットを出荷時設定にリセットしてすべてのデータを消去しなければなりません。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。端末を一度暗号化すると、電源を入れるたびに数値のPINまたはパスワードを入力して復号化する必要があります。暗号化を解除するためには、端末を出荷時設定にリセットしてすべてのデータを消去しなければなりません。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまで電源を接続しておく必要があります。暗号化処理を中断すると、一部またはすべてのデータが失われます。"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -437,24 +441,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"端末管理者を表示または無効にする"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"信頼できるエージェント"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"信頼できるエージェントを表示または無効にする"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"通知へのアクセス"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"アプリは通知を読み取ることができません"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d個のアプリが通知を読み取ることができます"</item>
-    <item quantity="other" msgid="980049191810249052">"%d個のアプリが通知を読み取ることができます"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"通知リスナーはインストールされていません。"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>を有効にしますか？"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>はシステムやインストール済みのアプリが投稿した通知をすべて読み取ることができます。通知には、連絡先名などの個人情報やユーザーに送信されたメールの本文が含まれる場合があります。また、これらの通知を非表示にしたり、通知内の操作ボタンをタップしたりすることもできます。"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"コンディションプロバイダ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"条件を指定しているアプリはありません"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d個のアプリが条件を指定しています"</item>
-    <item quantity="other" msgid="358057362115673258">"%d個のアプリが条件を指定しています"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"コンディションプロバイダはインストールされていません。"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>を有効にしますか？"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>では出口条件を[通知を非表示]モードに追加できます。"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"BluetoothをONにする"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -592,6 +578,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ネットワークに接続"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ネットワークから切断"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ネットワークを変更"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"利用可能なネットワークを表示するにはWi-FiをON"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi-Fiネットワークを検索しています…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Wi-Fiネットワークを変更する権限がありません。"</string>
@@ -640,7 +628,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （WPS利用可）"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"、<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>で保護"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"ネットワークパスワードを入力してください。"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"なし"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"現在地情報の精度向上やその他の目的で、<xliff:g id="APP_NAME">%1$s</xliff:g>ではWi-FiがOFFのときでもネットワークスキャンをオンにすることを要求しています。\n\nスキャンを必要とするすべてのアプリでスキャンを許可しますか？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"許可する"</string>
@@ -704,14 +693,12 @@
     <string name="home_settings" msgid="212375129455718176">"ホーム"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"表示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"サウンド効果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"着信音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"マナーモード時のバイブレーション"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"デフォルトの通知音"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"光を点滅させて通知"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"最優先の場合はポップアップ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"着信音"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
@@ -734,7 +721,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"音楽やメディアをミュート"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"通知音をミュート"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"アラームをミュート"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"着信時のバイブレーション"</string>
     <string name="dock_settings" msgid="1820107306693002541">"ホルダー"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"ホルダーの設定"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"音声"</string>
@@ -760,8 +746,13 @@
     <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="2354961343555249270">"画面の明るさ"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"スリープ"</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>
@@ -1345,8 +1336,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USBデバッグ"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB接続時はデバッグモードにする"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"USBデバッグの許可の取り消し"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"電源メニューのバグレポート"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"電源メニューにバグレポートを取得するオプションを含める"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"スリープモードにしない"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電中に画面をスリープにしない"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCIスヌープログを有効にする"</string>
@@ -1630,8 +1623,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音の高さ"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"テキスト読み上げの音程を変更する"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"言語"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"システムの言語を使用"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"言語が選択されていません"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"テキスト読み上げに使用する言語固有の音声を設定する"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"サンプルを再生"</string>
@@ -1827,6 +1819,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MACアドレス"</string>
     <string name="enter_password" msgid="4131758584074246224">"ストレージを復号化するパスワードを入力してください"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"もう一度お試しください。"</string>
     <string name="delete" msgid="4219243412325163003">"削除"</string>
     <string name="misc_files" msgid="6720680815969643497">"その他のファイル"</string>
@@ -2079,6 +2075,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"フォントサイズの変更"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"タップ＆ペイ"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"タップして支払う"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"フォアグラウンドアプリを優先"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"詳細"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"アプリを検索"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設定として保存しますか？"</string>
@@ -2132,16 +2129,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近の検索"</string>
     <string name="search_results_label" msgid="4163304782363526148">"検索結果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ネットワーク 接続"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"端末をロックしているとき"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"プライベートな通知内容を非表示にします"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"すべての通知内容を表示します"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"通知を非表示"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"通知を非表示"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"通知"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"アプリの通知"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi NFCタグのセットアップ"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"書き込む"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"書き込むにはタグをタップしてください..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"パスワードが無効です。もう一度お試しください。"</string>
@@ -2149,19 +2138,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFCタグにデータを書き込めません。問題が解決しない場合は別のタグをお試しください。"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFCタグに書き込めません。別のタグを使用してください。"</string>
     <string name="default_sound" msgid="8821684447333687810">"デフォルトの通知音"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"通知を非表示"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"着信音"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"着信時のバイブレーション"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"光を点滅させて通知"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"すべての通知内容を表示します"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"プライベートな通知内容を非表示にします"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"アプリの通知"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"アプリは通知を読み取ることができません"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d個のアプリが通知を読み取ることができます"</item>
+    <item quantity="other" msgid="980049191810249052">"%d個のアプリが通知を読み取ることができます"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"通知リスナーはインストールされていません。"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>を有効にしますか？"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>はシステムやインストール済みのアプリが投稿した通知をすべて読み取ることができます。通知には、連絡先名などの個人情報やユーザーに送信されたメールの本文が含まれる場合があります。また、これらの通知を非表示にしたり、通知内の操作ボタンをタップしたりすることもできます。"</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"コンディションプロバイダ"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"条件を指定しているアプリはありません"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d個のアプリが条件を指定しています"</item>
+    <item quantity="other" msgid="358057362115673258">"%d個のアプリが条件を指定しています"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"コンディションプロバイダはインストールされていません。"</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>を有効にしますか？"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>では出口条件を[通知を非表示]モードに追加できます。"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"アプリを読み込んでいます..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"通知を表示"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"最優先"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完了"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"OFF"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"ON"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"ユーザーがOFFにするまで"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"次の場合を除きすべての中断をブロック"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"夜間"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"その他の自動化"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動的にON"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">"、"</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"なし"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"電話"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"メッセージ"</string>
@@ -2177,5 +2239,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"開始時間"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"終了時間"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"次の日の<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"アプリの通知"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"この端末についてフィードバックを送信"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 93e8eb3..89a4256 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ახლა დეველოპერი ხართ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"არ არის საჭირო, თქვენ უკვე დეველოპერი ხართ."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"უსადენო კავშირი და ქსელები"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"მოწყობილობა"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"პირადი"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"უსადენო კავშირი და ქსელები"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"მოწყობილობა"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"პირადი"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"სისტემა"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"გადამცემის ჩართვა"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"გადამცემის გამორთვა"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"SMS-ის გამორთვა IMS-ით"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"დაშიფვრა"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ტაბლეტის დაშიფრვა"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ტელეფონის დაშიფვრა"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"თქვენი ტაბლეტის გაშიფვრისთვის ყოველი ჩართვისას საჭიროა რიცხვითი PIN-კოდის ან პაროლის შეყვანა"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"თქვენი ტელეფონის გაშიფვრისთვის ყოველი ჩართვისას საჭიროა რიცხვითი PIN-კოდის ან პაროლის შეყვანა"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"დაშიფრული"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"თქვენ შეგიძლიათ დაშიფროთ ანგარიშის პარამეტრები, გადმოწერილი აპები, მათი მონაცემები, მედია და სხვა ფაილები. დაშიფვრის შემდეგ, ტაბლეტის ყოველი ჩართვისას მოგიწევთ მისი გაშიფვრა PIN-კოდის ან პაროლის შეყვანით. დაშიფვრის მოხსნის ერთადერთი საშუალებაა ქარხნულ მონაცემთა აღდგენა, რაც გამოიწვევს ყველანაირი ინფორმაციის წაშლას.\n\nდაშიფვრას შესაძლოა დასჭირდეს ერთი ან მეტი საათი. დაშიფვრამდე დარწმუნდით, რომ ბატარეა დატენილია და არ გამორთოთ ტაბლეტი კვების წყაროდან პროცესის დასრულებამდე. პროცესის შეწყვეტის შემთხვევაში შეიძლება ნაწილობრივ, ან სრულად დაკარგოთ პირადი მონაცემები."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"თქვენ შეგიძლიათ დაშიფროთ ანგარიშის პარამეტრები, გადმოწერილი აპები, მათი მონაცემები, მედია და სხვა ფაილები. ტელეფონის დაშიფვრის შემდეგ, მისი ყოველი ჩართვისას მოგიწევთ მისი გაშიფვრა PIN-კოდის ან პაროლის შეყვანით. დაშიფვრის მოხსნის ერთადერთი საშუალებაა ქარხნულ მონაცემთა აღდგენა, რაც გამოიწვევს ყველანაირი ინფორმაციის წაშლას.\n\nდაშიფვრას შესაძლოა დასჭირდეს ერთი ან მეტი საათი. დაშიფვრამდე დარწმუნდით, რომ ბატარეა დატენილია და არ გამორთოთ ტელეფონი კვების წყაროდან პროცესის დასრულებამდე. პროცესის შეწყვეტის შემთხვევაში შეიძლება ნაწილობრივ, ან სრულად დაკარგოთ პირადი მონაცემები."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"შეგიძლიათ დაშიფროთ თქვენი ანგარიშები, პარამეტრები, ჩამოტვირთული აპები, მედია და სხვა ფაილები. თქვენი ტაბლეტის დაშიფვრის შემდეგ, როცა სავარაუდოდ დაყენებული გექნებათ ეკრანის დაბლოკვა (ნიმუში, რიცხვითი PIN-კოდი ან პაროლი), მოგიწევთ ეკრანის განბლოკვა ტაბლეტის გასაშიფრად ყოველი ჩართვისას. გაშიფვრის ერთადერთი სხვა საშუალება ქარხნული მონაცემების აღდგენაა, რაც წაშლის მთელ თქვენს მონაცემებს.\n\nდაშიფვრას ერთი საათი ან მეტი ესაჭიროება. უნდა დაიწყოთ დამუხტული ელემენტით და დატოვოთ ტაბლეტი მიერთებული მთელი პროცესის განმავლობაში. პროცესის შეწყვეტის შემთხვევაში ნაწილობრივ ან სრულად დაკარგავთ თქვენს მონაცემებს."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"შეგიძლიათ დაშიფროთ თქვენი ანგარიშები, პარამეტრები, ჩამოტვირთული აპები, მედია და სხვა ფაილები. თქვენი ტელეფონის დაშიფვრის შემდეგ, როცა სავარაუდოდ დაყენებული გექნებათ ეკრანის დაბლოკვა (ნიმუში, რიცხვითი PIN-კოდი ან პაროლი), მოგიწევთ ეკრანის განბლოკვა ტელეფონის გასაშიფრად ყოველი ჩართვისას. გაშიფვრის ერთადერთი სხვა საშუალება ქარხნული მონაცემების აღდგენაა, რაც წაშლის მთელ თქვენს მონაცემებს.\n\nდაშიფვრას ერთი საათი ან მეტი ესაჭიროება. უნდა დაიწყოთ დამუხტული ელემენტით და დატოვოთ ტელეფონი მიერთებული მთელი პროცესის განმავლობაში. პროცესის შეწყვეტის შემთხვევაში ნაწილობრივ ან სრულად დაკარგავთ თქვენს მონაცემებს."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ტაბლეტის დაშიფვრა"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ტელეფონის დაშიფრვა"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"გთხოვთ, დატენოთ ელემენტი და სცადოთ ხელახლა."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"მოწყობილობის ადმინისტრატორების ნახვა ან დეაქტივაცია"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"სანდო აგენტები"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"სანდო აგენტების ნახვა ან დეაქტივაცია"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"შეტყობინებებზე წვდომა"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"აპები ვერ კითხულობს შეტყობინებებს"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"შეტყობინებების წაკითხვა შეუძლია %d აპლიკაციას"</item>
-    <item quantity="other" msgid="980049191810249052">"%d აპს შეუძლია შეტყობინებების წაკითხვა"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"არცერთი შეტყობინებების მსმენელი არ არის დაინსტალირებული."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ჩავრთოთ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> შეძლებს სისტემური ან ნებისმიერი დაყენებული აპლიკაციის შეტყობინებების წაკითხვას, რომლებიც შეიძლება შეიცავდნენ პერსონალურ ინფორმაციას, მაგ.: კონტაქტების სახელებს ან თქვენთვის გამოგზავნილ ტექსტურ შეტყობინებებს. მას ასევე შეეძლება შეტყობინებების დახურვა და მათში არსებული ღილაკების დაჭერა."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"პირობების პროვაიდერები"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"პირობებს არცერთი აპი არ გაწვდით"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d აპი გაწვდით პირობებს"</item>
-    <item quantity="other" msgid="358057362115673258">"%d აპი გაწვდით პირობებს"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"პირობების პროვაიდერები ინსტალირებული არ არის."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ჩაირთოს <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> შეძლებს გასვლის პირობები დაამატოს „არ შემაწუხოთ“ რეჟიმს."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth-ის ჩართვა"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ქსელთან დაკავშირება"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"დაივიწყე ქსელი"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ქსელის პარამეტრების შეცვლა"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"თქვენ არ გაქვთ ნებართვა შეცვალოთ Wi‑Fi ქსელი."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ხელმისაწვდომია)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"დაცულია <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-ით"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", დაცული <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-ის მეშვეობით"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"შეიყვანეთ თქვენი ქსელის პაროლი."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"არცერთი"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"მდებარეობის ზუსტი განსაზღვრის და სხვა ფუნქციების გასაუმჯობესებლად <xliff:g id="APP_NAME">%1$s</xliff:g>-ს სურს, გააქტიურდეს ქსელების მოძიება, მაშინაც კი, როცა გამორთულია Wi-Fi.\n\nმიეცეს ამის უფლება ყველა აპს?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ნებართვა"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"სახლი"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ეკრანი"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ხმა"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"ტელეფონის ზარი"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"ხმის კონტროლი"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"მუსიკალური ეფექტები"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"მრეკავის ხმა"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ვიბრაცია დადუმებული ზარისას"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ნაგულისხმევი ხმა შეტყობინებისთვის"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"მოვლენების ინდიკატორი"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"ამოხტომა მაღალი პრიორიტეტისას"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ზარი"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"შეტყობინებები"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"მუსიკისა და სხვა მედიის დადუმება"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"შეტყობინებების დადუმება"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"მაღვიძარების გაჩუმება"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"დარეკვის დროს ვიბრაცია"</string>
     <string name="dock_settings" msgid="1820107306693002541">"სამაგრი"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"სამაგრის პარამეტრები"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"აუდიო"</string>
@@ -758,8 +738,13 @@
     <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="2354961343555249270">"სიკაშკაშე"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"ეკრანის სინათლის შესწორება"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"ძილი"</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>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB გამართვა"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"გამართვის რეჟიმი, როდესაც USB შეერთებულია"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"USB საშუალებით გამართვის შესაძლებლობის გამორთვა"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"კვების მენიუს შეცდომების ანგარიში"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"მენიუში სისტემის შეცდომის შესახებ ანგარიშის გაგზავნის შესაძლებლობის ჩვენება"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"არ დაიძინო"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"დატენვისას ეკრანი არ დაიძინებს"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop ჟურნალის ჩართვა"</string>
@@ -1628,8 +1615,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"სიმაღლე"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"ზემოქმედებას ახდენს სინთეზირებული ხმის სიმაღლეზე"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ენა"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"სისტემის ენის გამოყენება"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"ენა არჩეული არ არის"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"ენის შესაფერი ხმის დაყენება"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"მოუსმინეთ მაგალითს"</string>
@@ -1821,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC მისამართი"</string>
     <string name="enter_password" msgid="4131758584074246224">"საცავის გასაშიფრად აკრიფეთ პაროლი"</string>
+    <string name="enter_pin" msgid="286221169871526876">"შეიყვანეთ თქვენი PIN-კოდი საცავის გასაშიფრად."</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"საცავის გასაშიფრად დახატეთ თქვენი ნიმუში"</string>
     <string name="try_again" msgid="4272075051293936921">"სცადეთ ხელახლა."</string>
     <string name="delete" msgid="4219243412325163003">"წაშლა"</string>
     <string name="misc_files" msgid="6720680815969643497">"სხვადასხვა ფაილი"</string>
@@ -2018,8 +2006,7 @@
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"სანდო სამომხმარებლო მონაცემების შემოწმება"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"მომხმარებლები"</string>
     <string name="user_list_title" msgid="7937158411137563543">"მომხმარებლები და პროფილები"</string>
-    <!-- no translation found for user_add_user_or_profile_menu (6923838875175259418) -->
-    <skip />
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"მომხმარებლის ან პროფილის დამატება"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"მომხმარებლის დამატება"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"შეზღუდული პროფილი"</string>
     <string name="user_summary_managed_profile" msgid="5729429961989469287">"მართული პროფილი"</string>
@@ -2074,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"შრიფტის ზომის შეცვლა"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"შეხებით გადახდა"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"გადაიხადეთ მხოლოდ შეხებით"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"მოქმედი აპისთვის პრიორიტეტის მინიჭება"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"შეიტყვეთ მეტი"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"აპების ძიება"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"დაყენდეს, როგორც უპირატესი?"</string>
@@ -2127,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"ბოლო ძიებები"</string>
     <string name="search_results_label" msgid="4163304782363526148">"შედეგები"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi ქსელის კავშირი"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"დაბლოკილი მოწყობილობისას"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"შეტყობინების სენსიტიური კონტენტის დამალვა"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"შეტყობინების ყველა კონტენტის ჩვენება"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"არ შემაწუხოთ"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"არ შემაწუხოთ"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"შეტყობინებები"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"მორგებები"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"აპის შეტყობინებები"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WiFi NFC თეგის დაყენება"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"ჩაწერა"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"შეეხეთ თეგს დასაწერად..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"პაროლი არასწორია, სცადეთ ისევ."</string>
@@ -2144,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC თეგზე მონაცემების ჩაწერა ვერ ხერხდება. თუ პრობლემა გამეორდება, სცადეთ სხვა თეგი"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC თეგი ჩაწერადი არ არის. გთხოვთ, გამოიყენოთ სხვა თეგი."</string>
     <string name="default_sound" msgid="8821684447333687810">"ნაგულისხმევი ხმა"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"აპები იტვირთება..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"ხმები და შეტყობინებები"</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="zen_mode_settings_title" msgid="2689740350895257590">"არ შემაწუხოთ"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"ზარების და შეტყობინებების შემოსვლისას"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"ზარი"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"ვიბრაცია ზარის ნაცვლად"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"ზარის ან ვიბრაციის გარეშე"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"ტელეფონის ზარი"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"შეტყობინებების ნაგულისხმევი ზარის მელოდია"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"დარეკვის დროს ვიბრაცია"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"შეტყობინებების ჩვენება"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"მოვლენების ინდიკატორი"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"დაბლოკილი მოწყობილობისას"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"შეტყობინების ყველა კონტენტის ჩვენება"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"შეტყობინების სენსიტიური კონტენტის დამალვა"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"არ მაჩვენო არანაირი შეტყობინება"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"როცა ჩართულია „არ შემაწუხოთ“"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"ახალი შეტყობინებების დამალვა სიიდან"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"ყველა შეტყობინების ჩვენება სიაში"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"აპის შეტყობინებები"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"შეხების ხმები"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"ციფერბლატის ტონური რეჟიმი"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"ეკრანის დაბლოკვა და განბლოკვა"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"სხვა შეხების ხმები"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"შეხებისას ვიბრაცია"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"შეტყობინებებზე წვდომა"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"აპები ვერ კითხულობს შეტყობინებებს"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"შეტყობინებების წაკითხვა შეუძლია %d აპლიკაციას"</item>
+    <item quantity="other" msgid="980049191810249052">"%d აპს შეუძლია შეტყობინებების წაკითხვა"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"არცერთი შეტყობინებების მსმენელი არ არის დაინსტალირებული."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ჩავრთოთ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> შეძლებს სისტემური ან ნებისმიერი დაყენებული აპლიკაციის შეტყობინებების წაკითხვას, რომლებიც შეიძლება შეიცავდნენ პერსონალურ ინფორმაციას, მაგ.: კონტაქტების სახელებს ან თქვენთვის გამოგზავნილ ტექსტურ შეტყობინებებს. მას ასევე შეეძლება შეტყობინებების დახურვა და მათში არსებული ღილაკების დაჭერა."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"პირობების პროვაიდერები"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"პირობებს არცერთი აპი არ გაწვდით"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d აპი გაწვდით პირობებს"</item>
+    <item quantity="other" msgid="358057362115673258">"%d აპი გაწვდით პირობებს"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"პირობების პროვაიდერები ინსტალირებული არ არის."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ჩაირთოს <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> შეძლებს გასვლის პირობები დაამატოს „არ შემაწუხოთ“ რეჟიმს."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"აპები იტვირთება..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"შეტყობინებების ჩვენება"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"მაღალი პრიორიტეტი"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"პრიორიტეტულად ჩვენება"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"სენსიტიური კონტენტის დამალვა, როცა ტელეფონი დაბლოკილია"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"დაბლოკილი"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"პრიორიტეტული"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"სენსიტიური"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"დასრულება"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"გამორთული"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"ჩართული"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"სანამ ამას გამორთავდეთ"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"ყველა წყვეტის გამორთვა, გარდა:"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"ღამით"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"სხვა ავტომატიზაცია"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ავტომატურად ჩაირთოს"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"არასოდეს"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"სატელეფონო ზარები"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"შეტყობინებები"</string>
@@ -2172,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"დაწყების დრო"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"დასრულების დრო"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> შემდეგი დღე"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"აპის შეტყობინებები"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"შეტყობინების პარამეტრები"</string>
     <string name="device_feedback" msgid="3238056036766293294">"გამოხმაურება ამ მოწყობილობის შესახებ"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 1ba098f..c5d2ab8 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ឥឡូវ​អ្នក​ក្លាយ​ជា​អ្នក​អភិវឌ្ឍ​ហើយ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"មិន​ចាំបាច់​ទេ អ្នក​ជា​អ្នក​អភិវឌ្ឍ​រួច​ហើយ។"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"បណ្ដាញ &amp; ឥតខ្សែ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ឧបករណ៍"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ផ្ទាល់ខ្លួន"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"ប្រព័ន្ធ"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"បើក​វិទ្យុ"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"បិទ​វិទ្យុ"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"បើក​សារ SMS លើ IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ការ​ដាក់​លេខ​កូដ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ដាក់​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ដាក់​លេខ​កូដ​ទូរស័ព្ទ"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក​រាល់​ពេល​​បើក​"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ទាមទារ​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​រាល់​ពេល​​បើក​"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"បាន​ដាក់លេខ​កូដ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"អ្នក​អាច​ដាក់​លេខ​កូដ​គណនី ការ​កំណត់ កម្មវិធី និង​ទិន្នន័យ​បាន​ទាញ​យក មេឌៀ ​និង​​ឯកសារ​ផ្សេងៗ​របស់​អ្នក។ ពេល​អ្នក​ដាក់​លេខ​កូដ​​កុំព្យូទ័រ​បន្ទះ​​របស់​អ្នក អ្នក​ត្រូវ​តែ​បញ្ចូល​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់​ដើម្បី​ដោះ​លេខ​កូដ​របស់​អ្នក​​រាល់​ពេល​ចាប់ផ្ដើម​៖​ អ្នក​មិន​អាច​ដោះ​លេខ​កូដ​កុំព្យូទ័រ​បន្ទះ​​​របស់​អ្នក​បាន​​ទេ លើកលែង​តែ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​​ដាក់លេខ​កូដ​ចំណាយ​ពេល​​មួយ​ម៉ោង។ អ្នក​ត្រូវ​បញ្ចូល​ថ្ម​ និង​ដោត​ជាប់​រហូត​ដល់​ពេល​ការ​ដាក់​លេខ​កូដ​បាន​បញ្ចប់។ បើ​អ្នក​ផ្អាក​ដំណើរការ​ដាក់​លេខ​កូដ​ អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​មួយ​ចំនួន ឬ​ទាំង​អស់​របស់​អ្នក។"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"អ្នក​អាច​ដាក់​លេខ​កូដ​​គណនី ការ​កំណត់ កម្មវិធី និង​ទិន្នន័យ​បាន​ទាញ​យក មេឌៀ និង​​ឯកសារ​ផ្សេងៗ​របស់​អ្នក។ ពេល​អ្នក​ដាក់​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក អ្នក​ត្រូវ​តែ​បញ្ចូល​កូដ PIN ជា​លេខ ឬ​ពាក្យ​សម្ងាត់​ដើម្បី​ដោះ​លេខ​កូដ​របស់​អ្នក​​រាល់​ពេល​ចាប់ផ្ដើម​៖ អ្នក​មិន​អាច​ដោះ​លេខ​កូដ​ទូរស័ព្ទ​របស់​អ្នក​បាន​​ទេ លើកលែង​តែ​អនុវត្ត​ការ​កំណត់​ទិន្នន័យ​ដូច​ចេញ​ពី​រោងចក្រ ដោយ​លុប​ទិន្នន័យ​របស់​អ្នក​ទាំងអស់។\n\nការ​​ដាក់លេខ​កូដ​ចំណាយ​ពេល​​មួយ​ម៉ោង។ អ្នក​ត្រូវ​បញ្ចូល​ថ្ម​ និង​ដោត​ជាប់​រហូត​ដល់​ពេល​ការ​ដាក់​លេខ​កូដ​បាន​បញ្ចប់។ បើ​អ្នក​ផ្អាក​ដំណើរការ​ដាក់​លេខ​កូដ​ អ្នក​នឹង​បាត់បង់​ទិន្នន័យ​មួយ​ចំនួន ឬ​ទាំង​អស់​របស់​អ្នក។"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"មើល ឬ​ធ្វើ​​ឲ្យ​​អ្នក​គ្រប់គ្រង​ឧបករណ៍​អសកម្ម"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ភ្នាក់ងារ​ដែល​​​​ទុកចិត្ត"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"មើល ឬ​ធ្វើ​ឲ្យ​ភ្នាក់ងារ​ដែល​​​ទុកចិត្ត​អសកម្ម"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"ចូល​ដំណើរការ​ការ​ជូន​ដំណឹង"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"កម្មវិធី​មិន​អាច​អាន​ការ​ជូន​ដំណឹង"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"កម្មវិធី %d អាច​អាន​ការ​ជូន​ដំណឹង"</item>
-    <item quantity="other" msgid="980049191810249052">"កម្មវិធី %d អាច​អាន​ការ​ជូន​ដំណឹង"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"គ្មាន​កម្មវិធី​ស្ដាប់ការ​ជូន​ដំណឹង​បាន​ដំឡើង។"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"បើក <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> នឹង​អាច​អាន​ការ​ជូន​ដំណឹង​ទាំងអស់​ដែល​បាន​ប្រកាស​ដោយ​ប្រព័ន្ធ ឬ​កម្មវិធី​បាន​ដំឡើង ដែល​អាច​មាន​ព័ត៌មាន​ផ្ទាល់​ខ្លួន​ដូច​ជា ឈ្មោះ​ទំនាក់ទំនង និង​អត្ថបទ​សារ​បាន​ផ្ញើ​ឲ្យ​អ្នក។ វា​ក៏​អាច​បដិសេធ​ការ​ជូន​ដំណឹង​ទាំង​នេះ​ ឬ​ប៉ះ​ប៊ូតុង​សកម្មភាព​​។"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"គ្មាន​កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</item>
-    <item quantity="other" msgid="358057362115673258">"%d កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"មិន​បាន​ដំឡើង​​កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ។"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"បើក <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> នឹង​អាច​បន្ថែម​លក្ខខណ្ឌ​ចេញ​ទៅកាន់​របៀប​កុំ​រំខាន។"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"ប៊្លូធូស"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"បើក​ប៊្លូធូស"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"ប៊្លូធូស"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"តភ្ជាប់បណ្ដាញ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ភ្លេច​បណ្ដាញ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"កែ​បណ្ដាញ"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"ដើម្បី​មើល​បណ្ដាញ​ដែល​មាន​ បើក​វ៉ាយហ្វាយ។"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"កំពុង​ស្វែងរក​បណ្ដាញ​វ៉ាយហ្វាយ…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"អ្នក​មិន​មាន​សិទ្ធិ​ដើម្បី​ប្ដូរ​បណ្ដាញ​វ៉ាយហ្វាយ​ទេ។"</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (មាន WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"មាន​សុវត្ថិភាព​ជា​មួយ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", មាន​សុវត្ថិភាព​ជា​មួយ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"បញ្ចូល​ពាក្យសម្ងាត់​បណ្ដាញ​របស់​អ្នក។"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"គ្មាន"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ដើម្បី​បង្កើន​ភាព​ត្រឹមត្រូវ​ទីតាំង និង​សម្រាប់​គោល​បំណង​ផ្សេងៗ <xliff:g id="APP_NAME">%1$s</xliff:g> ចង់​បើក​ការ​វិភាគ រក​បណ្ដាញ ទោះ​បី​ជា​បិទ វ៉ាយហ្វាយ ក៏​ដោយ។\n\nអនុញ្ញាត​សម្រាប់​កម្មវិធី​ទាំងអស់​ដែល​អ្នក​ចង់​វិភាគ​រក?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"អនុញ្ញាត"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"ដើម"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"បង្ហាញ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"សំឡេង"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"សំឡេង​រោទ៍​ទូរស័ព្ទ"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"កម្រិត​សំឡេង"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"បែប​ផែន​តន្ត្រី"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"កម្រិត​សំឡេង​កម្មវិធី​រោទ៍"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ញ័រ​ពេល​ស្ងាត់"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"សំឡេង​ជូន​ដំណឹង​លំនាំដើម"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"ពន្លឺ​ជូន​ដំណឹង​ភ្លឺបភ្លែត"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"លេចឡើង​ ​បើ​អាទិភាព​ខ្ពស់"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"សំឡេង​រោទ៍"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ការ​ជូន​ដំណឹង"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"បិទ​សំឡេង​​តន្ត្រី &amp; មេឌៀ​ផ្សេង"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"បិទ​សំឡេង​​ការ​ជូន​ដំណឹង"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"ធ្វើ​ឲ្យ​សំឡេង​រោទ៍​ស្ងាត់"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"ញ័រ​ពេល​រោទ៍"</string>
     <string name="dock_settings" msgid="1820107306693002541">"ភ្ជាប់"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"កំណត់​ការ​ភ្ជាប់"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"សំឡេង"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"ពន្លឺ"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"កែ​ពន្លឺ​អេក្រង់"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"ដេក"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"ការ​កែ​កំហុស​តាម​យូអេសប៊ី"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"របៀប​កែ​កំហុស ពេល​ភ្ជាប់​យូអេសប៊ី"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"ដក​សិទ្ធិ​កែ​កំហុស​យូអេសប៊ី"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"របាយការណ៍​កំហុស​ម៉ឺនុយ​ថាមពល"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"រួមមាន​ជម្រើស​ក្នុង​ម៉ឺនុយ​ថាមពល​សម្រាប់​​យក​របាយការណ៍​កំហុស"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"កុំ​បិទ​អេក្រង់"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"អេក្រង់​នឹង​មិន​ដេក​ពេល​បញ្ចូល​ថ្ម"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"បើក​កំណត់​ហេតុ HCI snoop ប៊្លូធូស"</string>
@@ -1820,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"អាសយដ្ឋាន 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"បញ្ចូល​ពាក្យ​សម្ងាត់ ដើម្បី​ដោះ​លេខ​កូដ​ឧបករណ៍​ផ្ទុក"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"ព្យាយាម​ម្ដង​ទៀត។"</string>
     <string name="delete" msgid="4219243412325163003">"លុប"</string>
     <string name="misc_files" msgid="6720680815969643497">"ឯកសារ​ផ្សេងៗ"</string>
@@ -2072,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"ប្ដូរ​ទំហំ​ពុម្ពអក្សរ"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ប៉ះ &amp; បង់​ប្រាក់"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"បង់​​ប្រាក់​ដោយ​​គ្រាន់​តែ​​ប៉ះ"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"កម្មវិធី​ផ្ទៃ​ខាង​មុខ​ដែល​ពេញចិត្ត"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"ស្វែងយល់​បន្ថែម"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"រក​កម្មវិធី"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"កំណត់​ជា​ចំណូលចិត្ត​របស់​អ្នក?"</string>
@@ -2125,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"ការ​ស្វែងរក​ថ្មីៗ"</string>
     <string name="search_results_label" msgid="4163304782363526148">"លទ្ធផល"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ការ​ភ្ជាប់​បណ្ដាញ​វ៉ាយហ្វាយ"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"នៅ​ពេល​​បាន​ចាក់សោ​ឧបករណ៍"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"លាក់​មាតិកា​ជូនដំណឹង​​មិន​សមរម្យ"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញ​មាតិកា​ជូនដំណឹង​ទាំងអស់"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"កុំ​រំខាន"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"កុំ​រំខាន"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"ការ​ជូនដំណឹង"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"កែប្រែ"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ការជូន​ដំណឹងកម្មវិធី"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"រៀប​ចំ​ស្លាក​អិនអេហ្វស៊ី​វ៉ាយហ្វាយ"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"សរសេរ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"ប៉ះ​ស្លាក​ដើម្បី​សរសេរ..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"ពាក្យ​សម្ងាត់​មិន​ត្រឹមត្រូវ ព្យាយាម​ម្ដងទៀត។"</string>
@@ -2142,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"មិន​អាច​សរសេរ​ទិន្នន័យ​ទៅ​ស្លាក​អិនអេហ្វស៊ី។ បើ​នៅតែ​មាន​បញ្ហា​ សាកល្បង​​ស្លាក​ផ្សេង"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"ស្លាក​អិនអេហ្វ​ស៊ី​មិន​អាច​សរសេរ​បាន។ សូម​ប្រើ​ស្លាក​ផ្សេង។"</string>
     <string name="default_sound" msgid="8821684447333687810">"សំឡេង​លំនាំ​ដើម"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"កុំ​រំខាន"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"សំឡេង​រោទ៍​ទូរស័ព្ទ"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"ញ័រ​ពេល​រោទ៍"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"ពន្លឺ​ជូន​ដំណឹង​ភ្លឺបភ្លែត"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញ​មាតិកា​ជូនដំណឹង​ទាំងអស់"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"លាក់​មាតិកា​ជូនដំណឹង​​មិន​សមរម្យ"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"ការ​ជូន​ដំណឹង​កម្មវិធី"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"កម្មវិធី​មិន​អាច​អាន​ការ​ជូន​ដំណឹង"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"កម្មវិធី %d អាច​អាន​ការ​ជូន​ដំណឹង"</item>
+    <item quantity="other" msgid="980049191810249052">"កម្មវិធី %d អាច​អាន​ការ​ជូន​ដំណឹង"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"គ្មាន​កម្មវិធី​ស្ដាប់ការ​ជូន​ដំណឹង​បាន​ដំឡើង។"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"បើក <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> នឹង​អាច​អាន​ការ​ជូន​ដំណឹង​ទាំងអស់​ដែល​បាន​ប្រកាស​ដោយ​ប្រព័ន្ធ ឬ​កម្មវិធី​បាន​ដំឡើង ដែល​អាច​មាន​ព័ត៌មាន​ផ្ទាល់​ខ្លួន​ដូច​ជា ឈ្មោះ​ទំនាក់ទំនង និង​អត្ថបទ​សារ​បាន​ផ្ញើ​ឲ្យ​អ្នក។ វា​ក៏​អាច​បដិសេធ​ការ​ជូន​ដំណឹង​ទាំង​នេះ​ ឬ​ប៉ះ​ប៊ូតុង​សកម្មភាព​​។"</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"គ្មាន​កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</item>
+    <item quantity="other" msgid="358057362115673258">"%d កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"មិន​បាន​ដំឡើង​​កម្មវិធី​ផ្ដល់​លក្ខខណ្ឌ។"</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"បើក <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> នឹង​អាច​បន្ថែម​លក្ខខណ្ឌ​ចេញ​ទៅកាន់​របៀប​កុំ​រំខាន។"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"កំពុង​ផ្ទុក​កម្មវិធី..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"បង្ហាញ​ការ​ជូនដំណឹង"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"អាទិភាព​ខ្ពស់"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"រួចរាល់"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"បិទ"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"បើក"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"រហូត​ដល់ពេល​​អ្នក​បិទ​វា"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"ទប់ស្កាត់​ការ​រំខាន​ទាំង​អស់​ លើក​លែង​តែ"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"នៅ​ពេល​យប់"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"ស្វ័យប្រវត្តិកម្ម​ផ្សេង​ទៀត"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"បើក​ដោយ​ស្វ័យ​ប្រវត្តិ"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"កុំ"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"ហៅ​ទូរស័ព្ទ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"សារ"</string>
@@ -2170,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ម៉ោង​ចាប់ផ្ដើម"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ម៉ោង​បញ្ចប់"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ថ្ងៃ​បន្ទាប់"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ការជូន​ដំណឹងកម្មវិធី"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"​កំណត់​ការ​ជូនដំណឹង"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ផ្ញើ​មតិ​ត្រឡប់​អំពី​ឧបករណ៍​នេះ"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 1c7fb35..cf16ee3 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"개발자가 되셨습니다."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"이미 개발자입니다."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"무선 및 네트워크"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"기기"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"개인 설정"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"시스템"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"무선 켜기"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"무선 끄기"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"IMS로 SMS 켜기"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"태블릿 암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"휴대전화 암호화"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"태블릿의 전원을 켤 때마다 암호 해독을 위해 숫자 PIN 또는 비밀번호 입력"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"휴대전화의 전원을 켤 때마다 암호 해독을 위해 숫자 PIN 또는 비밀번호 입력"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"암호화됨"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 태블릿 암호화를 해제할 수 있습니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"계정, 설정, 다운로드된 애플리케이션과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하면 전원을 켤 때마다 숫자 PIN 또는 비밀번호를 입력하여 암호를 해제해야 합니다. 초기화하여 모든 데이터를 삭제해야만 휴대전화 암호화를 해제할 수 있습니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리로 암호화를 시작하고 완료될 때까지 휴대전화의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"기기 관리자 보기 또는 비활성화"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust Agent"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Trust Agent 조회 또는 비활성화"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"알림 액세스"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"앱에서 알림을 읽을 수 없습니다."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d개의 앱이 알림을 읽을 수 있습니다."</item>
-    <item quantity="other" msgid="980049191810249052">"%d개의 앱이 알림을 읽을 수 있습니다."</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"알림 수신기가 설치되지 않았습니다."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>이(가) 시스템 또는 설치된 앱이 게시하는 모든 알림(연락처 이름 및 수신된 이메일 텍스트와 같은 개인정보가 포함될 수 있음)을 읽을 수 있습니다. 또한 이러한 알림을 닫거나 알림 내에 있는 작업 버튼을 터치할 수도 있습니다."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"조건 제공자"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"조건을 제공하는 앱이 없음"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d개의 앱이 조건을 제공"</item>
-    <item quantity="other" msgid="358057362115673258">"%d개의 앱이 조건을 제공"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"조건 제공자가 설치되지 않았습니다."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하도록 설정하시겠습니까?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>은(는) 알림 일시중지 모드에 종료 조건을 추가할 수 있습니다."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"블루투스"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"블루투스 켜기"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"블루투스"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"네트워크 연결"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"네트워크 저장 안함"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"네트워크 수정"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"Wi‑Fi 네트워크를 변경할 권한이 없습니다."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS 사용 가능)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>(으)로 보안"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"네트워크 비밀번호를 입력하세요."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"없음"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"위치 정확성 개선 등의 목적으로 <xliff:g id="APP_NAME">%1$s</xliff:g>에서 Wi-Fi가 꺼져 있을 때에도 네트워크 검색을 사용하도록 설정하려 합니다.\n\n검색하려는 모든 앱에 대해 이를 허용하시겠습니까?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"허용"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"홈"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"디스플레이"</string>
     <string name="sound_settings" msgid="5534671337768745343">"소리"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"볼륨"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"음악 효과"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"모드 설정"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"무음 시 진동"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"기본 알림 소리"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"알림등 반복 표시"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"높은 우선순위인 경우 표시"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"벨소리"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"알림"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"음악 및 기타 미디어 음소거"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"알림 음소거"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"알람 음소거"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"전화 수신 시 진동"</string>
     <string name="dock_settings" msgid="1820107306693002541">"도킹"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"도크 설정"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"오디오"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"밝기"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"화면 밝기 조정"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"절전 모드"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB 디버깅"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB가 연결된 경우 디버그 모드 사용"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"USB 디버깅 권한 승인 취소"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"전원 메뉴 버그 신고"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"전원 메뉴에 버그 신고 옵션 포함"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"화면 켜짐 상태 유지"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"충전하는 동안 화면이 꺼지지 않음"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"블루투스 HCI 스누프 로그 사용"</string>
@@ -1441,7 +1434,7 @@
     <string name="captioning_edge_color" msgid="3670094753735263238">"가장자리 색상"</string>
     <string name="captioning_edge_type" msgid="5997247394951682154">"가장자리 유형"</string>
     <string name="captioning_typeface" msgid="1826169240566563259">"글꼴 모음"</string>
-    <string name="captioning_preview_text" msgid="4067935959797375065">"캡션이 다음과 같이 표시됩니다."</string>
+    <string name="captioning_preview_text" msgid="4067935959797375065">"자막이 다음과 같이 표시됩니다."</string>
     <string name="captioning_preview_characters" msgid="7105909138497851769">"Aa"</string>
     <string name="locale_default" msgid="2593883646136326969">"기본값"</string>
     <string name="color_none" msgid="3475640044925814795">"없음"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"피치"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"발음된 텍스트의 톤에 적용"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"언어"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"시스템 언어 사용"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"언어가 선택되지 않음"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"발음된 텍스트에 대해 언어별로 음성 설정"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"예제 듣기"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 주소"</string>
     <string name="enter_password" msgid="4131758584074246224">"저장소 암호를 해독하려면 비밀번호를 입력하세요."</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"다시 시도해 보세요."</string>
     <string name="delete" msgid="4219243412325163003">"삭제"</string>
     <string name="misc_files" msgid="6720680815969643497">"기타 파일"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"글꼴 크기 변경"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"탭앤페이"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"탭 한 번으로 결제하세요."</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"포그라운드 앱 선호"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"자세히 알아보기"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"앱 검색"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"기본으로 설정하시겠습니까?"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"최근 검색어"</string>
     <string name="search_results_label" msgid="4163304782363526148">"검색결과"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi 네트워크 연결"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"기기가 잠겼을 때"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"민감한 알림 내용 숨기기"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"모든 알림 내용 표시"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"알림 일시중지"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"알림 일시중지"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"알림"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"변경"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"앱 알림"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi NFC 태그 설정"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"쓰기"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"태그를 탭하여 작성하세요..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"비밀번호가 잘못되었습니다. 다시 시도해 주세요."</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC 태그에 데이터를 작성할 수 없습니다. 문제가 지속되는 경우 다른 태그를 사용해보세요."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC 태그를 작성할 수 없습니다. 다른 태그를 사용하세요."</string>
     <string name="default_sound" msgid="8821684447333687810">"기본 사운드"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"알림 일시중지"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"전화 벨소리"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"전화 수신 시 진동"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"알림등 반복 표시"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"모든 알림 내용 표시"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"민감한 알림 내용 숨기기"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"앱 알림"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"앱에서 알림을 읽을 수 없습니다."</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d개의 앱이 알림을 읽을 수 있습니다."</item>
+    <item quantity="other" msgid="980049191810249052">"%d개의 앱이 알림을 읽을 수 있습니다."</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"알림 수신기가 설치되지 않았습니다."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>이(가) 시스템 또는 설치된 앱이 게시하는 모든 알림(연락처 이름 및 수신된 이메일 텍스트와 같은 개인정보가 포함될 수 있음)을 읽을 수 있습니다. 또한 이러한 알림을 닫거나 알림 내에 있는 작업 버튼을 터치할 수도 있습니다."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"조건 제공자"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"조건을 제공하는 앱이 없음"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d개의 앱이 조건을 제공"</item>
+    <item quantity="other" msgid="358057362115673258">"%d개의 앱이 조건을 제공"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"조건 제공자가 설치되지 않았습니다."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>을(를) 사용하도록 설정하시겠습니까?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>은(는) 알림 일시중지 모드에 종료 조건을 추가할 수 있습니다."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"앱 로드 중..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"알림 표시"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"높은 우선순위"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"완료"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"사용 안함"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"사용"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"이 기능을 사용 중지할 때까지"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"다음을 제외한 모든 방해요소 차단:"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"밤에"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"기타 자동화"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"자동 사용 설정"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"사용 안함"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"전화 통화"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"메시지"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"시작 시간"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"종료 시간"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"다음 날 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"앱 알림"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"알림 설정"</string>
     <string name="device_feedback" msgid="3238056036766293294">"이 기기에 대한 의견 보내기"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index a8b1db2..faacb96 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ຕອນນີ້ທ່ານເປັນນັກພັດທະນາແລ້ວ!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ບໍ່ຈຳເປັນ, ທ່ານເປັນນັກພັດທະນາຢູ່ແລ້ວ."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"ລະບົບໄຮ້ສາຍ &amp; ເຄືອຂ່າຍ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ອຸປະກອນ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ສ່ວນຕົວ"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"ລະ​ບົບ"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"ລະ​ບົບ​ໄຮ້​ສາຍ &amp; ເຄືອ​ຂ່າຍ"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"ອຸປະກອນ"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"​ສ່ວນ​ໂຕ"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"ລະບົບ"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"ເປີດ​ວິ​ທະ​ຍຸ"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"ປິດວິທະຍຸ"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"ເປີດໃຊ້ SMS ຜ່ານ​ IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"ການເຂົ້າລະຫັດ"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ເຂົ້າລະຫັດແທັບເລັດ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ເຂົ້າລະຫັດໂທລະສັບ"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"ຕ້ອງໃຊ້ລະຫັດ PIN ເປັນໂຕເລກ ຫຼືລະຫັດຜ່ານເພື່ອຖອດລະຫັດແທັບເລັດຂອງທ່ານ ທຸກຄັ້ງທີ່ທ່ານເປີດມັນ."</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"ຕ້ອງໃຊ້ລະຫັດ PIN ເປັນໂຕເລກ ຫຼືລະຫັດຜ່ານເພື່ອຖອດລະຫັດໂທລະສັບຂອງທ່ານ ທຸກຄັ້ງທີ່ທ່ານເປີດມັນ."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ເຂົ້າລະຫັດແລ້ວ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"ທ່ານສາມາດເຂົ້າລະຫັດບັນຊີ, ການຕັ້ງຄ່າ, ແອັບຯທີ່ດາວໂຫລດມາ ຮວມເຖິງຂໍ້ມູນຂອງພວກມັນ, ສື່ ແລະໄຟລ໌ອື່ນໆຂອງທ່ານໄດ້. ຫຼັງຈາກທ່ານເຂົ້າລະຫັດແທັບເລັດຂອງທ່ານແລ້ວ, ທ່ານຈະຕ້ອງລະບຸລະຫັດ PIN ເປັນໂຕເລກ ຫຼືລະຫັດຜ່ານ ເພື່ອຖອດລະຫັດມັນທຸກຄັ້ງທີ່ທ່ານເປີດເຄື່ອງ: ທ່ານຈະບໍ່ສາມາດຍົກເລີກການເຂົ້າລະຫັດແທັບເລັດຂອງທ່ານໄດ້ ເວັ້ນເສຍແຕ່ວ່າທ່ານຈະຣີເຊັດໃຫ້ແທັບເລັດ ກາຍເປັນຄ່າຈາກໂຮງງານ ເຊິ່ງຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຂອງທ່ານນຳ.\n\nການເຂົ້າລະຫັດອາດໃຊ້ເວລານຶ່ງຊົ່ວໂມງ ຫຼືຫຼາຍກວ່ານັ້ນ. ທ່ານຕ້ອງສາກແບັດເຕີຣີໃຫ້ເຕັມກ່ອນ ແລະສຽບສາຍສາກໄວ້ຕະຫຼອດເວລາ ຈົນກວ່າການເຂົ້າລະຫັດຈະສຳເລັດ. ຫາກທ່ານລົບກວນຂັ້ນຕອນການເຂົ້າລະຫັດ, ທ່ານຈະສູນເສຍຂໍ້ມູນບາງຢ່າງ ຫຼືທັງໝົດຂອງທ່ານ."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"ທ່ານສາມາດເຂົ້າລະຫັດບັນຊີ, ການຕັ້ງຄ່າ, ແອັບຯທີ່ດາວໂຫລດມາ ຮວມເຖິງຂໍ້ມູນຂອງພວກມັນ, ສື່ ແລະໄຟລ໌ອື່ນໆຂອງທ່ານໄດ້. ຫຼັງຈາກທ່ານເຂົ້າລະຫັດໂທລະສັບຂອງທ່ານແລ້ວ, ທ່ານຈະຕ້ອງລະບຸລະຫັດ PIN ເປັນໂຕເລກ ຫຼືລະຫັດຜ່ານ ເພື່ອຖອດລະຫັດມັນທຸກຄັ້ງທີ່ທ່ານເປີດເຄື່ອງ: ທ່ານຈະບໍ່ສາມາດຍົກເລີກການເຂົ້າລະຫັດໂທລະສັບຂອງທ່ານໄດ້ ເວັ້ນເສຍແຕ່ວ່າທ່ານຈະຣີເຊັດໃຫ້ໂທລະສັບ ກາຍເປັນຄ່າຈາກໂຮງງານ ເຊິ່ງຈະເປັນການລຶບຂໍ້ມູນທັງໝົດຂອງທ່ານນຳ.\n\nການເຂົ້າລະຫັດອາດໃຊ້ເວລານຶ່ງຊົ່ວໂມງ ຫຼືຫຼາຍກວ່ານັ້ນ. ທ່ານຕ້ອງສາກແບັດເຕີຣີໃຫ້ເຕັມກ່ອນ ແລະສຽບສາຍສາກໄວ້ຕະຫຼອດເວລາ ຈົນກວ່າການເຂົ້າລະຫັດຈະສຳເລັດ. ຫາກທ່ານລົບກວນຂັ້ນຕອນການເຂົ້າລະຫັດ, ທ່ານຈະສູນເສຍຂໍ້ມູນບາງຢ່າງ ຫຼືທັງໝົດຂອງທ່ານ."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"ທ່ານ​ສາ​ມາດ​ເຂົ້າ​ລະ​ຫັດ​ບັນ​ຊີ, ການ​ຕັ້ງ​ຄ່າ, ແອັບຯ​ທີ່​ດາວ​ໂຫລດ​ມາ​ແລ້ວ​ແລະ​ຂໍ້​ມູນ​ຂອ​ງມັນ, ໄຟລ໌​ມີ​ເດຍ ແລະ​ໄຟລ໌​ອື່ນໆ ຂອງ​ທ່ານ​ໄດ້. ຫຼັງ​ຈາກ​ທີ່​ທ່ານ​ເຂົ້າ​ລະ​ຫັດ​ແທັບ​ເລັດ​ຂອງ​ທ່ານ​ແລ້ວ, ສົມ​ມຸດ​ວ່າ​ທ່ານ​ຕັ້ງ​ຄ່າ​ໜ້າ​ຈໍ​ລັອກ​ໄວ້ (ເຊັ່ນ​: ຮູບ​ແບບ​ລັອກ ຫຼື​ລະ​ຫັດ PIN ຫຼື​ລະ​ຫັດ​ປົກ​ກະ​ຕິ) ທ່ານ​ຈະ​ຕ້ອງ​ປົດ​ລັອກ​ໜ້າ​ຈໍ​ກ່ອນ​ເພື່ອ​ຖອດ​ລະ​ຫັດ​​ແທັບ​ເລັດທຸກ​ເທື່ອ​ທີ່​ທ່ານ​ເປີດ​ມັນ. ວິ​ທີ​ດຽວ​ທີ່​ຈະ​ຖອດ​ລະ​ຫັດ​ອອກ​ຖາ​ວອນແມ່ນ​ການ​ຣີ​ເຊັດ​ຂໍ້​ມູນ​ໃຫ້​ກັບ​ໄປ​ເປັນ​ຄ່າ​ຈາກ​ໂຮງ​ງານ ເຊິ່ງ​ຈະ​ເປັນ​ການ​ລຶບ​ຂໍ້​ມູນ​ທັງ​ໝົດ​ຂອງ​ທ່ານ​ອອກ.\n\nການ​ເຂົ້າ​ລະ​ຫັດ​ຈະ​ໃຊ້​ເວ​ລາ​ເປັນ​ຊົ່ວ​ໂມງ ຫຼືຫຼາຍກວ່າ​ນັ້ນ. ທ່ານ​ຕ້ອງ​ສາກ​ແບັດ​ເຕີ​ຣີ່ໃຫ້​ເຕັມກ່ອນ ແລະ​ສຽບ​ສາຍ​ສາກ​ໄວ້​ຕະຫຼອດ​​ຂັ້ນ​ຕອນ​ການ​ເຂົ້າ​ລະ​ຫັດ. ​ຫາກ​ມີ​ເຫດ​ຂັດ​ຂ້ອງ​ລະ​ຫວ່າງ​ການ​ເຂົ້າ​ລະ​ຫັດ, ທ່ານ​ອ​າດຈະ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ບາງ​ສ່ວນ ຫຼື​ທັງ​ໝົດ​ຂອງ​ທ່ານ​ໄດ້."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"ທ່ານ​ສາ​ມາດ​ເຂົ້າ​ລະ​ຫັດ​ບັນ​ຊີ, ການ​ຕັ້ງ​ຄ່າ, ແອັບຯ​ທີ່​ດາວ​ໂຫລດ​ມາ​ແລ້ວ​ແລະ​ຂໍ້​ມູນ​ຂອ​ງມັນ, ໄຟລ໌​ມີ​ເດຍ ແລະ​ໄຟລ໌​ອື່ນໆ ຂອງ​ທ່ານ​ໄດ້. ຫຼັງ​ຈາກ​ທີ່​ທ່ານ​ເຂົ້າ​ລະ​ຫັດ​ໂທ​ລະ​ສັບ​ຂອງ​ທ່ານ​ແລ້ວ, ສົມ​ມຸດ​ວ່າ​ທ່ານ​ຕັ້ງ​ຄ່າ​ໜ້າ​ຈໍ​ລັອກ​ໄວ້ (ເຊັ່ນ​: ຮູບ​ແບບ​ລັອກ ຫຼື​ລະ​ຫັດ PIN ຫຼື​ລະ​ຫັດ​ປົກ​ກະ​ຕິ) ທ່ານ​ຈະ​ຕ້ອງ​ປົດ​ລັອກ​ໜ້າ​ຈໍ​ກ່ອນ​ເພື່ອ​ຖອດ​ລະ​ຫັດ​ໂທ​ລະ​ສັບ​ທຸກ​ເທື່ອ​ທີ່​ທ່ານ​ເປີດ​ມັນ. ວິ​ທີ​ດຽວ​ທີ່​ຈະ​ຖອດ​ລະ​ຫັດ​ອອກ​ຖາ​ວອນແມ່ນ​ການ​ຣີ​ເຊັດ​ຂໍ້​ມູນ​ໃຫ້​ກັບ​ໄປ​ເປັນ​ຄ່າ​ຈາກ​ໂຮງ​ງານ ເຊິ່ງ​ຈະ​ເປັນ​ການ​ລຶບ​ຂໍ້​ມູນ​ທັງ​ໝົດ​ຂອງ​ທ່ານ​ອອກ.\n\nການ​ເຂົ້າ​ລະ​ຫັດ​ຈະ​ໃຊ້​ເວ​ລາ​ເປັນ​ຊົ່ວ​ໂມງ ຫຼືຫຼາຍກວ່າ​ນັ້ນ. ທ່ານ​ຕ້ອງ​ສາກ​ແບັດ​ເຕີ​ຣີ່ໃຫ້​ເຕັມກ່ອນ ແລະ​ສຽບ​ສາຍ​ສາກ​ໄວ້​ຕະຫຼອດ​​ຂັ້ນ​ຕອນ​ການ​ເຂົ້າ​ລະ​ຫັດ. ​ຫາກ​ມີ​ເຫດ​ຂັດ​ຂ້ອງ​ລະ​ຫວ່າງ​ການ​ເຂົ້າ​ລະ​ຫັດ, ທ່ານ​ອ​າດຈະ​ສູນ​ເສຍ​ຂໍ້​ມູນ​ບາງ​ສ່ວນ ຫຼື​ທັງ​ໝົດ​ຂອງ​ທ່ານ​ໄດ້."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"ເຂົ້າລະຫັດແທັບເລັດ"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"ເຂົ້າລະຫັດໂທລະສັບ"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"ສາກແບັດເຕີຣີຂອງທ່ານ ແລ້ວລອງອີກຄັ້ງ."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"ເບິ່ງ ຫຼືປິດການນຳໃຊ້ຜູ່ເບິ່ງແຍງລະບົບອຸປະກອນ"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ຕົວ​ແທນ​ທີ່​ເຊື່ອ​ຖື​ໄດ້"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"​ເບິ່ງຫຼື"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"ການເຂົ້າເຖິງການແຈ້ງເຕືອນ"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ແອັບຯບໍ່ສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ແອັບຯສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</item>
-    <item quantity="other" msgid="980049191810249052">"%d ແອັບຯສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"ບໍ່ໄດ້ຕິດຕັ້ງໂຕຟັງການແຈ້ງເຕືອນ."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ເປີດໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ຈະສາມາດອ່ານທຸກການແຈ້ງເຕືອນທີ່ມາຈາກລະບົບ ຫຼືແອັບຯໃດໆກໍຕາມທີ່ມີຕິດຕັ້ງຢູ່ ເຊິ່ງອາດຮວມເຖິງຂໍ້ມູນສ່ວນໂຕ ເຊັ່ນ: ລາຍຊື່ຜູ່ຕິດຕໍ່ ແລະຂໍ້ຄວາມທີ່ສົ່ງຫາທ່ານ. ມັນຍັງສາມາດປິດການແຈ້ງເຕືອນເຫຼົ່ານີ້ ຫຼືແຕະປຸ່ມເຮັດວຽກທີ່ຢູ່ພາຍໃນນັ້ນໄດ້ນຳ."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ຜູ້​ໃຫ້​ບໍລິການ​ເງື່ອນ​ໄຂ"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ບໍ່​ມີ​ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"ບໍ່​ມີ​ຜູ່​ໃຫ້​ບໍລິການ​ເງື່ອນ​ໄຂ​ທີ່​ຕິດ​ຕັ້ງ​ໄວ້."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ເປີດ​ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ຈະ​ສາມາດ​ເພີ່ມ​ເງື່ອນ​ໄຂ​ການ​ອອກ​ຈາກ​ໂໝດ​ຫ້າມ​ລົບ​ກວນ​ໄດ້."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"ເປີດໃຊ້ Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,7 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"ເຊື່ອມຕໍ່ເຄືອຂ່າຍ"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ລືມເຄືອຂ່າຍ"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"ແກ້ໄຂເຄືອຂ່າຍ"</string>
+    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"ຂຽນ​ໃສ່​ແທັກ NFC"</string>
     <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="8280257225419947565">"ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ປ່ຽນເຄືອຂ່າຍ Wi-Fi ໄດ້."</string>
@@ -638,7 +619,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (ສາມາດໃຊ້ WPS ໄດ້)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ຖືກປ້ອງກັນດ້ວຍ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ປ້ອງກັນດ້ວຍ <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"​ກະ​ລຸ​ນາ​ໃສ່​ລະ​ຫັດ​ຜ່ານ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ."</string>
+    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"ໃສ່​ລະຫັດ​ເຄືອ​ຂ່າຍ​ຂອງ​ທ່ານ"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"ບໍ່ໃຊ້"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"ເພື່ອປັບປຸງຄວາມຖືກຕ້ອງຂອງສະຖານທີ່ ແລະເພື່ອຈຸດປະສົງອື່ນໆ, <xliff:g id="APP_NAME">%1$s</xliff:g> ຕ້ອງການເປີດນຳໃຊ້ການສະແກນເຄືອຂ່າຍ ເຖິງແມ່ນວ່າ Wi-Fi ຈະປິດກໍຕາມ.\n\nອະນຸຍາດການດຳເນີນການນີ້ ໃຫ້ກັບທຸກແອັບຯທີ່ຕ້ອງການສະແກນບໍ່?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"ອະ​ນຸ​ຍາດ​"</string>
@@ -702,14 +683,12 @@
     <string name="home_settings" msgid="212375129455718176">"ໜ້າຫຼັກ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"ການສະແດງຜົນ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"ສຽງ"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"ຣິງໂທນໂທລະສັບ"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"ລະດັບສຽງ"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"ເອັບເຟັກດົນຕີ"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"ລະດັບສຽງໂທເຂົ້າ"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"ສັ່ນເຕືອນເມື່ອປິດສຽງ"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"ສຽງແຈ້ງເຕືອນເລີ່ມຕົ້ນ"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"ໄຟກະພິບແຈ້ງເຕືອນ"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"ສະແດງປັອບອັບ​ຖ້າຄວາມ​ສຳຄັນ​ສູງ"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"ຣິງໂທນ"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"ການແຈ້ງເຕືອນ"</string>
@@ -732,7 +711,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"ປິດສຽງດົນຕີ &amp; ສື່ອື່ນໆ"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"ປິດສຽງການແຈ້ງເຕືອນ"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"ປິດສຽງໂມງປຸກ"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"ສັ່ນເຕືອນເມື່ອມີສາຍໂທເຂົ້າ"</string>
     <string name="dock_settings" msgid="1820107306693002541">"ບ່ອນຕັ້ງສາກ"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"ການຕັ້ງຄ່າບ່ອນຕັ້ງສາກ"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"ສຽງ"</string>
@@ -758,8 +736,10 @@
     <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="2354961343555249270">"ຄວາມແຈ້ງ"</string>
+    <string name="brightness" msgid="8480105032417444275">"ລະດັບ​ຄວາມແຈ້ງ"</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="screen_timeout" msgid="4351334843529712571">"ເວລາປິດໜ້າຈໍ"</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>
@@ -1343,8 +1323,8 @@
     <string name="enable_adb" msgid="7982306934419797485">"ການດີບັ໊ກຜ່ານ USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"ເປີດໃຊ້ໂໝດດີບັ໊ກເມື່ອເຊື່ອມຕໍ່ USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"ຖອດຖອນການອະນຸຍາດການດີບັ໊ກຜ່ານ USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"ກົດປຸ່ມ ປິດ/ເປີດ ເພື່ອແຈ້ງລາຍງານບັ໊ກ"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"ຮວມໂຕເລືອກການລາຍງານຂໍ້ຜິດພາດໃນເມນູເປີດປິດ"</string>
+    <string name="bugreport_in_power" msgid="7923901846375587241">"ທາງ​ລັດລ​າຍງານ​ຂໍ້​ຜິດພາດ"</string>
+    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"ສະແດງ​ປຸ່ມ​ໃນ Quick Settings ເພື່ອ​ສົ່ງ​ລາຍ​ງານ​ຂໍ້​ຜິດພາດ"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"ເປີດໜ້າຈໍຕະຫຼອດ"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"ໜ້າຈໍຈະບໍ່ປິດໃນຂະນະທີ່ສາກໄຟຢູ່"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"ເປີດໃຊ້ງານການຊອດແນມ Bluetooth HCI"</string>
@@ -1820,6 +1800,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"ພິມລະຫັດຜ່ານເພື່ອຖອດລະຫັດບ່ອນຈັດເກັບຂໍ້ມູນ"</string>
+    <string name="enter_pin" msgid="286221169871526876">"ໃສ່​ລະ​ຫັດ PIN ຂອງ​ທ່ານເພື່ອ​ຖອດ​ລະ​ຫັດ​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"​ແຕ້ມ​ຮູບ​ແບບ​ລັອກ​ຂອງ​ທ່ານ​ເພື່ອ​ຖອດ​ລະ​ຫັດ​ບ່ອນ​ຈັດ​ເກັບ​ຂໍ້​ມູນ"</string>
     <string name="try_again" msgid="4272075051293936921">"ລອງໃໝ່ອີກຄັ້ງ."</string>
     <string name="delete" msgid="4219243412325163003">"ລຶບ"</string>
     <string name="misc_files" msgid="6720680815969643497">"ໄຟລ໌ອື່ນໆ"</string>
@@ -2072,6 +2054,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"ປ່ຽນຂະໜາດໂຕອັກສອນ"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"ແຕະ​ &amp; ຈ່າຍ"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"ຈ່າຍງ່າຍພຽງແຕ່ສຳຜັດ"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"ສະ​ໜັບ​ສະ​ໜຸນ​ແອັບຯ​ພື້ນ​ໜ້າ"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"ສຶກສາເພີ່ມເຕີມ"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"ຊອກຫາແອັບຯ"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"ກຳນົດເປັນຄ່າທີ່ທ່ານຕ້ອງການ?"</string>
@@ -2125,16 +2108,7 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"ການ​​ຊອກ​ຫາ​​ທີ່​ຜ່ານ​ມາ"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ຜົນ​ການ​ຊອກ​ຫາ"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"ເມື່ອ​ອຸປະກອນ​ຖືກ​ລັອກ"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ເລືອກ​ເນື້ອຫາ​ການແຈ້ງເຕືອນ​ທີ່​ລະອຽດອ່ອນ"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ສະແດງ​ເນື້ອຫາ​ການແຈ້ງເຕືອນ​ທັງໝົດ"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"ຫ້າມລົບກວນ"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"ຫ້າມລົບກວນ"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"ການແຈ້ງ​ເຕືອນ"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"ການປັບແຕ່ງຈຸກຈິກ"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"ຕິດ​ຕັ້ງ​ແທັກ NFC ຂອງ WiFi"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"ຕັ້ງ​ຄ່າ​ແທັກ Wi-Fi NFC"</string>
     <string name="write_tag" msgid="8571858602896222537">"ຂຽນ"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"​ແ​ຕະ​ທີ່​ແທັກ​ເພື່ອ​ຂຽນ..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"​ລະ​ຫັດ​ຜ່ານ​ບໍ່​ຖືກ​ຕ້ອງ​, ລອງ​ໃໝ່​ອີກ​ຄັ້ງ."</string>
@@ -2142,19 +2116,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"​ບໍ່​ສາ​ມາດ​ຂຽນ​ຂໍ້​ມູນ​ໄປ​ຫາແທັກ NFC ໄດ້. ຫາກ​ບັນ​ຫາ​ນີ້​ຍັງ​ເກີດ​ຂຶ້ນ​ອີກ, ​ກະ​ລຸ​ນາ​ລອງ​ແທັກ​ອັນ​ອື່ນ​ເບິ່ງ"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"​ແທັກ NFC ແມ່ນ​ບໍ່​ສາ​ມາດ​ຂຽນ​ໄດ້​. ກະ​ລຸ​ນາ​ໃຊ້​ແທັກ​ອັນ​ອື່ນ​."</string>
     <string name="default_sound" msgid="8821684447333687810">"​ສຽງ​ເລີ່ມ​ຕົ້ນ"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"ສຽງ &amp; ການ​ແຈ້ງ​ເຕືອນ"</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="zen_mode_settings_title" msgid="2689740350895257590">"ຫ້າມລົບກວນ"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"​ເມື່ອ​ມີ​ການ​ໂທ ຫຼື​ການ​ແຈ້ງ​ເຕືອນ​ເຂົ້າ​ມາ"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"​ເຕືອນ​ດ້ວຍ​ສຽງ"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"​ສັ່ນ​ເຕືອນ​ແທນ​​ສຽງ"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"​ບໍ່​ຕ້ອງ​ເຕືອນ​ດ້ວຍ​ສຽງ ຫຼື​ການ​ສັ່ນ"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"ຣິງໂທນໂທລະສັບ"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"​ຣິງ​ໂທນ​ແຈ້ງ​ເຕືອນ​ເລີ່ມ​ຕົ້ນ"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"ສັ່ນເຕືອນເມື່ອມີສາຍໂທເຂົ້າ"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"​ກຳ​ລັງ​ສະ​ແດງ​ການ​ແຈ້ງ​ເຕືອນ"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"ໄຟກະພິບແຈ້ງເຕືອນ"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"ເມື່ອ​ອຸປະກອນ​ຖືກ​ລັອກ"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ສະແດງ​ເນື້ອຫາ​ການແຈ້ງເຕືອນ​ທັງໝົດ"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ເລືອກ​ເນື້ອຫາ​ການແຈ້ງເຕືອນ​ທີ່​ລະອຽດອ່ອນ"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"ບໍ່​ສະ​ແດງ​ການ​ແຈ້ງ​ເຕືອນ​ເລີຍ"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"ບໍ່​ໃຫ້​ແຈ້ງ​ເຕືອນ​ຕອນ​ໃດ"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"​ເຊື່ອງການ​ແຈ້ງ​ເຕືອນ​ໃໝ່​ຈາກ​ລາຍ​ຊື່"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"​ສະ​ແດງ​ການ​ແຈ້ງ​ເຕືອນ​ທັງ​ໝົດ​ຈາກ​ລາຍ​ຊື່"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"​ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"​ສຽງ​ສຳ​ຜັດ"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"ສຽງ​ປຸ່ມ​ກົດ"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"ການ​ລັອກ &amp; ປົດ​ລັອກ​ໜ້າ​ຈໍ"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"​ສຽງ​ສຳ​ຜັດ​ອື່ນໆ"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"​ສັ່ນ​ເມື່ອ​ສຳ​ຜັດ​ໜ້າ​ຈໍ"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"ການ​ເຂົ້າ​ເຖິງ​ການ​ແຈ້ງ​ເຕືອນ"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"ແອັບຯບໍ່ສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d ແອັບຯສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</item>
+    <item quantity="other" msgid="980049191810249052">"%d ແອັບຯສາມາດອ່ານການແຈ້ງເຕືອນໄດ້"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"ບໍ່ໄດ້ຕິດຕັ້ງໂຕຟັງການແຈ້ງເຕືອນ."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ເປີດໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ຈະສາມາດອ່ານທຸກການແຈ້ງເຕືອນທີ່ມາຈາກລະບົບ ຫຼືແອັບຯໃດໆກໍຕາມທີ່ມີຕິດຕັ້ງຢູ່ ເຊິ່ງອາດຮວມເຖິງຂໍ້ມູນສ່ວນໂຕ ເຊັ່ນ: ລາຍຊື່ຜູ່ຕິດຕໍ່ ແລະຂໍ້ຄວາມທີ່ສົ່ງຫາທ່ານ. ມັນຍັງສາມາດປິດການແຈ້ງເຕືອນເຫຼົ່ານີ້ ຫຼືແຕະປຸ່ມເຮັດວຽກທີ່ຢູ່ພາຍໃນນັ້ນໄດ້ນຳ."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"ຜູ້​ໃຫ້​ບໍລິການ​ເງື່ອນ​ໄຂ"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ບໍ່​ມີ​ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</item>
+    <item quantity="other" msgid="358057362115673258">"%d ແອັບຯ​ລະ​ບຸ​ເງື່ອນ​ໄຂ"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"ບໍ່​ມີ​ຜູ່​ໃຫ້​ບໍລິການ​ເງື່ອນ​ໄຂ​ທີ່​ຕິດ​ຕັ້ງ​ໄວ້."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ເປີດ​ໃຊ້ <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ຈະ​ສາມາດ​ເພີ່ມ​ເງື່ອນ​ໄຂ​ການ​ອອກ​ຈາກ​ໂໝດ​ຫ້າມ​ລົບ​ກວນ​ໄດ້."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"​ກຳ​ລັງ​ໂຫລດ​ແອັບຯ..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"ສະແດງການແຈ້ງເຕືອນ"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"ຄວາມ​ສຳ​ຄັນ​ສູງ"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"​ສະ​ແດງ​ທາງ​ເທິງ​ສຸດ"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"​ເຊື່ອງ​ເນື້ອ​ຫາ​ທີ່​ລະ​ອຽດ​ອ່ອນ​ເມື່ອ​ອຸ​ປະ​ກອນ​ຖືກ​ລັອກ"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"ບລັອກ​ແລ້ວ"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"​ສຳ​ຄັນ​ທີ່​ສຸດ"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"​ລະ​ອຽດ​​ອ່ອນ"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"ແລ້ວໆ"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"ປິດ"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"ເປີດ"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"ຈົນກວ່າ​ທ່ານ​ຈະ​ປິດ​"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"ບລັອກ​ທຸກ​ການ​ລົບ​ກວນ​ຍົກ​ເວັ້ນ​"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"ໃນ​ຕອນ​ກາງ​ຄືນ"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"ລະ​ບົບ​ອັດ​ຕະ​ໂນ​ມັດ​ອື່ນໆ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"ເປີດ​ໂດຍ​ອັດ​ຕະ​ໂນ​ມັດ"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ບໍ່​ໃຊ້"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"ການໂທ"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"ຂໍ້​ຄວາມ"</string>
@@ -2170,5 +2190,9 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"ເວລາເລີ່ມ"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"ເວລາສິ້ນສຸດ"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ມື້​ຕໍ່​ໄປ"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"ການ​ແຈ້ງ​ເຕືອນ​ແອັບຯ"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"​ການ​ຕັ້ງ​ຄ່າ​ການ​ແຈ້ງ​ເຕືອນ"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ສົ່ງ​ຄຳ​ຕິ​ຊົມ​ກ່ຽວ​ກັບ​ອຸ​ປະ​ກອນ​ນີ້"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"ເປີດ"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"ປິດ"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index add121f..9bb65b2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Dabar esate kūrėjas!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nereikia, jūs jau esate kūrėjas."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEVIELIS RYŠYS IR TINKLAI"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ĮRENGINYS"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ASMENIŠKA"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Įjungti radiją"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Išjungti radiją"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Įjungti SMS per IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifruotė"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifruoti planšetinį kompiuterį"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifruoti telefoną"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti planšetinį kompiuterį kaskart jį įjungus"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Reikalauti skaitinio PIN kodo ar slaptažodžio, norint iššifruoti telefoną kaskart jį įjungus"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifruotas"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę planšetinį kompiuterį turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Planšetinio kompiuterio iššifruoti negalite, išskyrus atvejus, kai atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis.\n\nŠifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti planšetinį kompiuterį prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Galite užšifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenis, mediją ir kitus failus. Užšifravę telefoną turėsite įvesti skaitinį PIN kodą arba slaptažodį, kad iššifruotumėte jį kiekvieną kartą įjungę. Telefono iššifruoti negalite, išskyrus atvejus, atkuriate gamyklinius duomenis, ištrindami visus turimus duomenis.\n\nŠifravimas trunka valandą ar daugiau. Turite pradėti darbą naudodami įkrautą akumuliatorių ir laikyti telefoną prijungtą prie maitinimo tinklo, kol šifravimas bus baigtas. Pertraukus šifravimo procesą bus prarasti kai kurie arba visi duomenys."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifruoti planšetinį kompiuterį"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifruoti telefoną"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Įkraukite akumuliatorių ir bandykite dar kartą."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Žiūrėti arba išaktyvinti įrenginio administratorius"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Peržiūrėkite ar išaktyvinkite „trust agents“"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Prieiga prie pranešimų"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programos negali skaityti pranešimų"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d programa gali skaityti pranešimus"</item>
-    <item quantity="other" msgid="980049191810249052">"%d program. gali skaityti pranešimus"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Neįdiegta pranešimų skaitymo priemonių."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Įgalinti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"„<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>“ galės skaityti visus sistemos ar įdiegtų programų skelbiamus pranešimus, kuriuose gali būti asmeninės informacijos, pavyzdžiui, kontaktų vardų ir jums atsiųstų pranešimų teksto. Ji taip pat galės atsisakyti šių pranešimų arba jose paliečiamų mygtukų veiksmų."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Sąlygų teikėjai"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nėra sąlygas pateikiančių programų"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d progr. pateikia sąlygas"</item>
-    <item quantity="other" msgid="358057362115673258">"%d progr. pateikia sąlygas"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nėra įdiegta jokių sąlygų teikėjų."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Įgalinti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"„<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>“ galės pridėti išėjimo sąlygas prie režimo „Netrukdyti“."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Įjungti „Bluetooth“"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Prijungti prie tinklo"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pamiršti tinklą"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Keisti tinklą"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kad peržiūrėt. galimus tinklus, įjunkite „Wi-Fi“."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Ieškoma „Wi-Fi“ tinklų…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Neturite leidimo keisti „Wi‑Fi“ tinklą."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (galima WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", saugoma „<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>“"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Įveskite tinklo slaptažodį."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Nėra"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Siekiant tiksliau nustatyti vietą ir dėl kitų priežasčių, „<xliff:g id="APP_NAME">%1$s</xliff:g>“ prašo leidimo nuskaityti tinklus, net kai „Wi-Fi“ yra išjungtas.\n\nAr norite suteikti leidimą nuskaityti visoms to prašančioms programoms?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Leisti"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Pagrindinis"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekranas"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Garsas"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Garsumas"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muzikos efektai"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Skambučio garsumas"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibruoti, kai veikia tyliuoju režimu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Numatytasis pranešimo garsas"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsuojanti įspėjimo šviesa"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Rod. iššok. l., jei pr. did."</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Skambėjimo tonas"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Įspėjimas"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Nutildyti muziką ir kitą mediją"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Nutildyti pranešimus"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Nutildyti signalus"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibruoti, kai skambina"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Piktogramų juosta"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Doko nustatymai"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Garso įrašas"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Sukant planšetinį kompiuterį automatiškai perjungti orientaciją"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Perjungti padėtį automatiškai, kai sukamas telefonas"</string>
-    <string name="brightness" msgid="2354961343555249270">"Šviesumas"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano šviesumą"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Užmigti"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB perkrova"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Derinimo režimas, kai prijungtas USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Panaikinti USB derinimo prieigos teises"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Įjungimo meniu pranešimai apie triktis"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Įtraukti parinktį į įjungimo meniu, kad būtų galima pranešti apie triktį"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Veikti"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Kraunant ekranas niekada neveiks miego režimu"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Įgalinti „Bluetooth“ HCI šnipinėjimo žurnalą"</string>
@@ -1820,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresas"</string>
     <string name="enter_password" msgid="4131758584074246224">"Kad iššifruotumėte atmintinę, įveskite slaptažodį"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Bandykite dar kartą."</string>
     <string name="delete" msgid="4219243412325163003">"Ištrinti"</string>
     <string name="misc_files" msgid="6720680815969643497">"Įvairūs failai"</string>
@@ -2072,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Keisti šrifto dydį"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Paliesti ir mokėti"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Mokėkite tiesiog paliesdami"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Teikti pirmenybę fone vykdomoms programoms"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Sužinokite daugiau"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Ieškoti programų"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Nustatyti kaip jūsų nuostatą?"</string>
@@ -2125,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Paskutinės paieškos"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultatai"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"„Wi-Fi“ tinklo ryšys"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Kai įrenginys užrakintas"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Slėpti delikatų pranešimo turinį"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rodyti visą pranešimo turinį"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Netrukdyti"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Netrukdyti"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Pranešimai"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Modifikacijos"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programų pranešimai"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Nustatyti „Wi-Fi“ ALR žymą"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Rašyti"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Palieskite žymą, kad galėtumėte rašyti..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Netinkamas slaptažodis, bandykite dar kartą."</string>
@@ -2142,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Nepavyko įrašyti duomenų į ALR žymą. Jei problema išlieka, išbandykite kitą žymą"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Negalima įrašyti į ALR žymą. Naudokite kitą žymą."</string>
     <string name="default_sound" msgid="8821684447333687810">"Numatytasis garsas"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Netrukdyti"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Telefono skambėjimo tonas"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibruoti, kai skambina"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsuojanti įspėjimo šviesa"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rodyti visą pranešimo turinį"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Slėpti delikatų pranešimo turinį"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programos negali skaityti pranešimų"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d programa gali skaityti pranešimus"</item>
+    <item quantity="other" msgid="980049191810249052">"%d program. gali skaityti pranešimus"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Neįdiegta pranešimų skaitymo priemonių."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Įgalinti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"„<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>“ galės skaityti visus sistemos ar įdiegtų programų skelbiamus pranešimus, kuriuose gali būti asmeninės informacijos, pavyzdžiui, kontaktų vardų ir jums atsiųstų pranešimų teksto. Ji taip pat galės atsisakyti šių pranešimų arba jose paliečiamų mygtukų veiksmų."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Sąlygų teikėjai"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nėra sąlygas pateikiančių programų"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d progr. pateikia sąlygas"</item>
+    <item quantity="other" msgid="358057362115673258">"%d progr. pateikia sąlygas"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nėra įdiegta jokių sąlygų teikėjų."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Įgalinti „<xliff:g id="SERVICE">%1$s</xliff:g>“?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"„<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>“ galės pridėti išėjimo sąlygas prie režimo „Netrukdyti“."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Įkeliamos programos..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Rodyti pranešimus"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Didelis prioritetas"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Atlikta"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Išjungta"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Įjungta"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Kol išjungsite"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokuoti visus pertrūkius, išskyrus"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Naktį"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Kitas automatizavimas"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatiškai įjungti"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Niekada"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefono skambučiai"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Pranešimai"</string>
@@ -2170,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Pradžios laikas"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Pabaigos laikas"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> kitą dieną"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Programų pranešimai"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Įspėjimų nustatymai"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Siųsti atsiliepimą apie šį įrenginį"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index f608fd3..08383f9 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Tagad jūs esat izstrādātājs!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nav nepieciešams, ja jau esat izstrādātājs."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZVADU PAKALPOJUMI UN TĪKLI"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"IERĪCE"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONISKIE"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTĒMA"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Ieslēgt radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Izslēgt radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Ieslēgt īsziņas prioritāti pār IM ziņojumu"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrējums"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrēt planšetdatoru"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Tālruņa šifrēšana"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ieslēdzot planšetdatoru, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ieslēdzot tālruni, ikreiz tiek pieprasīts skaitlisks PIN kods vai parole šifra noņemšanai."</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrēts"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet planšetdatoru, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai planšetdatoru atšifrētu. Planšetdatora šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati.\n\nŠifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un planšetdatoram ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un tajās esošos datus, multivides un cita veida failus. Ja šifrēsiet tālruni, ikreiz pēc tā ieslēgšanas būs jāievada ciparu PIN vai parole, lai tālruni atšifrētu. Tālruņa šifrējumu var noņemt, tikai veicot datu atiestatīšanu uz rūpnīcas iestatījumiem. To darot, tiek dzēsti arī visi dati.\n\nŠifrēšana ilgst stundu vai ilgāk. Akumulatoram ir jābūt pilnībā uzlādētam un tālrunim ir jābūt pievienotam elektrotīklam, līdz šifrēšana tiek pabeigta. Ja šifrēšanas process tiks pārtraukts, tiks zaudēti visi dati vai kāda to daļa."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrēt planšetdatoru"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrēt tālruni"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Uzlādējiet akumulatoru un mēģiniet vēlreiz."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Skatiet vai deaktivizējiet ierīces administratorus"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Uzticamības pārbaudes programmas"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Skatīt vai pārvaldīt uzticamības pārbaudes programmas"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Piekļuve paziņojumiem"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Lietotnēs nevar lasīt paziņojumus."</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d lietotnē var lasīt paziņojumus."</item>
-    <item quantity="other" msgid="980049191810249052">"%d lietotnēs var lasīt paziņojumus."</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nav instalēts neviens paziņojumu uztvērējs."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vai iespējot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Uztvērējs <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> varēs lasīt visus paziņojumus, ko publicējusi sistēma vai jebkura instalētā lietotne. Šajos paziņojumos var būt ietverta personas informācija, piemēram, kontaktpersonu vārdi un saņemtās īsziņas. Šis uztvērējs arī varēs paslēpt šos paziņojumus un pieskarties paziņojumos esošajām darbību pogām."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Nosacījumu sniedzēji"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nosacījumi nav sniegti nevienā lietotnē"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Nosacījumi sniegti %d lietotnē"</item>
-    <item quantity="other" msgid="358057362115673258">"Nosacījumi sniegti %d lietotnēs"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nav instalēts neviens nosacījumu sniedzējs."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vai iespējot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> varēs pievienot iziešanas nosacījumus režīmā “Netraucēt”."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ieslēgt Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Izveidot savienojumu ar tīklu"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Neiegaumēt tīklu"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Pārveidot tīklu"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Lai skatītu pieejamos tīklus, ieslēdziet Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Notiek Wi-Fi tīklu meklēšana…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Jums nav atļaujas mainīt Wi‑Fi tīklu."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ir pieejams)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", nodrošināts ar <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ievadiet tīkla paroli."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Nav"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Lai uzlabotu atrašanās vietu noteikšanas precizitāti, kā arī citas funkcijas, lietotnē <xliff:g id="APP_NAME">%1$s</xliff:g> tiek pieprasīts ieslēgt tīkla skenēšanu, pat ja Wi-Fi savienojums ir izslēgts.\n\nVai atļaut šo darbību visām lietotnēm, kurās tiek pieprasīta skenēšana?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Atļaut"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Sākums"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Displejs"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Skaņa"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Tālruņa zvana signāls"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Skaļumi"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Mūzikas efekti"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zvanītāja skaļums"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrē klusuma režīmā"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Noklusējuma paziņojuma skaņa"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsa paziņojuma indikators"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Uznirstoši (augsta prioritāte)"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvana signāls"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Paziņojums"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Izslēgt mūzikas un citu multivides failu skaņu"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Izslēgt paziņojumu skaņu"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Izslēgt brīdinājumu skaņu"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrēt zvanot"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Doks"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Doka iestatījumi"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automātiski pārslēgt orientāciju, kad tālrunis tiek pagriezts"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Mainīt orientāciju automātiski, rotējot planšetdatoru"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Automātiski pārslēgt orientāciju, kad tālrunis tiek pagriezts"</string>
-    <string name="brightness" msgid="2354961343555249270">"Spilgtums"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Noregulēt ekrāna spilgtumu"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Miega režīms"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB atkļūdošana"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Atkļūdošanas režīms, kad ir pievienota kopne USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Atsaukt piekļuvi USB atkļūdošanai"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Barošanas izvēlnes kļūdu ziņojumi"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Iekļaut barošanas izvēlnē kļūdu ziņojuma sagatavošanas opciju"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Atstāt nomodā"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Uzlādes laikā ekrāns nekad nepārslēgsies miega režīmā"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Iespējot Bluetooth HCI analizētāja žurnālu"</string>
@@ -1820,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adrese"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ierakstiet paroli, lai atšifrētu atmiņu"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Mēģiniet vēlreiz."</string>
     <string name="delete" msgid="4219243412325163003">"Dzēst"</string>
     <string name="misc_files" msgid="6720680815969643497">"Dažādi faili"</string>
@@ -2072,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Fonta lieluma maiņa"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Pieskarties un maksāt"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Maksājiet ar vienu pieskārienu."</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Izvēlēties priekšplāna lietotni"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Uzziniet vairāk"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Meklēt lietotnes"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Vai iestatīt kā jūsu preferenci?"</string>
@@ -2125,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Nesen izmantotie meklēšanas vaicājumi"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultāti"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi Wi-Fi tīkls savienojums"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Kad ierīce ir bloķēta"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Paslēpt sensitīvu saturu paziņojumos"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rādīt visu saturu paziņojumos"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Netraucēt"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Netraucēt"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Paziņojumi"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Uzlabojumi"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Lietotņu paziņojumi"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Wi-Fi TDLS atzīmes iestatīšana"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Rakstīt"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Pieskarieties atzīmei, lai rakstītu."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Parole nav derīga, mēģiniet vēlreiz."</string>
@@ -2142,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Nevar ierakstīt datus TDLS atzīmē. Ja problēmu neizdodas novērst, izmēģiniet citu tagu."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"TDLS atzīmē nevar ierakstīt datus. Lūdzu, izmantojiet citu atzīmi."</string>
     <string name="default_sound" msgid="8821684447333687810">"Noklusējuma skaņa"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Netraucēt"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Tālruņa zvana signāls"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrēt zvanot"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsa paziņojuma indikators"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rādīt visu saturu paziņojumos"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Paslēpt sensitīvu saturu paziņojumos"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Lietotņu paziņojumi"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Lietotnēs nevar lasīt paziņojumus."</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d lietotnē var lasīt paziņojumus."</item>
+    <item quantity="other" msgid="980049191810249052">"%d lietotnēs var lasīt paziņojumus."</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nav instalēts neviens paziņojumu uztvērējs."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vai iespējot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Uztvērējs <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> varēs lasīt visus paziņojumus, ko publicējusi sistēma vai jebkura instalētā lietotne. Šajos paziņojumos var būt ietverta personas informācija, piemēram, kontaktpersonu vārdi un saņemtās īsziņas. Šis uztvērējs arī varēs paslēpt šos paziņojumus un pieskarties paziņojumos esošajām darbību pogām."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Nosacījumu sniedzēji"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nosacījumi nav sniegti nevienā lietotnē"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"Nosacījumi sniegti %d lietotnē"</item>
+    <item quantity="other" msgid="358057362115673258">"Nosacījumi sniegti %d lietotnēs"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nav instalēts neviens nosacījumu sniedzējs."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vai iespējot pakalpojumu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> varēs pievienot iziešanas nosacījumus režīmā “Netraucēt”."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Notiek lietotņu ielāde..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Rādīt paziņojumus"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Augsta prioritāte"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gatavs"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Izslēgt"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Ieslēgt"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Līdz brīdim, kad ieslēgsiet"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloķēt visus traucējumus, izņemot"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Naktī"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Cita veida automatizācija"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automātiska ieslēgšana"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nekad"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Tālruņa zvani"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Ziņojumi"</string>
@@ -2170,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Sākuma laiks"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Beigu laiks"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> (nākamajā dienā)"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Lietotņu paziņojumi"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Paziņojumu iestatījumi"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Sūtīt atsauksmes par šo ierīci"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 10e675c..43ef275 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Та одоо хөгжүүлэгч боллоо!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Шаардлагагүй, та аль хэдийн хөгжүүлэгч болсон."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"УТАСГҮЙ &amp; СҮЛЖЭЭ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ТӨХӨӨРӨМЖ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ХУВИЙН"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМ"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Утасгүй &amp; Сүлжээ"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Төхөөрөмж"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Хувийн"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Систем"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Радиог асаах"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Радиог унтраах"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"SMS-г IMS дээр асаах"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрлэлт"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Таблетыг шифрлэх"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Утсыг шифрлэх"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Таныг таблетаа асаах бүрт шифрийг тайлахын тулд тоон PIN буюу нууц үг шаардана"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Таныг утсаа асаах бүрт шифрийг тайлахын тулд тоон PIN буюу нууц үг шаардана"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифрлэгдсэн"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Та өөрийн акаунт, тохиргоо, татсан апп-ууд болон тэдгээрийн өгөгдлүүд, медиа болон бусад файлуудыг шифрлэж болно. Та таблетаа шифрлэсэн бол асаах бүрдээ тоон PIN буюу нууц үг оруулж тайлах шаардлагатай: та бүх өгөгдлөө устгаж, үйлдвэрээс гарсан хэвэнд нь оруулж шинэчлэхээс нааш шифрлэлтийг буцаах боломжгүй.\n\nШифрлэлтэд нэг цаг буюу түүнээс удаан хугацаа ордог. Та таблетаа цэнэгтэй зайтайгаар асааж, шифрлэж дуустал тэжээлд залгаатай байлгах шаардлагатай. Хэрэв шифрлэх явцад тасалдуулбал та өгөгдлийнхөө заримыг буюу бүгдийг нь алдах болно."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Та өөрийн акаунт, тохиргоо, татсан апп-ууд болон тэдгээрийн өгөгдлүүд, медиа болон бусад файлуудыг шифрлэж болно. Та утсаа шифрлэсэн бол та бүх өгөгдлөө устгаж, үйлдвэрээс гарсан хэвэнд нь оруулж шинэчлэхээс нааш шифрлэлтийг буцаах боломжгүй.\n\nШифрлэлтэд нэг цаг хүртэл хугацаа ордог. Та утсаа цэнэгтэй зайтайгаар асааж, шифрлэж дуустал тэжээлд залгаатай байлгах шаардлагатай. Хэрэв шифрлэх явцад тасалдуулбал та өгөгдлийнхөө заримыг буюу бүгдийг нь алдах болно."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Та өөрийн акаунт, тохиргоо, татсан апп-ууд, тэдгээрийн дата, медиа болон бусад файлуудыг шифрлэх боломжтой. Та утсаа шифрлэсний дараа дэлгэцийг түгжсэн гэж бодвол (хээ буюу тоон PIN буюу нууц үгээр), та утасны шифрийг тайлахын тулд асаах бүртээ дэлгэцний түгжээг тайлах шаардлагатай болно. Өөр ганц арга байгаа нь утсыг үйлдвэрээс гарсан төлөв рүү сэргээж, бүх датаг арилгах юм.\n\nШифрлэлтэд нэг буюу түүнээс их цаг зарцуулагдана. Та энэ хугацааны турш утасныхаа батерегй цэнэглэж, цахилгаанд залгасан байх хэрэгтэй. Хэрэв тасалдвал та зарим буюу бүх датагаа алдаж болзошгүй."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Та өөрийн акаунт, тохиргоо, татсан апп-ууд, тэдгээрийн дата, медиа болон бусад файлуудыг шифрлэх боломжтой. Та утсаа шифрлэсний дараа дэлгэцийг түгжсэн гэж бодвол (хээ буюу тоон PIN буюу нууц үгээр), та утасны шифрийг тайлахын тулд асаах бүртээ дэлгэцний түгжээг тайлах шаардлагатай болно. Өөр ганц арга байгаа нь утсыг үйлдвэрээс гарсан төлөв рүү сэргээж, бүх датаг арилгах юм.\n\nШифрлэлтэд нэг буюу түүнээс их цаг зарцуулагдана. Та энэ хугацааны турш утасныхаа батерегй цэнэглэж, цахилгаанд залгасан байх хэрэгтэй. Хэрэв тасалдвал та зарим буюу бүх датагаа алдаж болзошгүй."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Таблетыг шифрлэх"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Утсыг шифрлэх"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зайгаа цэнэглээд дахин оролдоно уу."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Төхөөрөмжийн администраторуудыг харах эсхүл идэвхгүйжүүлэх"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Итгэмжлэгдсэн төлөөлөгч"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Итгэмжлэгдсэн төлөөлөгчдийг харах буюу идэвхгүйжүүлэх"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Мэдэгдлийн хандалт"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апп-ууд мэдэгдлийг уншиж чадахгүй"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d апп мэдэгдлийг уншиж чадна"</item>
-    <item quantity="other" msgid="980049191810249052">"%d апп-ууд мэдэгдлийг уншиж чадна"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Мэдэгдэл сонсогч суулгагдаагүй."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>-г идэвхжүүлэх үү?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь систем буюу аливаа суулгасан апп-н гаргасан бүх мэдэгдлүүдийг унших боломжтой байна, үүнд харилцагчийн нэрс, танд ирсэн зурвасууд гэх мэт хувийн мэдээллүүд орж болно. Энэ мөн тэдгээр мэдэгдлүүдийг болиулах буюу тэдгээрийн доторх үйлдлийн товчнуудад хүрэх боломжтой."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Нөхцөл нийлүүлэгч"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Нөхцөл нийлүүлэх апп байхгүй"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d апп нөхцөлүүдийг нийлүүлнэ"</item>
-    <item quantity="other" msgid="358057362115673258">"%d апп нөхцөлүүдийг нийлүүлнэ"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Нөхцөл нийлүүлэгч суулгаагүй байна."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>-г идэвхжүүлэх үү?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> нь \"Бүү саад бол\" горимоос гарах нөхцөлүүдийг нэмэх боломж олгоно."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Блютүүт"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Блютүүтийг асаах"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Блютүүт"</string>
@@ -590,6 +570,7 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Сүлжээнд холбогдох"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Сүлжээг мартах"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Сүлжээг өөрчлөх"</string>
+    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC тагьруу бичих"</string>
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Боломжит сүлжээнүүдийг харахын тулд WiFi асаана уу."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wi‑Fi сүлжээ хайж байна…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Танд Wi‑Fi сүлжээг өөрчлөх зөвшөөрөл алга байна."</string>
@@ -638,7 +619,7 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS боломжтой)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-р хамгаалагдсан"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>-р хамгаалагдсан"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Сүлжээний нууц үгээ оруулна уу."</string>
+    <string name="wifi_wps_nfc_enter_password" msgid="2288214226916117159">"Сүлжээний нууц үгээ оруулна уу"</string>
     <string name="wifi_security_none" msgid="7985461072596594400">"Байхгүй"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Байршлын нарийвчлалыг сайжруулах болон бусад зорилгоор <xliff:g id="APP_NAME">%1$s</xliff:g> нь Wi-Fi хаалттай байгаа хэдий ч сүлжээний сканийг идэвхжүүлэхийг хүсч байна.\n\nҮүнийг скан хийхийг хүсч байгаа бүх апп-д зөвшөөрөх үү?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Зөвшөөрөх"</string>
@@ -702,14 +683,12 @@
     <string name="home_settings" msgid="212375129455718176">"Нүүр"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Дэлгэц"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Дуу"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Утасны хонхны ая"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Дууны хэмжээ"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Хөгжмийн эффект"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Хонхны аяны чанга"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Дуугүй үед чичрэх"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Мэдэгдлийн хонхны үндсэн ая"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Анивчих мэдэгдлийн гэрэл"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Нэн тэргүүний ач холбогдолтой бол попап"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Хонхны ая"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Мэдэгдэл"</string>
@@ -732,7 +711,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Хөгжим &amp; бусад медианы дууг хаах"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Мэдэгдлийн хаах"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Сэрүүлгүүдийг дуугүй болгох"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Хонх дуугарах үед чичрэх"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Док"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Док-н тохиргоо"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Аудио"</string>
@@ -758,8 +736,10 @@
     <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="2354961343555249270">"Тодрол"</string>
+    <string name="brightness" msgid="8480105032417444275">"Гэрэлтүүлгийн түвшин"</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="screen_timeout" msgid="4351334843529712571">"Идэвхгүй"</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>
@@ -1343,8 +1323,8 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB дебаг"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB холбодсон үеийн согог засах горим"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"USB дебагын зөвшөөрлийг хураах"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Цэсийн согогийн репорт"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Цэсэнд согогийн репорт авахад зориулсан сонголтыг оруулах"</string>
+    <string name="bugreport_in_power" msgid="7923901846375587241">"Согог мэдээлэх товчлол"</string>
+    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Согог мэдээлэхэд зориулсан товчийг Шуурхай тохиргоо дотор харуулах"</string>
     <string name="keep_screen_on" msgid="1146389631208760344">"Идэвхтэй байлгах"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Цэнэглэж байх үед дэлгэц хэзээ ч амрахгүй"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Блютүүт HCI снүүп логыг идэвхжүүлэх"</string>
@@ -1820,6 +1800,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC хаяг"</string>
     <string name="enter_password" msgid="4131758584074246224">"Сангийн шифрийг тайлахын тулд нууц үг бичнэ үү"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Сангийн шифрийг тайлахын тулд өөрийн PIN-г оруулна уу"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Сангийн шифрийг тайлахын тулд хээгээ зурна уу"</string>
     <string name="try_again" msgid="4272075051293936921">"Дахин оролдно уу."</string>
     <string name="delete" msgid="4219243412325163003">"Устгах"</string>
     <string name="misc_files" msgid="6720680815969643497">"Янз бүрийн файлууд"</string>
@@ -2072,6 +2054,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Фонтын хэмжээг өөрчлөх"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Товшоод төлөөрэй"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Зүгээр товшоод л төлбөр хийж болно"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Нүүрний апп-г дэмжих"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Дэлгэрэнгүй үзэх"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Апп олох"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Таны тохируулга болгох уу?"</string>
@@ -2125,16 +2108,7 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Саяхны хайлтууд"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Илэрцүүд"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сүлжээний холболт"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Төхөөрөмж цоожтой үед"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Нууц сэдэвтэй мэдэгдлийн агуулгыг нуух"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүх мэдэгдлийн агуулгыг харуулах"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Бүү саад бол"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Бүү саад бол"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Мэдэгдэл"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Твик"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aпп мэдэгдлүүд"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"WiFi NFC Тагийг тохируулах"</string>
+    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi NFC Tагь тохируулах"</string>
     <string name="write_tag" msgid="8571858602896222537">"Бичих"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Бичихийн тулд тагь дээр дарах ..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Буруу нууц үг, дахин оролдоно уу."</string>
@@ -2142,19 +2116,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Датаг NFC тагь руу бичих боломжгүй. Асуудал хэвээр байвал өөр тагь ашиглаж үзнэ үү"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC тагь дээр бичих боломжгүй. Өөр тагь ашиглана уу."</string>
     <string name="default_sound" msgid="8821684447333687810">"Үндсэн дуу"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Ая &amp; Мэдэгдэл"</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="zen_mode_settings_title" msgid="2689740350895257590">"Бүү саад бол"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Дуудлага болон мэдэгдэл ирэх үед"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Хонхны ая"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Хонхны оронд чичиргээ"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Хонхгүй эсхүл чичиргээгүй"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Утасны хонхны ая"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Мэдэгдлийн үндсэн хонхны ая"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Хонх дуугарах үед чичрэх"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Мэдэгдэлийг харуулж байна"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Анивчих мэдэгдлийн гэрэл"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Төхөөрөмж цоожтой үед"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүх мэдэгдлийн агуулгыг харуулах"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Нууц сэдэвтэй мэдэгдлийн агуулгыг нуух"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Мэдэгдлийг огт үзүүлэхгүй"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"\"Бүү саад бол\" идэвхжсэн үед"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Жагсаалтаас шинэ мэдэгдлийг нуух"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Жагсаалтын бүх мэдэгдлийг харуулах"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Aпп мэдэгдлүүд"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Хүрэлтийн дуунууд"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Диалпадын ая"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Дэлгэц түгжих &amp; түгжээс тайлах"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Бусад мэдрэгчийн ая"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Хүрэлтэнд чичрэх"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Мэдэгдлийн хандалт"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апп-ууд мэдэгдлийг уншиж чадахгүй"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d апп мэдэгдлийг уншиж чадна"</item>
+    <item quantity="other" msgid="980049191810249052">"%d апп-ууд мэдэгдлийг уншиж чадна"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Мэдэгдэл сонсогч суулгагдаагүй."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g>-г идэвхжүүлэх үү?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> нь систем буюу аливаа суулгасан апп-н гаргасан бүх мэдэгдлүүдийг унших боломжтой байна, үүнд харилцагчийн нэрс, танд ирсэн зурвасууд гэх мэт хувийн мэдээллүүд орж болно. Энэ мөн тэдгээр мэдэгдлүүдийг болиулах буюу тэдгээрийн доторх үйлдлийн товчнуудад хүрэх боломжтой."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Нөхцөл нийлүүлэгч"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Нөхцөл нийлүүлэх апп байхгүй"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d апп нөхцөлүүдийг нийлүүлнэ"</item>
+    <item quantity="other" msgid="358057362115673258">"%d апп нөхцөлүүдийг нийлүүлнэ"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Нөхцөл нийлүүлэгч суулгаагүй байна."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g>-г идэвхжүүлэх үү?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> нь \"Бүү саад бол\" горимоос гарах нөхцөлүүдийг нэмэх боломж олгоно."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Апп-уудыг ачаалж байна..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Мэдэгдлүүдийг харуулах"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Тэргүүний ач холбогдол"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Жагсаалтын эхэнд харуулах"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Төхөөрөмж түгжээтэй үед эмзэг агуулгыг нуух"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Хориглогдсон"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Жагсаалтын эхэнд"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Эмзэг"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Дууссан"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Идэвхгүй"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Идэвхтэй"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Таныг унтраах хүртэл"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Дараахаас бусад бүх тасалдлыг хориглох"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Шөнө"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Бусад автоматжуулалт"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Автоматаар асаах"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Хэзээ ч үгүй"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Утасны дуудлага"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Зурвасууд"</string>
@@ -2170,5 +2190,9 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Эхлэх цаг"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Дуусах цаг"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Дараагийн өдрийн <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Aпп мэдэгдлүүд"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Мэдэгдлийн тохиргоо"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Энэ төхөөрөмжийн талаар санал илгээх"</string>
+    <string name="switch_on_text" msgid="1124106706920572386">"Идэвхтэй"</string>
+    <string name="switch_off_text" msgid="1139356348100829659">"Идэвхгүй"</string>
 </resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 69ceb9c..888eb95 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Anda kini pemaju!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Tidak perlu, anda sudah pun menjadi pemaju."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WAYARLES &amp; RANGKAIAN"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"PERANTI"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERIBADI"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Hidupkan radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Matikan radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Hidupkan SMS pada IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Penyulitan"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Sulitkan tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Sulitkan telefon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Memerlukan PIN atau kata laluan angka untuk menyahsulit tablet anda setiap kali anda menghidupkannya"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Memerlukan PIN atau kata laluan angka untuk menyahsulit telefon anda setiap kali dan menghidupkannya"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Disulitkan"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan tablet anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit tablet anda kecuali dengan melakukan penetapan semula data kilang, yang memadamkan semua data anda.\n\nPenyulitan mengambil masa satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan tablet anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Anda boleh menyulitkan akaun anda, tetapan, apl yang dimuat turun dan datanya, media, dan fail-fail lain. Sebaik sahaja anda menyulitkan telefon anda, anda perlu menaip PIN nombor atau kata laluan untuk menyahsulit setiap kali anda menghidupkannya. Anda tidak boleh menyahsulit telefon anda kecuali dengan melakukan tetapan semula data kilang, yang memadamkan semua data anda.\n\nPenyulitan mengambil satu jam atau lebih. Anda mesti bermula dengan bateri yang telah dicas dan memastikan fon anda dipasang pada palam sehingga penyulitan selesai. Jika anda mengganggu proses penyulitan, anda akan kehilangan sebahagian atau semua data anda."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Sulitkan tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Sulitkan telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Cas bateri anda dan cuba lagi."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Lihat atau nyahaktifkan pentadbir peranti"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Ejen amanah"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Lihat atau nyahaktifkan ejen amanah"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Akses pemberitahuan"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apl tidak boleh membaca pemberitahuan"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d apl boleh membaca pemberitahuan"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apl boleh membaca pemberitahuan"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Tiada pendengar pemberitahuan dipasang."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Dayakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> akan dapat membaca semua pemberitahuan yang disiarkan oleh sistem atau mana-mana apl yang dipasang, yang mungkin termasuk maklumat peribadi seperti nama kenalan dan teks dalam mesej yang dihantar kepada anda. Pendengar juga akan dapat mengetepikan pemberitahuan ini atau menyentuh butang tindakan dalam pemberitahuan itu."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Pembekal keadaan"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Tiada apl yang menyediakan keadaan"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d apl menyediakan keadaan"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apl menyediakan keadaan"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Tiada pembekal keadaan dipasang."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Dayakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> akan dapat menambahkan keadaan keluar kepada mod Jangan Ganggu."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Hidupkan Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Sambung kepada rangkaian"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Lupakan rangkaian"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ubah suai"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Untuk melihat rangkaian yang tersedia, hidupkan Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Mencari rangkaian Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Anda tiada kebenaran untuk menukar rangkaian Wi-Fi."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tersedia)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", dijamin dengan <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Masukkan kata laluan rangkaian anda."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Tiada"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Untuk memperbaik ketepatan lokasi dan untuk tujuan lain, <xliff:g id="APP_NAME">%1$s</xliff:g> ingin menghidupkan imbasan rangkaian, walaupun semasa Wi-Fi dimatikan.\n\nBenarkan fungsi ini untuk semua apl yang ingin mengimbas?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Benarkan"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Skrin Utama"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Paparan"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Bunyi"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Kelantangan"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Kesan muzik"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Kelantangan pendering"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Getar apabila senyap"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Bunyi pemberitahuan lalai"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Lampu pemberitahuan denyutan"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop timbul jika keutamaan tggi"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nada dering"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Pemberitahuan"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Redam muzik &amp; media lain"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Redam pemberitahuan"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Redam penggera"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Bergetar apabila berdering"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Tetapan dok"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tukar orientasi secara automatik apabila memutarkan telefon"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Menukar orientasi secara automatik apabila memutarkan tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Tukar orientasi secara automatik apabila memutarkan telefon"</string>
-    <string name="brightness" msgid="2354961343555249270">"Kecerahan"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Laraskan kecerahan skrin"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Tidur"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Penyahpepijatan USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mod nyahpepijat apabila USB disambungkan"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Batalkan kebenaran penyahpepijatan USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Laporan pepijat menu kuasa"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Masukkan pilihan dalam menu kuasa untuk mengambil laporan pepijat"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Tetap berjaga"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrin tidak sekali-kali akan tidur semasa pengecasan"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Dayakan log intip HCI Bluetooth"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pic"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks pertuturan"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Gunakan bahasa sistem"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menetapkan suara khusus bahasa untuk teks pertuturan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengar contoh"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Alamat MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Taip kata laluan untuk menyahsulit storan"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Cuba lagi."</string>
     <string name="delete" msgid="4219243412325163003">"Padam"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fail Pelbagai"</string>
@@ -2018,8 +2014,7 @@
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Semak bukti kelayakan dipercayai"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Pengguna"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Pengguna &amp; profil"</string>
-    <!-- no translation found for user_add_user_or_profile_menu (6923838875175259418) -->
-    <skip />
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Tambah pengguna atau profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Tambah pengguna"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil terhad"</string>
     <string name="user_summary_managed_profile" msgid="5729429961989469287">"Profil yang diuruskan"</string>
@@ -2074,6 +2069,8 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Tukar saiz fon"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Ketik &amp; bayar"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Bayar dengan satu ketik sahaja"</string>
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Ketahui lebih lanjut"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Cari apl"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Jadikan sebagai pilihan anda?"</string>
@@ -2127,16 +2124,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Carian terbaru"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Hasil"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sambungan rangkaian"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Apabila peranti dikunci"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan kandungan pemberitahuan sensitif"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tunjukkan semua kandungan pemberitahuan"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Jangan ganggu"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Jangan ganggu"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Pemberitahuan"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Pengubah"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Sediakan Teg NFC WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Tulis"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Ketik teg untuk menulis..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Kata laluan tidak sah, cuba lagi."</string>
@@ -2144,19 +2133,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Tidak dapat menulis data kepada teg NFC. Jika masalah berterusan, sila cuba teg yang berbeza."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Teg NFC tidak boleh ditulis. Sila gunakan teg yang berbeza."</string>
     <string name="default_sound" msgid="8821684447333687810">"Bunyi lalai"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Jangan ganggu"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Nada dering telefon"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Bergetar apabila berdering"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Lampu pemberitahuan denyutan"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tunjukkan semua kandungan pemberitahuan"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan kandungan pemberitahuan sensitif"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan apl"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apl tidak boleh membaca pemberitahuan"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d apl boleh membaca pemberitahuan"</item>
+    <item quantity="other" msgid="980049191810249052">"%d apl boleh membaca pemberitahuan"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Tiada pendengar pemberitahuan dipasang."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Dayakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> akan dapat membaca semua pemberitahuan yang disiarkan oleh sistem atau mana-mana apl yang dipasang, yang mungkin termasuk maklumat peribadi seperti nama kenalan dan teks dalam mesej yang dihantar kepada anda. Pendengar juga akan dapat mengetepikan pemberitahuan ini atau menyentuh butang tindakan dalam pemberitahuan itu."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Pembekal keadaan"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Tiada apl yang menyediakan keadaan"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d apl menyediakan keadaan"</item>
+    <item quantity="other" msgid="358057362115673258">"%d apl menyediakan keadaan"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Tiada pembekal keadaan dipasang."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Dayakan <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> akan dapat menambahkan keadaan keluar kepada mod Jangan Ganggu."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Memuatkan apl..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Tunjukkan pemberitahuan"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Keutamaan tinggi"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Selesai"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Dimatikan"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Dihidupkan"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Sehingga anda matikan"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Sekat semua gangguan kecuali"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Pada waktu malam"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Automasi lain"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Hidupkan secara automatik"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Tidak pernah"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Panggilan telefon"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesej"</string>
@@ -2172,5 +2234,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Masa mula"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Masa tamat"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> hari seterusnya"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Pemberitahuan apl"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Tetapan pemberitahuan"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Hntr mklm balas mngenai peranti ini"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index eab529c..e53f10a 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -429,7 +429,7 @@
     <item msgid="3191973083884253830">"Ingen"</item>
     <item msgid="9089630089455370183">"Logcat"</item>
     <item msgid="5397807424362304288">"Systrace (grafikk)"</item>
-    <item msgid="1340692776955662664">"Ring stabel på glGetError"</item>
+    <item msgid="1340692776955662664">"Kall-stack ved glGetError"</item>
   </string-array>
   <string-array name="show_non_rect_clip_entries">
     <item msgid="993742912147090253">"Av"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 9dda4f6..d33bee1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Du er nå utvikler!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det trengs ikke, du er allerede utvikler."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLØST OG NETTVERK"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ENHET"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PRIVAT"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Trådløst og nettverk"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Enhet"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Personlig"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"System"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Slå på radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Slå av radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Aktiver tekstmelding via IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Krypter nettbrettet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Krypter telefon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Krev personlig tallkode eller passord for å dekryptere nettbrettet hver gang du slår det på"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Numerisk personlig kode eller passord kreves for å dekryptere telefonen hver gang du slår den på"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Kryptert"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer nettbrettet ditt, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere nettbrettet hver gang du slår det på. Du kan ikke fjerne krypteringen av nettbrettet uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet.\n\nDet tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at nettbrettet er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptere kontoene dine, innstillinger, nedlastede apper og tilhørende data, mediefiler og andre filer. Når du krypterer telefonen din, må du skrive inn en numerisk PIN-kode eller et passord for å dekryptere telefonen hver gang du slår den på. Du kan ikke fjerne krypteringen av telefonen uten å gjennomføre en tilbakestilling til fabrikkinnstillingene, noe som fører til at alle dataene blir slettet.\n\nDet tar minst én time å gjennomføre krypteringen. Du må starte med fulladet batteri og sørge for at telefonen er koblet til et strømuttak helt til krypteringen er fullført. Hvis du avbryter krypteringsprosessen, mister du deler av eller alle dataene dine."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Du kan kryptere kontoene og innstillingene dine, nedlastede apper med tilhørende data, media og andre filer. Etter at du har kryptert nettbrettet ditt, forutsatt at du har konfigurert en skjermlås (det vil si et mønster eller numerisk PIN-kode eller passord), må du låse opp skjermen for å dekryptere nettbrettet hver gang du slår det på. Den eneste andre måten å dekryptere det på, er ved bruk av en tilbakestilling til fabrikkstandard, som sletter alle dataene dine. \n\nKrypteringen tar en time eller mer. Du må starte med fulladet batteri og ha nettbrettet tilkoblet gjennom hele prosessen. Hvis du avbryter prosessen, mister du deler av eller alle dataene dine."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Du kan kryptere kontoene og innstillingene dine, nedlastede apper med tilhørende data, media og andre filer. Etter at du har kryptert telefonen, forutsatt at du har konfigurert en skjermlås (det vil si et mønster eller numerisk PIN-kode eller passord), må du låse opp skjermen for å dekryptere telefonen hver gang du slår den på. Den eneste andre måten å dekryptere den på, er ved bruk av en tilbakestilling til fabrikkstandard, som sletter alle dataene dine. \n\nKrypteringen tar en time eller mer. Du må starte med fulladet batteri og ha telefonen tilkoblet gjennom hele prosessen. Hvis du avbryter prosessen, mister du deler av eller alle dataene dine."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Krypter nettbrett"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Krypter telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Lad batteriet og prøv på nytt."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Se eller deaktiver enhetsadministratorer"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Tillitsagenter"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Se eller deaktiver tillitsagenter"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Varseltilgang"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apper kan ikke lese varsler"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app kan lese varsler"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apper kan lese varsler"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Ingen varselslyttere er installert."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vil du aktivere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan lese alle varsler lagt inn av systemet eller installerte apper. Dette kan omfatte personlig informasjon, som for eksempel kontaktnavn og innholdet i meldinger som sendes til deg. Den kan også avvise disse varslene, eller trykke på handlingsknapper i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Apper som inneholder vilkår"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ingen apper angir betingelser"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app angir betingelser"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apper angir betingelser"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ingen apper som angir vlkår er installert."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vil du aktivere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan legge til avslutsningsbetingelser for «Ikke forstyrr»-modusen."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Slå på Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Koble til nettverket"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Slett nettverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Endre nettverk"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Hvis du vil se tilgj. nettverk, slår du på Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Søker etter Wi-Fi-nettverk ..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har ikke tillatelse til å endre Wi-Fi-nettverk."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tilgjengelig)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", sikret med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Skriv inn nettverkspassordet ditt."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> ønsker å bruke nettverksskanning, også når Wi-Fi er slått av, for bedre posisjonsnøyaktighet og andre formål. \n\nVil du tillate dette for alle apper som prøver å skanne?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillat"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Startside"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skjerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Lyd"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Ringetone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumer"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikkeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringevolum"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrer ved stille modus"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standard varsellyd"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"La varsellampen pulsere"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Forgr.vindu ved høy prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringetone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Varsel"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Ignorer musikk og andre media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Ignorer varsler"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Ignorer alarmer"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrering når det ringer"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Forankringstasjon"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Innstillinger for forankringsstasjon"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Lyd"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Bytt orientering automatisk når telefonen blir snudd"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Bytt retning automatisk når nettbrettet roteres"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Bytt orientering automatisk når telefonen blir snudd"</string>
-    <string name="brightness" msgid="2354961343555249270">"Lysstyrke"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Hvilemodus"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivivitet"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB-debugging"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug-modus når USB er koblet til"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Tilbakekall autorisasjoner for USB-feilsøking"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Feilrapporter i på/av-menyen"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inkluder alternativet for å utføre feilrapport i batterimenyen"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Forbli våken"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjermen blir aldri svart under lading"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiver Bluetooth HCI snoop-logg"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adresse"</string>
     <string name="enter_password" msgid="4131758584074246224">"Skriv inn passordet for å dekryptere lagring"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Skriv inn PIN-koden for å dekryptere lagringen"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Tegn mønsteret ditt for å dekryptere lagringen"</string>
     <string name="try_again" msgid="4272075051293936921">"Prøv på nytt."</string>
     <string name="delete" msgid="4219243412325163003">"Slett"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse filer"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Endre skriftstørrelse"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Berøringsbetaling"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Betal med bare én berøring"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Prioriter forgrunnsapper"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Finn ut mer"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Finn apper"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Angi som foretrukket?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Nylige søk"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultater"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Når enheten er låst"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skjul sensitivt innhold i varslene"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt innhold i varslene"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Ikke forstyrr"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ikke forstyrr"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Varsler"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Finjustering"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appvarsler"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Konfigurer NFC-brikke for Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Trykk på en brikke for å skrive"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Ugyldig passord. Prøv på nytt."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Kunne ikke skrive data til NFC-brikken. Prøv en annen brikke hvis problemet vedvarer"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-brikken er skrivebeskyttet. Bruk en annen brikke."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardlyd"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Lyder og varsler"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Medievolum"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolum"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Ringevolum"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ikke forstyrr"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Ved innkommende anrop og varsler"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Varsellyd"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrer i stedet for å ringe"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Ikke ring eller vibrer"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Ringetone"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Standard varslingslyd"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrering når det ringer"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Viser varsler"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"La varsellampen pulsere"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Når enheten er låst"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt innhold i varslene"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skjul sensitivt innhold i varslene"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ikke vis varsler i det hele tatt"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Når ikke forstyrr er på"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Skjul nye varsler fra listen"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Vis alle varsler i listen"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Berøringslyder"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tastaturtoner"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Låsing og opplåsing av skjerm"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Andre berøringslyder"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrer ved berøring"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Varseltilgang"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apper kan ikke lese varsler"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d app kan lese varsler"</item>
+    <item quantity="other" msgid="980049191810249052">"%d apper kan lese varsler"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Ingen varselslyttere er installert."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vil du aktivere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan lese alle varsler lagt inn av systemet eller installerte apper. Dette kan omfatte personlig informasjon, som for eksempel kontaktnavn og innholdet i meldinger som sendes til deg. Den kan også avvise disse varslene, eller trykke på handlingsknapper i dem."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Apper som inneholder vilkår"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ingen apper angir betingelser"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d app angir betingelser"</item>
+    <item quantity="other" msgid="358057362115673258">"%d apper angir betingelser"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Ingen apper som angir vlkår er installert."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vil du aktivere <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan legge til avslutsningsbetingelser for «Ikke forstyrr»-modusen."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Laster inn apper …"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Vis varsler"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Høy prioritet"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Vis øverst på listen"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Skjul sensitivt innhold når enheten er låst"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokkert"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Øverst på listen"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitivt"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Ferdig"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Av"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"På"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Inntil du slår av funksjonen"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokkér alle forstyrrelser, med unntak av"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Om natten"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Annen automatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Slå på automatisk"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldri"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonsamtaler"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meldinger"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttidspunkt"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttidspunkt"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Kl. <xliff:g id="FORMATTED_TIME">%s</xliff:g> neste dag"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appvarsler"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Varselinnstillinger"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Send tilbakemelding om enheten"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 58d73bb..06f633f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"U bent nu ontwikkelaar!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Niet nodig, u bent al ontwikkelaar."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"DRAADLOOS EN NETWERKEN"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"APPARAAT"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSOONLIJK"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Draadloos en netwerken"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Apparaat"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Persoonlijk"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Systeem"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Radio inschakelen"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Radio uitschakelen"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Sms via IMS inschakelen"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encryptie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tablet versleutelen"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefoon versleutelen"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Een numerieke PIN-code of wachtwoord vereisen om uw tablet te decoderen wanneer u deze inschakelt"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Een numerieke PIN-code of wachtwoord vereisen om uw telefoon te decoderen wanneer u deze inschakelt"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Gecodeerd"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden versleutelen. Zodra u uw tablet heeft versleuteld, moet u telkens een pincode of wachtwoord opgeven om de tablet te ontsleutelen wanneer u deze opstart. U kunt het versleutelen van uw tablet uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist.\n\nHet versleutelen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en de tablet moet gedurende het versleutelen op de oplader zijn aangesloten. Als u het versleutelen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"U kunt uw account, instellingen, gedownloade apps en de bijbehorende gegevens, media en andere bestanden versleutelen. Zodra u uw telefoon heeft versleuteld, moet u telkens een pincode of wachtwoord opgeven om de telefoon te ontsleutelen wanneer u deze opstart. U kunt het versleutelen van uw telefoon uitsluitend ongedaan maken door de fabrieksinstellingen te herstellen. Daarbij worden al uw gegevens gewist.\n\nHet versleutelen kan een uur of langer duren. U moet beginnen met een volledig opgeladen accu en u moet de telefoon aansluiten op de oplader totdat het versleutelen is voltooid. Als u het versleutelen onderbreekt, kunt u sommige of al uw gegevens kwijtraken."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden coderen. Als u een schermvergrendeling heeft ingesteld (dat wil zeggen: een patroon of numerieke pincode of wachtwoord), moet u na het coderen van uw tablet het scherm ontgrendelen om de tablet te decoderen wanneer u de tablet inschakelt. De enige andere manier om de tablet te decoderen is de fabrieksinstellingen terugzetten, waarbij al uw gegevens worden gewist.\n\nCodering duurt een uur of langer. U moet beginnen met een opgeladen accu en uw tablet moet gedurende het proces zijn aangesloten op een stopcontact. Als u het proces onderbreekt, verliest u een aantal of alle gegevens."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"U kunt uw accounts, instellingen, gedownloade apps en bijbehorende gegevens, media en andere bestanden coderen. Als u een schermvergrendeling heeft ingesteld (dat wil zeggen: een patroon of numerieke pincode of wachtwoord), moet u na het coderen van uw telefoon het scherm ontgrendelen om de telefoon te decoderen wanneer u de telefoon inschakelt. De enige andere manier om de telefoon te decoderen is de fabrieksinstellingen terugzetten, waarbij al uw gegevens worden gewist.\n\nCodering duurt een uur of langer. U moet beginnen met een opgeladen accu en uw telefoon moet gedurende het proces zijn aangesloten op een stopcontact. Als u het proces onderbreekt, verliest u een aantal of alle gegevens."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet versleutelen"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefoon versleutelen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laad de accu op en probeer het opnieuw."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Apparaatbeheerders weergeven of uitschakelen"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust-agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Trust-agents bekijken of uitschakelen"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Toegang tot meldingen"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps kunnen geen meldingen lezen"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app kan meldingen lezen"</item>
-    <item quantity="other" msgid="980049191810249052">"%d apps kunnen meldingen lezen"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Er zijn geen listeners voor meldingen geïnstalleerd."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> inschakelen?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan alle meldingen lezen die door het systeem of een geïnstalleerde app worden gegenereerd, waaronder mogelijk persoonlijke gegevens zoals de namen van contacten en de tekst van berichten die naar u worden verzonden. De app kan deze meldingen ook sluiten of actieknoppen in de meldingen aanraken."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Apps die voorwaarden leveren"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Er zijn geen apps die voorwaarden leveren"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app levert voorwaarden"</item>
-    <item quantity="other" msgid="358057362115673258">"%d apps leveren voorwaarden"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Er zijn geen apps geïnstalleerd die voorwaarden leveren."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> inschakelen?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan voorwaarden voor sluiten toevoegen voor de modus \'Niet storen\'."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth inschakelen"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Verbinding maken met netwerk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Netwerk vergeten"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Netwerk aanpassen"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Schakel wifi in om beschikbare netwerken te zien."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wifi-netwerken zoeken…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"U heeft geen toestemming om het wifi-netwerk te wijzigen."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS beschikbaar)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", beveiligd met <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Geef uw netwerkwachtwoord op."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Geen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Om de locatieprecisie te verbeteren en voor andere doeleinden, wil <xliff:g id="APP_NAME">%1$s</xliff:g> de netwerkscan inschakelen, zelfs als wifi is uitgeschakeld.\n\nDit toestaan voor alle apps die willen scannen?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Toestaan"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Startpagina"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Weergave"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Geluid"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Muziekeffecten"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Belvolume"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Trillen indien stil"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standaardmeldingsgeluid"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Knipperen meldingslampje"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up bij hoge prioriteit"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Beltoon"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Melding"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Muziek en andere media dempen"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Meldingen dempen"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Wekkers dempen"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Trillen bij bellen"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Docken"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Instellingen voor dockstation"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Stand automatisch wijzigen als telefoon wordt gedraaid"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Stand automatisch wijzigen als tablet wordt gedraaid"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Stand automatisch wijzigen als telefoon wordt gedraaid"</string>
-    <string name="brightness" msgid="2354961343555249270">"Helderheid"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Slaapstand"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Achtergrond"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB-foutopsporing"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Foutopsporingsmodus bij USB-verbinding"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Autorisatie voor USB-foutopsporing intrekken"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Foutenrapporten in afsluitmenu"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Optie opnemen in afsluitmenu voor het genereren van een foutenrapport"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Stand-by"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Scherm gaat nooit uit tijdens het opladen"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Snoop-logbestand voor Bluetooth-HCI inschakelen"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-adres"</string>
     <string name="enter_password" msgid="4131758584074246224">"Typ een wachtwoord om de opslag te decoderen"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Geef uw pincode op om de opslag te decoderen"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Teken uw patroon om de opslag te decoderen"</string>
     <string name="try_again" msgid="4272075051293936921">"Probeer het opnieuw."</string>
     <string name="delete" msgid="4219243412325163003">"Verwijderen"</string>
     <string name="misc_files" msgid="6720680815969643497">"Diverse bestanden"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Lettergrootte wijzigen"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tikken en betalen"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Betaal met één tik"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"App op voorgrond prefereren"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Meer informatie"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Apps zoeken"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Instellen als uw voorkeur?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Recente zoekopdrachten"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultaten"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi netwerk verbinding"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Bij vergrendeld apparaat"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Inhoud van gevoelige meldingen verbergen"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Inhoud van alle meldingen weergeven"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Niet storen"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Niet storen"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Meldingen"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Aanpassingen"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-meldingen"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"NFC-tag voor wifi instellen"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Schrijven"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tik op een tag om te schrijven..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Ongeldig wachtwoord. Probeer het opnieuw."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Kan geen gegevens schrijven naar NFC-tag. Als het probleem blijft optreden, probeert u een andere tag."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC-tag is niet beschrijfbaar. Gebruik een andere tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standaardgeluid"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Geluid en meldingen"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Mediavolume"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolume"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Beltoonvolume"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Niet storen"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Bij inkomende oproepen en meldingen"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Bellen"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Trillen in plaats van bellen"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Niet bellen of trillen"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Beltoon telefoon"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Standaardbeltoon voor meldingen"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Trillen bij bellen"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Meldingen weergeven"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Knipperen meldingslampje"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Bij vergrendeld apparaat"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Inhoud van alle meldingen weergeven"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Inhoud van gevoelige meldingen verbergen"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Helemaal geen meldingen weergeven"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Wanneer \'Niet storen\' is ingeschakeld"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Nieuwe meldingen verbergen in de lijst"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Alle meldingen weergeven in de lijst"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"App-meldingen"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Aanraakgeluiden"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toetsenbloktonen"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Schermvergrendeling en -ontgrendeling"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Andere aanraakgeluiden"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Trillen bij aanraking"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Toegang tot meldingen"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Apps kunnen geen meldingen lezen"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d app kan meldingen lezen"</item>
+    <item quantity="other" msgid="980049191810249052">"%d apps kunnen meldingen lezen"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Er zijn geen listeners voor meldingen geïnstalleerd."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> inschakelen?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kan alle meldingen lezen die door het systeem of een geïnstalleerde app worden gegenereerd, waaronder mogelijk persoonlijke gegevens zoals de namen van contacten en de tekst van berichten die naar u worden verzonden. De app kan deze meldingen ook sluiten of actieknoppen in de meldingen aanraken."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Apps die voorwaarden leveren"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Er zijn geen apps die voorwaarden leveren"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d app levert voorwaarden"</item>
+    <item quantity="other" msgid="358057362115673258">"%d apps leveren voorwaarden"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Er zijn geen apps geïnstalleerd die voorwaarden leveren."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> inschakelen?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan voorwaarden voor sluiten toevoegen voor de modus \'Niet storen\'."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Apps laden..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Meldingen weergeven"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Hoge prioriteit"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Boven aan de lijst weergeven"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Gevoelige inhoud verbergen wanneer het apparaat is vergrendeld"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Geblokkeerd"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Bovenkant lijst"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Gevoelig"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gereed"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Uit"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Aan"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Totdat u dit uitschakelt"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Alle onderbrekingen blokkeren behalve"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"\'s Nachts"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Andere automatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automatisch inschakelen"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nooit"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefoonoproepen"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Berichten"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttijd"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Eindtijd"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> de volgende dag"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"App-meldingen"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Instellingen voor meldingen"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Feedback sturen over dit apparaat"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 9820dea..579d3c3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Jesteś teraz programistą!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"W porządku, już jesteś programistą."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"SIECI ZWYKŁE I BEZPRZEWODOWE"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"URZĄDZENIE"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"OSOBISTE"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Sieci zwykłe i bezprzewodowe"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Urządzenie"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Osobiste"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"System"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Włącz radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Wyłącz radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Włącz SMS przez IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Szyfrowanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Zaszyfruj telefon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania tabletu przy każdym uruchomieniu"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Wymagaj podania kodu PIN lub hasła w celu odszyfrowania telefonu przy każdym uruchomieniu"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Zaszyfrowane"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu tabletu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Tablet można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych.\n\nSzyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj tabletu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje i ich dane, multimedia oraz inne pliki. Po zaszyfrowaniu telefonu musisz wpisać numeryczny kod PIN lub hasło do odszyfrowania po każdym włączeniu urządzenia. Telefon można odszyfrować jedynie przez przywrócenie danych fabrycznych i usunięcie wszystkich swoich danych.\n\nSzyfrowanie może potrwać godzinę lub dłużej. Rozpocznij, gdy bateria jest w pełni naładowana i nie odłączaj telefonu od zasilania do chwili ukończenia szyfrowania. Jeśli proces zostanie przerwany, utracisz część lub nawet wszystkie swoje dane."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania tabletu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia będziesz musiał odblokować ekran, by odszyfrować dane. Jedynym innym sposobem odszyfrowania tabletu jest przywrócenie danych fabrycznych, co powoduje usunięcie wszystkich zapisanych danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj tabletu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Możesz zaszyfrować swoje konta, ustawienia, pobrane aplikacje wraz z danymi oraz pliki multimedialne i inne. Jeśli korzystasz z szyfrowania telefonu i masz na nim ustawione blokowanie ekranu (wykorzystujesz do tego wzór, kod PIN lub hasło), po każdym uruchomieniu urządzenia będziesz musiał odblokować ekran, by odszyfrować dane. Jedynym innym sposobem odszyfrowania telefonu jest przywrócenie danych fabrycznych, co powoduje usunięcie wszystkich zapisanych danych.\n\nSzyfrowanie trwa co najmniej godzinę. Przed jego rozpoczęciem naładuj baterię, a w trakcie nie odłączaj telefonu od zasilania. Przerwanie procesu szyfrowania spowoduje utratę części lub wszystkich danych."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Zaszyfruj tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Zaszyfruj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Naładuj baterię i spróbuj ponownie."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Wyświetl lub dezaktywuj administratorów urządzenia"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agenty zaufania"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Wyświetl lub wyłącz agenty zaufania"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Dostęp do powiadomień"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacje nie mogą odczytywać powiadomień"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikacja może odczytywać powiadomienia"</item>
-    <item quantity="other" msgid="980049191810249052">"Aplikacje, które mogą odczytywać powiadomienia: %d"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Brak zainstalowanych odbiorników powiadomień."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Włączyć usługę <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Usługa <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> będzie w stanie odczytywać wszystkie wysyłane przez system lub dowolną zainstalowaną aplikację powiadomienia, które mogą zawierać informacje osobiste, takie jak nazwy kontaktów oraz tekst wiadomości wysłanych do Ciebie. Usługa będzie również mogła odrzucać te powiadomienia lub używać przycisków czynności w ich obrębie."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Dostawcy warunków"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Żadne aplikacje nie dostarczają warunków"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Warunki dostarcza %d aplikacja"</item>
-    <item quantity="other" msgid="358057362115673258">"Warunki dostarcza kilka aplikacji (%d)"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Brak zainstalowanych dostawców warunków."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Włączyć usługę <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> będzie mieć możliwość dodania warunków zamknięcia do trybu Nie przeszkadzać."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Włącz Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Połącz z siecią"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Zapomnij sieć"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modyfikuj sieć"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Aby zobaczyć dostępne sieci, włącz Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Wyszukuję sieci Wi-Fi…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nie masz uprawnień do zmiany sieci Wi‑Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (protokół WPS dostępny)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpieczona za pomocą protokołu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Wpisz hasło do sieci."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Brak"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aby poprawić dokładność lokalizacji (i w innych celach), <xliff:g id="APP_NAME">%1$s</xliff:g> chce włączyć skanowanie sieci – nawet gdy Wi-Fi jest wyłączone.\n\nZezwolić na to wszystkim aplikacjom, które chcą wykonywać skanowanie?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Zezwól"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Strona główna"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Wyświetlacz"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Dźwięk"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Głośność"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efekty muzyczne"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Głośność dzwonka"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Wibracje po wyciszeniu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Domyślny dźwięk powiadomienia"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsująca dioda"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Z okienkiem (wysoki priorytet)"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Dzwonek"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Powiadomienie"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Wycisz muzykę i inne multimedia"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Wycisz powiadomienia"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Wycisz alarmy"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Wibracje i dzwonek"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Podstawka"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Ustawienia podstawki"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Dźwięk"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Automatycznie przełącz orientację przy obracaniu telefonu"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Automatycznie przełącz orientację przy obracaniu tabletu"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Automatycznie przełącz orientację przy obracaniu telefonu"</string>
-    <string name="brightness" msgid="2354961343555249270">"Jasność ekranu"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Uśpienie"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Debugowanie USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Tryb debugowania, gdy podłączone jest USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Odwołaj autoryzacje do debugowania USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Błędy w menu zasilania"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Dodaj w menu zasilania opcję zgłaszania błędów"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Pozostaw ekran włączony"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Włącz dziennik analizatora snoop Bluetooth HCI"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adres MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Wpisz hasło, aby odszyfrować pamięć masową."</string>
+    <string name="enter_pin" msgid="286221169871526876">"Wpisz kod PIN, by odszyfrować pamięć"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Narysuj wzór, by odszyfrować pamięć"</string>
     <string name="try_again" msgid="4272075051293936921">"Spróbuj ponownie."</string>
     <string name="delete" msgid="4219243412325163003">"Usuń"</string>
     <string name="misc_files" msgid="6720680815969643497">"Różne pliki"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Zmień rozmiar czcionki"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Dotknij i zapłać"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Płać jednym dotknięciem"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Preferuj aplikację na pierwszym planie"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Dowiedz się więcej"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Znajdź aplikacje"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Ustawić jako Twoją preferencję?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Niedawno wyszukiwane hasła"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Wyniki"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi połączenie internet"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Gdy urz. jest zablokowane"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ukryj poufne informacje w powiadomieniach"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaż wszystkie informacje w powiadomieniach"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Nie przeszkadzać"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nie przeszkadzać"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Powiadomienia"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Dodatkowe opcje"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Powiadom. aplikacji"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Skonfiguruj tag NFC Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Zapisz"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Kliknij tag, by zapisać..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Nieprawidłowe hasło. Spróbuj ponownie."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Nie można zapisać danych na tagu NFC. Jeśli problem nie ustąpi, użyj innego tagu"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Tag NFC nie pozwala na zapis. Użyj innego tagu."</string>
     <string name="default_sound" msgid="8821684447333687810">"Dźwięk domyślny"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Dźwięki i powiadomienia"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Głośność multimediów"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Głośność alarmu"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Głośność dzwonka"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nie przeszkadzać"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Gdy ktoś dzwoni i przychodzą powiadomienia"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Dzwoń"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Wibruj zamiast dzwonić"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Nie dzwoń i nie wibruj"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Dzwonek telefonu"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Domyślny dzwonek powiadomień"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Wibracje i dzwonek"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Pokazywanie powiadomień"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsująca dioda"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Gdy urządzenie jest zablokowane"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaż wszystkie informacje w powiadomieniach"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ukryj poufne informacje w powiadomieniach"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nie pokazuj żadnych powiadomień"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Po włączeniu „Nie przeszkadzać”"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ukrywaj nowe powiadomienia na liście"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Pokazuj wszystkie powiadomienia na liście"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Powiadomienia aplikacji"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Dźwięki przy dotknięciu"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dźwięki wybierania numeru"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Blokowanie i odblokowywanie ekranu"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Inne dźwięki przy dotknięciu"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Wibracje przy dotknięciu"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Dostęp do powiadomień"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacje nie mogą odczytywać powiadomień"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplikacja może odczytywać powiadomienia"</item>
+    <item quantity="other" msgid="980049191810249052">"Aplikacje, które mogą odczytywać powiadomienia: %d"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Brak zainstalowanych odbiorników powiadomień."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Włączyć usługę <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Usługa <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> będzie w stanie odczytywać wszystkie wysyłane przez system lub dowolną zainstalowaną aplikację powiadomienia, które mogą zawierać informacje osobiste, takie jak nazwy kontaktów oraz tekst wiadomości wysłanych do Ciebie. Usługa będzie również mogła odrzucać te powiadomienia lub używać przycisków czynności w ich obrębie."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Dostawcy warunków"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Żadne aplikacje nie dostarczają warunków"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"Warunki dostarcza %d aplikacja"</item>
+    <item quantity="other" msgid="358057362115673258">"Warunki dostarcza kilka aplikacji (%d)"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Brak zainstalowanych dostawców warunków."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Włączyć usługę <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> będzie mieć możliwość dodania warunków zamknięcia do trybu Nie przeszkadzać."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Wczytuję aplikacje..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Pokaż powiadomienia"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Wysoki priorytet"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Wyświetlaj na początku listy"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ukrywaj informacje poufne, gdy urządzenie jest zablokowane"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Zablokowane"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Na początek listy"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Poufne"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Gotowe"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Wyłączony"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Włączony"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dopóki nie wyłączysz"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Zablokuj wszystkie powiadomienia poza"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"W nocy"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Inna automatyzacja"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Włącz automatycznie"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nigdy"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefony"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Wiadomości"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Godzina rozpoczęcia"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Godzina zakończenia"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> następnego dnia"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Powiadom. aplikacji"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Ustawienia powiadomień"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Prześlij opinię o tym urządzeniu"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 7b7036c..1ca7b9e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Agora é um programador!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário, já é um programador."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"REDES SEM FIOS E OUTRAS"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PESSOAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Sem fios e redes"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Pessoal"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Sistema"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Ligar rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desligar rádio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Ativar SMS via IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Encriptação"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Encriptar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Encriptar telefone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o tablet sempre que o ligar"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necessita de um PIN numérico ou de palavra-passe para desencriptar o telefone sempre que o ligar"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o tablet, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o tablet, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados.\n\nA encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o tablet ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Pode encriptar contas, definições, aplicações e dados transferidos, ficheiros multimédia e outros ficheiros. Após encriptar o telemóvel, é necessário introduzir um PIN numérico ou uma palavra-passe para o desencriptar sempre que o ligar. Não é possível desencriptar o telemóvel, exceto através da realização de uma reposição de dados de fábrica, apagando todos os seus dados.\n \nA encriptação demora uma hora ou mais. Deve iniciar com uma bateria carregada e manter o telemóvel ligado até a encriptação estar concluída. Se interromper o processo de encriptação, irá perder alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Pode encriptar contas, definições, aplicações transferidas e os respetivos dados, ficheiros multimédia e outros. Depois de encriptar o seu tablet, assumindo que configurou um bloqueio de ecrã (ou seja, um padrão ou PIN numérico ou uma palavra-passe), terá de desbloquear o ecrã para desencriptar o tablet sempre que o ligar. A outra única forma de desencriptar é efetuar uma reposição de dados de fábrica, apagando todos os seus dados.\n\nA encriptação demora uma hora ou mais. Tem de iniciar com uma bateria carregada e manter o tablet ligado durante o processo. Se interromper, irá perder alguns ou todos os seus dados."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Pode encriptar contas, definições, aplicações transferidas e os respetivos dados, ficheiros multimédia e outros. Depois de encriptar o seu telemóvel, assumindo que configurou um bloqueio de ecrã (ou seja, um padrão ou PIN numérico ou uma palavra-passe), terá de desbloquear o ecrã para desencriptar o telemóvel sempre que o ligar. A outra única forma de desencriptar é efetuar uma reposição de dados de fábrica, apagando todos os seus dados.\n\nA encriptação demora uma hora ou mais. Tem de iniciar com uma bateria carregada e manter o telemóvel ligado durante o processo. Se interromper, irá perder alguns ou todos os seus dados."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Encriptar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Encriptar telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue a bateria e tente novamente."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ver ou desativar administradores do dispositivo"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Ver ou desativar trust agents"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Acesso a notificações"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"As aplicações não conseguem ler notificações"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicação consegue ler notificações"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicações conseguem ler notificações"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum serviço de escuta de notificações instalado."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> conseguirá ler todas as notificações publicadas pelo sistema ou qualquer aplicação instalada, e poderão incluir informações pessoais, como nomes de contactos e o texto de mensagens que lhe foram enviadas. Conseguirá ainda ignorar estas notificações ou tocar nos respetivos botões de ação."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nenhuma aplicação fornece condições"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"A aplicação %d fornece condições"</item>
-    <item quantity="other" msgid="358057362115673258">"As aplicações %d fornecem condições"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Não estão instalados fornecedores de condições."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Será possível a <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> adicionar condições de saída do modo não incomodar."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ligar a uma rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver as redes disponíveis, ligue o Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"A pesquisar redes Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Não tem autorização para alterar a rede Wi‑Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Introduza a sua palavra-passe de rede."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para melhorar a precisão da localização e para outros fins, <xliff:g id="APP_NAME">%1$s</xliff:g> pretende ativar a verificação de redes, mesmo quando o Wi-Fi está desativado.\n\nPermitir esta opção para todas as aplicações que pretenderem verificar?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Página Inicial"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Visor"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos musicais"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar quando estiver em silêncio"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Som de notificação predefinido"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Sinalizar luz de notificação"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up se prioridade alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Desativar som de música e outros elementos multimédia"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Desativar som de notificações"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Desativar som de alarmes"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar ao tocar"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Estação de ancoragem"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Definições da estação de ancoragem"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Áudio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Mudar orientação automaticamente ao rodar o telefone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Mudar orientação automaticamente ao rodar o tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Mudar orientação automaticamente ao rodar o telefone"</string>
-    <string name="brightness" msgid="2354961343555249270">"Brilho"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Suspensão"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração com USB ligado"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depur. USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Relatórios de erros do menu avançado"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir opção no menu avançado para criar um relatório de erros"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Manter ativo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"O ecrã nunca entrará em suspensão durante o carregamento"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar registo de monit. Bluetooth HCI"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC de 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduzir palavra-passe para desencriptar armazenamento"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Introduzir o PIN para desencriptar o armazenamento"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Desenhar o padrão para desencriptar o armazenamento"</string>
     <string name="try_again" msgid="4272075051293936921">"Tente novamente."</string>
     <string name="delete" msgid="4219243412325163003">"Eliminar"</string>
     <string name="misc_files" msgid="6720680815969643497">"Ficheiros diversos"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da letra"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tocar e pagar"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Pagar com apenas um toque"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Preferir aplicação em primeiro plano"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Saiba mais"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Encontrar aplicações"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Definir como preferência?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Pesquisas recentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ligação a rede Wi-Fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Com dispositivo bloqueado"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar conteúdo de notificação sensível"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificação"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Não incomodar"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Não incomodar"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notificações"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustes"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Not. da aplicação"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurar etiqueta NFC para Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Escrever"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque numa etiqueta para escrever..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Palavra-passe inválida, tente novamente."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Não é possível escrever dados na etiqueta NFC. Caso o problema persista, experimente uma etiqueta diferente"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"A etiqueta NFC não é gravável. Utilize uma etiqueta diferente."</string>
     <string name="default_sound" msgid="8821684447333687810">"Som predefinido"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Sons e notificações"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume de multimédia"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume do alarme"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume do toque"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Não incomodar"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Quando entram chamadas e notificações"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Tocar"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrar em vez de tocar"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Não tocar nem vibrar"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação predefinido"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar ao tocar"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"A mostrar notificações"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Sinalizar luz de notificação"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Com dispositivo bloqueado"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificação"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar conteúdo de notificação sensível"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Não mostrar qualquer notificação"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quando não perturbar está ativado"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ocultar novas notificações a partir da lista"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostrar todas as notificações na lista"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações da aplicação"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Sons de toque"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Sons do teclado"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Bloqueio e desbloqueio do ecrã"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Outros sons de toque"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrar ao tocar"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"As aplicações não conseguem ler notificações"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplicação consegue ler notificações"</item>
+    <item quantity="other" msgid="980049191810249052">"%d aplicações conseguem ler notificações"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum serviço de escuta de notificações instalado."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> conseguirá ler todas as notificações publicadas pelo sistema ou qualquer aplicação instalada, e poderão incluir informações pessoais, como nomes de contactos e o texto de mensagens que lhe foram enviadas. Conseguirá ainda ignorar estas notificações ou tocar nos respetivos botões de ação."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nenhuma aplicação fornece condições"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"A aplicação %d fornece condições"</item>
+    <item quantity="other" msgid="358057362115673258">"As aplicações %d fornecem condições"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Não estão instalados fornecedores de condições."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Será possível a <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> adicionar condições de saída do modo não incomodar."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"A carregar aplicações..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostrar notificações"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioridade alta"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Apresentar no início da lista"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ocultar conteúdo sensível quando o dispositivo está bloqueado"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueado"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Início da lista"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensível"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Desativado"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Ativado"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Até que o utilizador desative"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloquear todas as interrupções, exceto"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"À noite"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Outras automatizações"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ligar automaticamente."</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Chamadas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Hora de início"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Hora de fim"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Not. da aplicação"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Definições de notificações"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar comentários do dispositivo"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 89a7a3c..2d00ab0 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Você agora é um desenvolvedor!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Não é necessário. Você já é um desenvolvedor."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"REDES SEM FIO E OUTRAS"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DISPOSITIVO"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PESSOAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEMA"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Ativar o rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Desativar o rádio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Ligar SMS sobre IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptografia"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptografar tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptografar telefone"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Exigir um PIN numérico ou uma senha para decodificar seu tablet sempre que ligá-lo"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Exigir um PIN numérico ou senha para decodificar seu telefone sempre que ligá-lo"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu tablet, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu tablet, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu tablet conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Você pode criptografar suas contas, configurações, aplicativos transferidos e seus dados, mídia e outros arquivos. Após criptografar seu telefone, será necessário digitar um PIN numérico ou senha para descriptografar toda vez que você ligá-lo. Não é possível desfazer a criptografia em seu telefone, exceto se realizar uma redefinição para configuração original, apagando todos os seus dados.\n\nA criptografia leva um hora ou mais. Você deve iniciar com a bateria carregada e manter seu telefone conectado até que a criptografia seja concluída. Se você interromper o processo de criptografia, perderá alguns ou todos os seus dados."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptografar tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptografar telefone"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Carregue sua bateria e tente novamente."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visualizar ou desativar administradores do dispositivo"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agentes de confiança"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Ver ou desativar agentes de confiança"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Acesso a notificações"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Os aplicativos não podem ler notificações"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicativo pode ler notificações"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicativos podem ler notificações"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum ouvinte de notificações instalado."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificações postadas pelo sistema ou por qualquer aplicativo instalado, que poderão incluir informações pessoais como nomes de contatos e textos de mensagens enviadas para você. Também poderá dispensar essas notificações ou tocar em botões de ação incluídos nelas."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nenhum aplicativo fornece condições"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplicativo fornece condições"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplicativos fornecem condições"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nenhum fornecedor de condições instalado."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> poderá adicionar condições de saída ao modo Não perturbe."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Ativar Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectar-se à rede"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Esquecer a rede"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificar rede"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para ver as redes disponíveis, ative o Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Procurando redes Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Você não tem permissão para alterar a rede Wi-Fi."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponível)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", protegido por <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Insira a senha da rede."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Nenhuma"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Para aumentar a precisão da localização e outras finalidades, <xliff:g id="APP_NAME">%1$s</xliff:g> quer ativar a verificação de rede, mesmo que o Wi-Fi esteja desligado.\n\nPermitir isto para todos os aplicativos que quiserem verificar?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permitir"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Início"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Tela"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Som"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumes"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efeitos sonoros"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume da campainha"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar no modo silencioso"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Som de notificação padrão"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsar luz de notificação"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up para prioridade alta"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Toque"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificação"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Desativar música e outras mídias"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Desativar notificações"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Desativar alarmes"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar ao tocar"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Configurações de dock"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Áudio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Alternar orientação automaticamente ao girar o telefone"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Alternar orientação automaticamente ao girar o tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Alternar orientação automaticamente ao girar o telefone"</string>
-    <string name="brightness" msgid="2354961343555249270">"Brilho"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Modo de espera"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração quando o USB estiver conectado"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depuração USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Relat. de bugs menu do b. ligar"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Incluir a opção de obter um relatório de bugs no menu do botão de ligar"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar log de rastr. Bluetooth HCI"</string>
@@ -1821,6 +1814,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Endereço MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Digite a senha para descriptografar o armazenamento"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Tente novamente."</string>
     <string name="delete" msgid="4219243412325163003">"Excluir"</string>
     <string name="misc_files" msgid="6720680815969643497">"Arquivos variados"</string>
@@ -2073,6 +2070,8 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Alterar tamanho da fonte"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Tocar e pagar"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Pague com um toque"</string>
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Saiba mais"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Encontrar aplicativos"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Definir como preferência?"</string>
@@ -2126,16 +2125,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Pesquisas recentes"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultados"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi rede conexão"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Com o disposit. bloqueado"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar o conteúdo confidencial de notificações"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Não perturbe"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Não perturbe"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notificações"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Ajustes"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificações de apps"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurar marca NFC para Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Gravar"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Toque em uma marca para gravar…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Senha inválida, tente novamente."</string>
@@ -2143,19 +2134,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Não foi possível gravar os dados na marca NFC. Se o problema persistir, tente outra marca."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"A marca NFC não é gravável. Use outra marca."</string>
     <string name="default_sound" msgid="8821684447333687810">"Som padrão"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando aplicativos…"</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Não perturbe"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Toque do telefone"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar ao tocar"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsar luz de notificação"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar o conteúdo confidencial de notificações"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicativos"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Os aplicativos não podem ler notificações"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplicativo pode ler notificações"</item>
+    <item quantity="other" msgid="980049191810249052">"%d aplicativos podem ler notificações"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nenhum ouvinte de notificações instalado."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> poderá ler todas as notificações postadas pelo sistema ou por qualquer aplicativo instalado, que poderão incluir informações pessoais como nomes de contatos e textos de mensagens enviadas para você. Também poderá dispensar essas notificações ou tocar em botões de ação incluídos nelas."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Fornecedores de condições"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nenhum aplicativo fornece condições"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d aplicativo fornece condições"</item>
+    <item quantity="other" msgid="358057362115673258">"%d aplicativos fornecem condições"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nenhum fornecedor de condições instalado."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Ativar <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> poderá adicionar condições de saída ao modo Não perturbe."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Carregando aplicativos…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Mostrar notificações"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioridade alta"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Concluído"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Desativado"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Ativado"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Até você desativar"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Bloquear todas as interrupções, exceto"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"À noite"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Outra automação"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Ativar automaticamente"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nunca"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Chamadas telefônicas"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mensagens"</string>
@@ -2171,5 +2235,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Horário de início"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Horário de término"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> do dia seguinte"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificações de apps"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Configurações de notificação"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Enviar feedback sobre o dispositivo"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 73362bd..71e2a99 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -31,13 +31,13 @@
     <skip />
     <!-- no translation found for show_dev_already (2151632240145446227) -->
     <skip />
-    <!-- no translation found for header_category_wireless_networks (4944823405420438623) -->
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
     <skip />
-    <!-- no translation found for header_category_device (5781174212691167553) -->
+    <!-- no translation found for header_category_device (4544026001618307754) -->
     <skip />
-    <!-- no translation found for header_category_personal (6225932173498802187) -->
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
     <skip />
-    <!-- no translation found for header_category_system (2073558547468647128) -->
+    <!-- no translation found for header_category_system (2816866961183068977) -->
     <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Activar il signal radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Deactivar la connexiun radiofonica"</string>
@@ -476,15 +476,11 @@
     <skip />
     <!-- no translation found for crypt_keeper_encrypt_title (1878996487755806122) -->
     <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (6291564408810586) -->
-    <skip />
-    <!-- no translation found for crypt_keeper_encrypt_summary (514138079795442371) -->
-    <skip />
     <!-- no translation found for crypt_keeper_encrypted_summary (1868233637888132906) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (3839235202103924154) -->
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
     <skip />
-    <!-- no translation found for crypt_keeper_desc (7663118199519229502) -->
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
     <skip />
     <!-- no translation found for crypt_keeper_button_text (1189623490604750854) -->
     <skip />
@@ -629,30 +625,6 @@
     <skip />
     <!-- no translation found for manage_trust_agents_summary (6804319935640148441) -->
     <skip />
-    <!-- no translation found for manage_notification_access (5799781079264981979) -->
-    <skip />
-    <!-- no translation found for manage_notification_access_summary_zero (2409912785614953348) -->
-    <skip />
-    <!-- no translation found for manage_notification_access_summary_nonzero:one (8344183614159211585) -->
-    <!-- no translation found for manage_notification_access_summary_nonzero:other (980049191810249052) -->
-    <!-- no translation found for no_notification_listeners (2767405417723149879) -->
-    <skip />
-    <!-- no translation found for notification_listener_security_warning_title (6494221261778885893) -->
-    <skip />
-    <!-- no translation found for notification_listener_security_warning_summary (2780319203595885564) -->
-    <skip />
-    <!-- no translation found for manage_condition_providers (3039306415273606730) -->
-    <skip />
-    <!-- no translation found for manage_condition_providers_summary_zero (3760902189574984100) -->
-    <skip />
-    <!-- no translation found for manage_condition_providers_summary_nonzero:one (7871716594997778198) -->
-    <!-- no translation found for manage_condition_providers_summary_nonzero:other (358057362115673258) -->
-    <!-- no translation found for no_condition_providers (6183782892066424125) -->
-    <skip />
-    <!-- no translation found for condition_provider_security_warning_title (5834347345913614926) -->
-    <skip />
-    <!-- no translation found for condition_provider_security_warning_summary (640037330610551763) -->
-    <skip />
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activar Bluetooth"</string>
     <!-- no translation found for bluetooth_settings (1810521656168174329) -->
@@ -886,6 +858,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Connectar cun la rait"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Allontanar la rait"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Midar la rait"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <!-- no translation found for wifi_empty_list_wifi_off (8056223875951079463) -->
     <skip />
     <!-- no translation found for wifi_empty_list_wifi_on (8746108031587976356) -->
@@ -966,7 +940,7 @@
     <skip />
     <!-- no translation found for wifi_secured_second_item (1326000076939056265) -->
     <skip />
-    <!-- no translation found for wifi_wps_nfc_enter_password (2860076442481710770) -->
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
     <skip />
     <!-- no translation found for wifi_security_none (7985461072596594400) -->
     <skip />
@@ -1080,7 +1054,6 @@
     <string name="display_settings_title" msgid="1708697328627382561">"Visur"</string>
     <!-- no translation found for sound_settings (5534671337768745343) -->
     <skip />
-    <string name="ringtone_title" msgid="5379026328015343686">"Tun da scalin"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <!-- no translation found for all_volume_title (4296957391257836961) -->
     <skip />
@@ -1090,7 +1063,6 @@
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrar en il modus silenzius"</string>
     <!-- no translation found for notification_sound_title (5137483249425507572) -->
     <skip />
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Glisch d\'avis pulsanta"</string>
     <!-- no translation found for heads_up_enabled_title (1031078221910921622) -->
     <skip />
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tun da scalin"</string>
@@ -1127,8 +1099,6 @@
     <skip />
     <!-- no translation found for volume_alarm_mute (4452239420351035936) -->
     <skip />
-    <!-- no translation found for vibrate_when_ringing_title (3885857358303178029) -->
-    <skip />
     <string name="dock_settings" msgid="1820107306693002541">"Basa"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Parameters da la basa"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -1164,8 +1134,13 @@
     <!-- no translation found for accelerometer_summary_off (4781734213242521682) -->
     <skip />
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Midar automaticamain l\'orientaziun cun volver il telefonin"</string>
-    <string name="brightness" msgid="2354961343555249270">"Clerezza"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Adattar la clerezza dal visur"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <!-- no translation found for screen_timeout (4351334843529712571) -->
     <skip />
     <!-- no translation found for screen_timeout_summary (327761329263064327) -->
@@ -2080,9 +2055,9 @@
     <string name="enable_adb_summary" msgid="4881186971746056635">"Modus da debugar sch\'in apparat periferic USB è connectà"</string>
     <!-- no translation found for clear_adb_keys (4038889221503122743) -->
     <skip />
-    <!-- no translation found for bugreport_in_power (4548816486587403971) -->
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
     <skip />
-    <!-- no translation found for bugreport_in_power_summary (5764234382355067053) -->
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
     <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Restar activ"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Il visur na dorma mai cun chargiar"</string>
@@ -2913,6 +2888,10 @@
     <skip />
     <!-- no translation found for enter_password (4131758584074246224) -->
     <skip />
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <!-- no translation found for try_again (4272075051293936921) -->
     <skip />
     <!-- no translation found for delete (4219243412325163003) -->
@@ -3416,6 +3395,8 @@
     <skip />
     <!-- no translation found for nfc_payment_no_apps (2481080809791416010) -->
     <skip />
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
     <!-- no translation found for nfc_payment_learn_more (5583407773744324447) -->
     <skip />
     <!-- no translation found for nfc_payment_menu_item_add_service (2885947408068969081) -->
@@ -3521,25 +3502,7 @@
     <skip />
     <!-- no translation found for keywords_wifi (8947676711698613374) -->
     <skip />
-    <!-- no translation found for lock_screen_notifications (654679491031356676) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_summary_hide (7891552853357258782) -->
-    <skip />
-    <!-- no translation found for lock_screen_notifications_summary_show (6407527697810672847) -->
-    <skip />
-    <!-- no translation found for title_zen_mode (4587203077066257425) -->
-    <skip />
-    <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
-    <skip />
-    <!-- no translation found for notification_settings (8342078884790733726) -->
-    <skip />
-    <!-- no translation found for notification_settings_tweaks (659628355469765848) -->
-    <skip />
-    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
-    <skip />
-    <!-- no translation found for notification_app_settings_button (6685640230371477485) -->
-    <skip />
-    <!-- no translation found for setup_wifi_nfc_tag (654375687941126332) -->
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
     <skip />
     <!-- no translation found for write_tag (8571858602896222537) -->
     <skip />
@@ -3555,20 +3518,98 @@
     <skip />
     <!-- no translation found for default_sound (8821684447333687810) -->
     <skip />
-    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <!-- no translation found for zen_mode_settings_title (2689740350895257590) -->
+    <skip />
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Tun da scalin"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <!-- no translation found for vibrate_when_ringing_title (3885857358303178029) -->
+    <skip />
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Glisch d\'avis pulsanta"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_show (6407527697810672847) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_hide (7891552853357258782) -->
+    <skip />
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
     <skip />
     <!-- no translation found for app_notifications_title (5810577805218003760) -->
     <skip />
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_zero (2409912785614953348) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_summary_nonzero:one (8344183614159211585) -->
+    <!-- no translation found for manage_notification_access_summary_nonzero:other (980049191810249052) -->
+    <!-- no translation found for no_notification_listeners (2767405417723149879) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_title (6494221261778885893) -->
+    <skip />
+    <!-- no translation found for notification_listener_security_warning_summary (2780319203595885564) -->
+    <skip />
+    <!-- no translation found for manage_condition_providers (3039306415273606730) -->
+    <skip />
+    <!-- no translation found for manage_condition_providers_summary_zero (3760902189574984100) -->
+    <skip />
+    <!-- no translation found for manage_condition_providers_summary_nonzero:one (7871716594997778198) -->
+    <!-- no translation found for manage_condition_providers_summary_nonzero:other (358057362115673258) -->
+    <!-- no translation found for no_condition_providers (6183782892066424125) -->
+    <skip />
+    <!-- no translation found for condition_provider_security_warning_title (5834347345913614926) -->
+    <skip />
+    <!-- no translation found for condition_provider_security_warning_summary (640037330610551763) -->
+    <skip />
+    <!-- no translation found for loading_notification_apps (5031818677010335895) -->
+    <skip />
     <!-- no translation found for app_notifications_dialog_show (6912410502091785846) -->
     <skip />
-    <!-- no translation found for app_notifications_dialog_priority (2692156022435161791) -->
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
     <skip />
     <!-- no translation found for app_notifications_dialog_done (3484067728568791014) -->
     <skip />
-    <!-- no translation found for zen_mode_option_off (7812737562592973403) -->
-    <skip />
-    <!-- no translation found for zen_mode_option_on (6914392434474823822) -->
-    <skip />
     <!-- no translation found for zen_mode_default_option (6940069025071935243) -->
     <skip />
     <!-- no translation found for zen_mode_general_category (4816396530154508930) -->
@@ -3579,7 +3620,7 @@
     <skip />
     <!-- no translation found for zen_mode_entry_conditions_title (8467976490601914289) -->
     <skip />
-    <!-- no translation found for zen_mode_entry_conditions_summary_divider (7956558495698961343) -->
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
     <skip />
     <!-- no translation found for zen_mode_entry_conditions_summary_none (6589476427475076533) -->
     <skip />
@@ -3611,6 +3652,14 @@
     <skip />
     <!-- no translation found for zen_mode_end_time_summary_format (1941585278888784451) -->
     <skip />
+    <!-- no translation found for notification_settings_apps_title (1125354590652967250) -->
+    <skip />
+    <!-- no translation found for notification_app_settings_button (6685640230371477485) -->
+    <skip />
     <!-- no translation found for device_feedback (3238056036766293294) -->
     <skip />
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index b365bce..4f91650 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Aţi devenit dezvoltator!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nu mai este nevoie, sunteţi deja dezvoltator."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS ȘI REȚELE"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DISPOZITIV"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Wireless și rețele"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Dispozitiv"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Personal"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Porniţi radioul"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Opriţi radioul"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Porniţi SMS prin IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Criptare"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Criptaţi tableta"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Criptaţi telefonul"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Necesită un cod PIN numeric sau o parolă de decriptare a tabletei la fiecare pornire a acesteia"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Necesită un cod PIN numeric sau o parolă de decriptare a telefonului la fiecare pornire a acestuia"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Criptat"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea tabletei, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a o decripta de fiecare dată când o porniţi. Nu puteţi decripta tableta decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe aceasta.\n\nCriptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi tableta conectată până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Puteţi să criptaţi conturi, setări, aplicaţii descărcate şi datele acestora, fişiere media şi alte tipuri de fişiere. După criptarea telefonului, trebuie să introduceţi un cod PIN numeric sau o parolă pentru a-l decripta de fiecare dată când îl porniţi. Nu puteţi decripta telefonul decât prin resetarea configurării din fabrică, ceea ce va şterge toate datele de pe acesta.\n\nCriptarea poate dura cel puţin o oră. Trebuie să începeţi cu o baterie încărcată şi să ţineţi telefonul conectat până la finalizarea criptării. Întreruperea procesului de criptare poate duce la pierderea tuturor datelor sau a unor părţi din acestea."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Puteți să vă criptați conturile, setările, aplicațiile descărcate și datele acestora, conținutul media și alte fișiere. După criptarea tabletei, presupunând că ați setat blocarea ecranului (un șablon sau un PIN numeric sau o parolă), va trebui să deblocați ecranul pentru a decripta tableta de fiecare dată când o porniți. Singura alternativă de decriptare constă în a reveni la setările din fabrică, ceea ce vă șterge toate datele\n\nCriptarea durează cel puțin o oră. Trebuie să începeți cu o baterie încărcată și să țineți tableta conectată pe tot parcursul procesului. Dacă îl întrerupeți, veți pierde o parte din date sau chiar toate datele"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Puteți să vă criptați conturile, setările, aplicațiile descărcate și datele acestora, conținutul media și alte fișiere. După criptarea telefonului, presupunând că ați setat blocarea ecranului (un șablon sau un PIN numeric sau o parolă), va trebui să deblocați ecranul pentru a decripta telefonul de fiecare dată când îl porniți. Singura alternativă de decriptare constă în a reveni la setările din fabrică, ceea ce vă șterge toate datele\n\nCriptarea durează cel puțin o oră. Trebuie să începeți cu o baterie încărcată și să țineți telefonul conectat pe tot parcursul procesului. Dacă îl întrerupeți, veți pierde o parte din date sau chiar toate datele."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Criptaţi tableta"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Criptaţi telefonul"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Încărcaţi bateria şi încercaţi din nou."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Afişaţi sau dezactivaţi administratorii dispozitivului"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Agenți de încredere"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Vizualizați sau dezactivați agenți de încredere"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Acces la notificări"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplicațiile nu pot citi notificările"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplicație poate citi notificările"</item>
-    <item quantity="other" msgid="980049191810249052">"%d aplicații pot citi notificările"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nu sunt instalate aplicații de citire a notificărilor."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> va putea să citească toate notificările postate de sistem sau de aplicațiile instalate, care ar putea include informații personale, cum ar fi numele persoanelor de contact și textul mesajelor care vă sunt trimise. De asemenea, va putea să închidă aceste notificări sau să atingă butoanele de acțiuni din cadrul acestora."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Furnizori de condiții"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nicio aplicație nu furnizează condiții"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplicație furnizează condiții"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplicații furnizează condiții"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nu sunt instalați furnizori de condiții."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> va putea să adauge condiții de ieșire la modul Nu deranja."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Activaţi funcţia Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Conectaţi-vă la reţea"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Eliminaţi reţeaua"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Modificaţi reţeaua"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Vedeți rețelele disponibile activând Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Se caută rețele Wi-Fi…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nu aveți permisiunea să modificați rețeaua Wi‑Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS disponibil)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", securizată cu <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Introduceți parola rețelei."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Niciuna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Pentru a îmbunătăți precizia locației, precum și pentru alte scopuri, <xliff:g id="APP_NAME">%1$s</xliff:g> solicită permisiunea să activeze scanarea rețelelor, chiar și atunci când rețeaua Wi-Fi este dezactivată.\n\nPermiteți acest lucru pentru toate aplicațiile care solicită scanarea?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Permiteți"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Ecran de pornire"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Afişare"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sunet"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volumele"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Efecte muzicale"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volum sonerie"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrează la profilul Silenţios"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sunet de notificare prestabilit"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos intermitent"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop-up la prioritate ridicată"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ton de apel"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificare"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Dezactivaţi sunetul muzicii şi al altui conţinut media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Dezactivaţi sunetul notificărilor"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Dezactivaţi sunetul alarmelor"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrează când sună"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Andocare"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Setări de andocare"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Schimbaţi automat orientarea la rotirea telefonului"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Doresc comutarea automată a orientării atunci când se roteşte tableta"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Doresc schimbarea automată a orientării la rotirea telefonului"</string>
-    <string name="brightness" msgid="2354961343555249270">"Luminozitate"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustaţi luminozitatea ecranului"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Inactivitate"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
@@ -1344,8 +1329,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Depanare USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Mod de depanare când este conectat USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Revoc autorizații depanare USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Raport erori în meniul de pornire"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Includeţi în meniul de pornire opţiunea de a executa un raport despre erori"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Activ permanent"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Ecranul nu va fi inactiv pe durata încărcării"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activați jurnalul de examinare HCI Bluetooth"</string>
@@ -1629,8 +1616,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Înălţime"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afectează tonul textului vorbit"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Limbă"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Utilizaţi limba sistemului"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nu ați selectat limba"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Setează vocea caracteristică limbii pentru textul vorbit"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ascultaţi un exemplu"</string>
@@ -1822,6 +1808,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresă MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Introduceţi parola pentru a decripta stocarea"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Introduceți PIN-ul pentru a decripta spațiul de stocare"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Desenați șablonul pentru a decripta spațiul de stocare"</string>
     <string name="try_again" msgid="4272075051293936921">"Încercaţi din nou."</string>
     <string name="delete" msgid="4219243412325163003">"Ștergeţi"</string>
     <string name="misc_files" msgid="6720680815969643497">"Fişiere diverse"</string>
@@ -2019,8 +2007,7 @@
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"Verificați acreditările de încredere"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"Utilizatori"</string>
     <string name="user_list_title" msgid="7937158411137563543">"Utilizatori și profiluri"</string>
-    <!-- no translation found for user_add_user_or_profile_menu (6923838875175259418) -->
-    <skip />
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"Adăugați un utilizator/un profil"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"Adăugaţi utilizator"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"Profil limitat"</string>
     <string name="user_summary_managed_profile" msgid="5729429961989469287">"Profil gestionat"</string>
@@ -2075,6 +2062,8 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Modificaţi dimensiunea fontului"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Atingeți și plătiți"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Plătiți cu o atingere"</string>
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Aflați mai multe"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Găsiți aplicații"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Setați ca preferință?"</string>
@@ -2128,16 +2117,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Căutări recente"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultate"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi conexiune la rețea"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Când dispoz. este blocat"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ascundeți conținutul confidențial din notificări"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișați integral conținutul notificărilor"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Nu deranjaţi"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nu deranjaţi"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Notificări"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificări aplicații"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Configurați eticheta NFC pentru WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Scrieți"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Atingeți o etichetă pentru a scrie..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Parolă incorectă, încercați din nou."</string>
@@ -2145,19 +2126,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Imposibil de scris date în eticheta NFC. Dacă problema persistă, încercați altă etichetă."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Eticheta NFC nu poate fi scrisă. Utilizați altă etichetă."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sunet prestabilit"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Sunete și notificări"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Volum media"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volum alarmă"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volum sonerie"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nu deranjaţi"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"La primirea de apeluri și notificări"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Sonerie"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrații în loc de sonerie"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Fără sonerie sau vibrații"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Ton de apel al telefonului"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Ton de sonerie implicit pentru notificări"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrează când sună"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Se afișează notificările"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Indicator luminos intermitent"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Când dispozitivul este blocat"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișați integral conținutul notificărilor"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ascundeți conținutul confidențial din notificări"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nu afișați nicio notificare"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Când este activată setarea „Nu deranjați”"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ascundeți notificările noi din listă"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Afișați toate notificările din listă"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Notificări despre aplicații"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Sunete la atingere"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonuri pentru tastatura numerică"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Blocarea și deblocarea ecranului"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Alte sunete la atingere"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrare la atingere"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Acces la notificări"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplicațiile nu pot citi notificările"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplicație poate citi notificările"</item>
+    <item quantity="other" msgid="980049191810249052">"%d aplicații pot citi notificările"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nu sunt instalate aplicații de citire a notificărilor."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Activați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> va putea să citească toate notificările postate de sistem sau de aplicațiile instalate, care ar putea include informații personale, cum ar fi numele persoanelor de contact și textul mesajelor care vă sunt trimise. De asemenea, va putea să închidă aceste notificări sau să atingă butoanele de acțiuni din cadrul acestora."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Furnizori de condiții"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nicio aplicație nu furnizează condiții"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d aplicație furnizează condiții"</item>
+    <item quantity="other" msgid="358057362115673258">"%d aplicații furnizează condiții"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nu sunt instalați furnizori de condiții."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Activați <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> va putea să adauge condiții de ieșire la modul Nu deranja."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Se încarcă aplicațiile..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Afișați notificările"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Prioritate ridicată"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Afișaj în partea superioară a listei"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ascundeți conținutul confidențial atunci când dispozitivul este blocat"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blocat"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Partea sup. a listei"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidențial"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Terminat"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Dezactivat"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Activat"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Până la dezactivare"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blocați toate întreruperile, în afară de"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Noaptea"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Altă automatizare"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Activați automat"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Niciodată"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Apeluri telefonice"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mesaje"</string>
@@ -2173,5 +2200,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ora de începere"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ora de încheiere"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"A doua zi, la <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notificări aplicații"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Setări pentru notificări"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Trimiteți feedback despre dispoz."</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 25980e5..b0f8e8e 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Вы стали разработчиком!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Не нужно, вы уже разработчик."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕСПРОВОДНЫЕ СЕТИ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"УСТРОЙСТВО"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНЫЕ ДАННЫЕ"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМА"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Включить радио"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Отключить радио"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Включить SMS через IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрование"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Зашифровать данные"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Зашифровать данные"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Запрос числового PIN-кода или пароля для дешифрования при каждом включении планшетного ПК"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Запрос числового PIN-кода или пароля для дешифрования при каждом включении телефона"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные.\n\nШифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные будут частично или полностью потеряны."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можно зашифровать данные различных типов: аккаунты, настройки, загруженные приложения и их контент, мультимедийные и другие файлы. После этого при каждом включении устройства потребуется вводить PIN-код или пароль. Шифрование снимается только путем сброса настроек, в результате которого удаляются все данные.\n\nШифрование занимает не менее часа. Батарея должна быть полностью заряжена, а устройство подключено к источнику питания, пока шифрование не завершится. Если прервать его, данные на устройстве будут частично или полностью потеряны."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Просмотрите или отключите администраторов устройств"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Посмотреть или отключить Trust Agents"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Доступ к уведомлениям"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Приложения не могут просматривать уведомления"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Приложений с доступом к уведомлениям: %d"</item>
-    <item quantity="other" msgid="980049191810249052">"Приложений с доступом к уведомлениям: %d"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Службы просмотра уведомлений не установлены."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Служба \"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>\" сможет просматривать все уведомления, добавленные системой или любым из установленных приложений, включая личные данные (например, имена контактов и тексты сообщений), а также закрывать уведомления и нажимать на имеющиеся в них кнопки."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Источники условий"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Нет приложений, задающих условия"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d приложение задает условия"</item>
-    <item quantity="other" msgid="358057362115673258">"Несколько приложений (%d) задают условия"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Источники условий не установлены."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> сможет добавлять условия выхода из режима \"Не беспокоить\"."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Включить Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Подключиться к сети"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Удалить эту сеть"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Изменить сеть"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"У вас недостаточно прав для изменения настроек сети Wi‑Fi"</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (доступно WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", защита <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Введите пароль для подключения к сети."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Нет"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Чтобы определение местоположения и некоторые другие функции работали лучше, приложению \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" необходимо выполнять поиск сетей, даже если модуль Wi-Fi отключен.\n\nРазрешить?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Разрешить"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Домашний экран"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Экран"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Громкость"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Звуковые эффекты"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Громкость звонка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Виброзвонок без звука"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Звук уведомлений по умолчанию"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Индикатор событий"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Важные уведомления поверх окон"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодия"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Уведомление"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Отключить звук"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Скрыть уведомления"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Скрыть оповещения"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вибросигнал и рингтон"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Док-станция"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Настройки док-станции"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Аудио"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"Яркость"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Спящий режим"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Отладка по USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Включить режим отладки при подключении к компьютеру по USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Запретить доступ для USB-отладки"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Отчеты об ошибках"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Показывать в меню опцию отправки отчета об ошибке"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Не выключать экран"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Во время зарядки экран будет всегда включен"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Включить журнал трансляции операций HCI Bluetooth"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Тон"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Влияет на высоту синтезированной речи"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Язык"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Язык системы"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Язык не выбран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Выбор языка для чтения текста"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Прослушать пример"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"МАС-адрес для 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Введите пароль для расшифровки данных хранилища"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Повторите попытку."</string>
     <string name="delete" msgid="4219243412325163003">"Удалить"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разное"</string>
@@ -2075,6 +2071,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Измените размер шрифта"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Оплата через NFC"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Нажать и оплатить"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Назначать приоритет текущему приложению"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Подробнее..."</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Найти приложения"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Сохранить настройку?"</string>
@@ -2128,16 +2125,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Последние запросы"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Результаты"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi сетевое подключение"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"На заблокированном экране"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Не показывать конфиденциальные данные"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показывать все уведомления"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Отключить уведомления"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Отключить уведомления"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Уведомления"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Tweaks"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Приложения"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Настройка NFC-метки для подключения к Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Записать"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Нажмите на метку, чтобы начать запись..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Неверный пароль. Повторите попытку."</string>
@@ -2145,19 +2134,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Не удалось записать данные. Если проблема не исчезнет, выберите другую NFC-метку."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Нельзя записать данные на эту NFC-метку. Выберите другую."</string>
     <string name="default_sound" msgid="8821684447333687810">"Мелодия по умолчанию"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Отключить уведомления"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Рингтон"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вибросигнал и рингтон"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Индикатор событий"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показывать все уведомления"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Не показывать конфиденциальные данные"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Уведомления приложений"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Приложения не могут просматривать уведомления"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"Приложений с доступом к уведомлениям: %d"</item>
+    <item quantity="other" msgid="980049191810249052">"Приложений с доступом к уведомлениям: %d"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Службы просмотра уведомлений не установлены."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Служба \"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>\" сможет просматривать все уведомления, добавленные системой или любым из установленных приложений, включая личные данные (например, имена контактов и тексты сообщений), а также закрывать уведомления и нажимать на имеющиеся в них кнопки."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Источники условий"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Нет приложений, задающих условия"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d приложение задает условия"</item>
+    <item quantity="other" msgid="358057362115673258">"Несколько приложений (%d) задают условия"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Источники условий не установлены."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Включить службу \"<xliff:g id="SERVICE">%1$s</xliff:g>\"?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> сможет добавлять условия выхода из режима \"Не беспокоить\"."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Загрузка..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Уведомления"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Высокий приоритет"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"ВЫКЛ"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"ВКЛ"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Пока не будет отключено"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Не блокировать следующие оповещения:"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Ночью"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Другие настройки"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Включать автоматически"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никогда"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Звонки"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Сообщения"</string>
@@ -2173,5 +2235,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Время начала"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Время окончания"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"На след. день в <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Приложения"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Настройки уведомлений"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Отправить отзыв об устройстве"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 511edce..55d2ec3 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Teraz ste vývojár!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Nie je to potrebné, už ste vývojár."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BEZDRÔTOVÉ PRIPOJENIE A SIETE"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ZARIADENIE"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"OSOBNÉ"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTÉM"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Zapnúť rádio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Vypnúť rádio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Zapnúť správy SMS prostredníctvom IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifrovanie"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifrovať tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifrovať telefón"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Pri každom zapnutí tabletu požadovať kód PIN alebo heslo na jeho dešifrovanie"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Pri každom zapnutí telefónu požadovať kód PIN alebo heslo na jeho dešifrovanie"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrované"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Svoje účty, nastavenia, stiahnuté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní tabletu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v tablete vymažú.\n\nŠifrovanie môže trvať aj viac ako hodinu. V tablete musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Svoje účty, nastavenia, stiahnuté aplikácie a ich údaje môžete šifrovať. Po zašifrovaní telefónu budete musieť pri každom zapnutí zadať číselný kód PIN alebo heslo a dešifrovať ho – toto šifrovanie budete môcť zrušiť iba obnovením továrenských nastavení, čím sa všetky údaje v telefóne vymažú.\n\nŠifrovanie môže trvať aj viac ako hodinu. V telefóne musí byť pred šifrovaním nabitá batéria a po celú dobu šifrovania musí byť pripojený k zdroju napájania. Ak šifrovanie prerušíte, stratíte niektoré alebo všetky údaje."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifrovať tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifrovať telefón"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Nabite batériu a skúste to znova."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Zobraziť alebo deaktivovať správcov zariadenia"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Zástupcovia dôveryhodnosti"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Zobrazenie alebo deaktivácia zástupcov dôveryhodnosti"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Prístup k upozorneniam"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikácie nesmú čítať upozornenia"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d aplikácia dokáže čítať upozornenia"</item>
-    <item quantity="other" msgid="980049191810249052">"Aplikácie, ktoré dokážu čítať upozornenia (celkom %d)"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Nie sú nainštalované žiadne aplikácie na počúvanie upozornení."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Povoliť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bude môcť čítať všetky upozornenia, ktoré uverejní systém, alebo ktorákoľvek z nainštalovaných aplikácií. Upozornenia môžu obsahovať osobné informácie, ako sú napríklad mená kontaktov alebo texty správ, ktoré sa vám odoslali. Aplikácia bude tiež môcť tieto upozornenia zatvoriť alebo sa dotknúť tlačidiel akcií v upozorneniach."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Poskytovatelia podmienok"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Žiadne aplikácie neposkytujú podmienky"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikácia poskytuje podmienky"</item>
-    <item quantity="other" msgid="358057362115673258">"Počet aplikácií poskytujúcich podmienky: %d"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Nie sú nainštalovaní žiadni poskytovatelia podmienok."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Povoliť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bude môcť pridávať podmienky ukončenia do režimu Nerušiť."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Zapnúť Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Pripojiť k sieti"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Odstrániť záznam siete"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Upraviť sieť"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ak chcete zobraziť dostupné siete, zapnite Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Prebieha vyhľadávanie sietí Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nemáte povolenie na zmenu siete Wi-Fi."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je k dispozícii)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zabezpečenie: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Zadajte heslo siete."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Žiadne"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> chce zapnúť vyhľadávanie sietí (z dôvodu dosiahnutia vyššej presnosti určovania polohy aj z iných dôvodov) a hľadať siete aj v prípade, že je vypnutý modul Wi-Fi.\n\nChcete túto možnosť povoliť všetkým aplikáciám, ktoré chcú vyhľadávať siete?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Povoliť"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Domovská stránka"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zobraziť"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvuk"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Hlasitosti"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hudobné efekty"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Hlasitosť vyzváňania"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrovať v tichom režime"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Predvolené zvukové upozornenie"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Blikať kontrolkou upozornenia"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Prioritné v kontextovom okne"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tón zvonenia"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Upozornenie"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Vypnúť zvuk hudby a iných médií"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Vypnúť zvuk upozornení"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Vypnúť zvuk budíka"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrovať pri zvonení"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dok"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Nastavenie doku"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Zvuk"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Pri otáčaní telefónu automaticky prepínať orientáciu"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Pri otáčaní tabletu automaticky prepínať orientáciu"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Pri otáčaní telefónu automaticky prepínať orientáciu"</string>
-    <string name="brightness" msgid="2354961343555249270">"Jas"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Režim spánku"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Ladenie USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Režim ladenia behom pripojenia cez USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Odvolanie autorizácií na ladenie USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Hlásiť chyby z hlavnej ponuky"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"V hlavnej ponuke zahrnúť možnosť na vytvorenie hlásenia o chybách"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Nevypínať obrazovku"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka sa pri nabíjaní neprepne do režimu spánku"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povoliť sledovanie Bluetooth HCI"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Určuje zvuk hovoreného textu"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jazyk"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Použiť jazyk systému"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Nebol vybratý jazyk"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavenia jazyka hlasu pre hovorený text"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Vypočuť príklad"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Adresa 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ak chcete dešifrovať úložisko, zadajte heslo"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Skúsiť znova."</string>
     <string name="delete" msgid="4219243412325163003">"Odstrániť"</string>
     <string name="misc_files" msgid="6720680815969643497">"Rôzne súbory"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Zmeniť veľkosť písma"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Platby mobilom"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Plaťte jedným dotykom"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Uprednostniť aplikácie v popredí"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Viac informácií"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Vyhľadať aplikácie"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Nastaviť ako predvoľbu?"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Posledné vyhľadávania"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Výsledky"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi sieť pripojenie"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Keď je zariad. uzamknuté"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skryť citlivý obsah upozornení"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobraziť všetok obsah upozornení"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Nerušiť"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nerušiť"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Upozornenia"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Vylepšenia"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Upozornenia apl."</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Nastavenie značky NFC Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Zapísať"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Klepnutím na značku začnete zápis..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Neplatné heslo, skúste to znova."</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Zápis údajov na značku NFC sa nepodaril. Ak problém pretrváva, skúste inú značku."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Na značku NFC sa nedá zapisovať. Použitie inú značku."</string>
     <string name="default_sound" msgid="8821684447333687810">"Predvolený zvuk"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Nerušiť"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Tón zvonenia telefónu"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrovať pri zvonení"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Blikať kontrolkou upozornenia"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobraziť všetok obsah upozornení"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skryť citlivý obsah upozornení"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Upozornenia aplikácií"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikácie nesmú čítať upozornenia"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d aplikácia dokáže čítať upozornenia"</item>
+    <item quantity="other" msgid="980049191810249052">"Aplikácie, ktoré dokážu čítať upozornenia (celkom %d)"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Nie sú nainštalované žiadne aplikácie na počúvanie upozornení."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Povoliť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bude môcť čítať všetky upozornenia, ktoré uverejní systém, alebo ktorákoľvek z nainštalovaných aplikácií. Upozornenia môžu obsahovať osobné informácie, ako sú napríklad mená kontaktov alebo texty správ, ktoré sa vám odoslali. Aplikácia bude tiež môcť tieto upozornenia zatvoriť alebo sa dotknúť tlačidiel akcií v upozorneniach."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Poskytovatelia podmienok"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Žiadne aplikácie neposkytujú podmienky"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d aplikácia poskytuje podmienky"</item>
+    <item quantity="other" msgid="358057362115673258">"Počet aplikácií poskytujúcich podmienky: %d"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Nie sú nainštalovaní žiadni poskytovatelia podmienok."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Povoliť službu <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bude môcť pridávať podmienky ukončenia do režimu Nerušiť."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Načítavajú sa aplikácie..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Zobraziť upozornenia"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Vysoká priorita"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Hotovo"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Vypnuté"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Zapnuté"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokým túto funkciu nevypnete"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokovať všetky vyrušenia okrem"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"V noci"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Iná automatizácia"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Automaticky zapnúť"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikdy"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonické hovory"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Správy"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Čas začiatku"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Čas ukončenia"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ďalší deň"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Upozornenia apl."</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavenia upozornení"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Odoslať názor o tomto zariadení"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f05a542..a0f5ca3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Zdaj ste razvijalec."</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Ni treba, ker ste že razvijalec."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"BREZŽIČNE IN OMREŽNE POVEZAVE"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"NAPRAVA"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"OSEBNO"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SISTEM"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Brezžično in omrežja"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Naprava"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Osebno"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Sistem"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Vklopi radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Izklopi radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Vklop SMS prek IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Šifriranje"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Šifriraj tablični računalnik"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Šifriraj telefon"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali tablični računalnik"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Zahteva kodo PIN ali geslo, s katerim boste ob vsakem vklopu dešifrirali telefon"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Šifrirano"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate tablični računalnik, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke.\n\nŠifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, računalnik pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Šifrirate lahko račune, nastavitve, prenesene programe in njihove podatkovne, predstavnostne in druge datoteke. Če šifrirate telefon, ga morate ob vsakem vklopu dešifrirati z vpisom številske kode PIN ali gesla, sicer ga lahko dešifrirate samo tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke.\n\nŠifriranje traja uro ali več. Začeti morate z napolnjeno baterijo, telefon pa mora biti do konca postopka priključen v električno omrežje. Če postopek prekinete, boste izgubili nekatere ali vse podatke."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Šifrirate lahko svoje račune, nastavitve, prenesene aplikacije in njihove podatke, predstavnost in druge datoteke. Če ste nastavili zaklepanje zaslona (z vzorcem, številsko kodo PIN ali geslom), boste morali po šifriranju tabličnega računalnika ob vsakem vklopu tabličnega računalnika odkleniti zaslon, če boste želeli dešifrirati tablični računalnik. Dešifrirate ga lahko samo še tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke.\n\nŠifriranje traja najmanj eno uro. Ko začnete s šifriranjem, naj bo akumulator napolnjen in med celotnim postopkom naj bo tablični računalnik priklopljen v električno omrežje. Če boste postopek prekinili, boste izgubili nekaj podatkov ali vse."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Šifrirate lahko svoje račune, nastavitve, prenesene aplikacije in njihove podatke, predstavnost in druge datoteke. Če ste nastavili zaklepanje zaslona (z vzorcem, številsko kodo PIN ali geslom), boste morali po šifriranju telefona ob vsakem vklopu telefona odkleniti zaslon, če boste želeli dešifrirati telefon. Dešifrirate ga lahko samo še tako, da ga ponastavite na tovarniške nastavitve, pri čemer izbrišete vse podatke.\n\nŠifriranje traja najmanj eno uro. Ko začnete s šifriranjem, naj bo akumulator napolnjen in med celotnim postopkom naj bo telefon priklopljen v električno omrežje. Če boste postopek prekinili, boste izgubili nekaj podatkov ali vse."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Šifriraj tablični računalnik"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Šifriraj telefon"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Napolnite baterijo in poskusite znova."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Ogled ali izklop skrbnikov naprave"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Posredniki zaupanja"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Ogled ali deaktiviranje posrednikov zaupanja"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Dostop do obvestil"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne morejo brati obvestil"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Aplikacija (%d) lahko bere obvestila"</item>
-    <item quantity="other" msgid="980049191810249052">"Aplikacije (%d) lahko berejo obvestila"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Ni nameščenih poslušalcev obvestil."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Poslušalec <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bo lahko bral vsa obvestila, ki jih objavi sistem ali katera koli nameščena aplikacija, kar lahko vključuje osebne podatke, kot so imena stikov in besedilo sporočil, poslanih vam. Lahko bo tudi opustil ta obvestila ali se dotikal interaktivnih gumbov v njih."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Ponudniki pogojev"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nobena aplikacija ne ponuja pogojev"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d aplikacija ponuja pogoje"</item>
-    <item quantity="other" msgid="358057362115673258">"%d aplikacije ponujajo pogoje"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ni nameščenih ponudnikov pogojev."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Ponudnik pogojev <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bo lahko dodal pogoje za izhod iz načina »Ne moti«."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Vklopi Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Vzpostavi povezavo z omrežjem"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Pozabi omrežje"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Spremeni omrežje"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Za prikaz razpoložljivih omrežij vklopite Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Iskanje omrežij Wi-Fi …"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Nimate dovoljenja za spreminjanje omrežja Wi‑Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS je na voljo)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", zaščiteno z <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Vnesite geslo za omrežje."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Brez"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Za izboljšanje natančnosti lokacijskih podatkov in druge namene želi <xliff:g id="APP_NAME">%1$s</xliff:g> vklopiti iskanje omrežij, tudi ko je Wi-Fi izklopljen.\n\nŽelite to dovoliti vsem aplikacijam, ki želijo iskati omrežja?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Dovoli"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Začetna stran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Zaslon"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Zvok"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Glasnost"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Glasbeni učinki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Glasnost zvonjenja"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibriraj v tihem načinu"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Privzeti zvok obvestila"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Lučka za obvestila z utripanjem"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pojavi se, če je zelo pomembno"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zvonjenje"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Obvestilo"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Izklop glasbe in drugih medijev"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Izklop zvoka obvestil"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Izklop alarmov"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibriranje ob zvonjenju"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Stojalo"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Nastavitvebn stojala"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Zvok"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Samodejno preklopi usmeritev ob zasuku telefona"</string>
-    <string name="brightness" msgid="2354961343555249270">"Svetlost"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Prilagoditev svetlosti zaslona"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Stanje pripravljenosti"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Odpravljanje težav s povezavo USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Način za odpravljanje težav, ko je vzpostavljena povezava USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Preklic dovoljenj za odpravljanje težav prek povezave USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Poročila o napakah v meniju z možnostmi za izklop/vklop"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Vključitev možnosti za poročila o napakah v meniju z možnostmi izklop/vklop"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Brez zaklepanja"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Med polnjenjem se zaslon ne bo nikoli zaklenil"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogoči dnevnik vohljanja Bluetooth HCI"</string>
@@ -1628,8 +1615,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Višina tona"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Vpliva na ton govorjenega besedila"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Jezik"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Uporaba sistemskega jezika"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Jezik ni izbran"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Nastavite glas, odvisen od jezika, za govorjeno besedilo"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Poslušaj primer"</string>
@@ -1821,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Naslov 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Vnesite geslo za dešifriranje shrambe"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Vnesite PIN, če želite dešifrirati shrambo"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Narišite vzorec, če želite dešifrirati shrambo"</string>
     <string name="try_again" msgid="4272075051293936921">"Poskusite znova."</string>
     <string name="delete" msgid="4219243412325163003">"Izbriši"</string>
     <string name="misc_files" msgid="6720680815969643497">"Razne datoteke"</string>
@@ -2073,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Spremenjena velikost pisave"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Plačilo z dotikom"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Plačajte z enim dotikom"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Daj prednost aplikaciji v ospredju"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Več o tem"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Iskanje aplikacij"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Želite nastaviti kot prednostno?"</string>
@@ -2126,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Zadnja iskanja"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Rezultati"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi omrežna povezava"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Ko je naprava zaklenjena"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrij občutljivo vsebino obvestil"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaži vso vsebino obvestil"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Ne moti"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne moti"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Obvestila"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Izboljšave"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obvestila aplikacij"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Nastavitev brezžične oznake NFC"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Zapiši"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Dotaknite se oznake za zapisovanje ..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Neveljavno geslo. Poskusite znova."</string>
@@ -2143,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Na oznako NFC ni mogoče zapisati podatkov. Če težave ne odpravite, poskusite z drugo oznako."</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Na oznako NFC ni mogoče zapisovati. Uporabite drugo oznako."</string>
     <string name="default_sound" msgid="8821684447333687810">"Privzeti zvok"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Zvok in obvestila"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Glasnost predstavnosti"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Glasnost alarma"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Glasnost zvonjenja"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ne moti"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Ob prejemu klicev in obvestil"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Zvonjenje"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibriranje namesto zvonjenja"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Brez zvonjenja ali vibriranja"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Melodija zvonjenja telefona"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Privzeti ton zvonjenja za obvestila"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibriranje ob zvonjenju"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Obvestila se prikazujejo"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Lučka za obvestila z utripanjem"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Ko je naprava zaklenjena"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaži vso vsebino obvestil"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrij občutljivo vsebino obvestil"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ne prikazuj obvestil"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Ko je vklopljena funkcija »Ne moti«"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Skrij nova obvestila na seznamu"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Prikaži vsa obvestila na seznamu"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Zvoki dotikov"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Toni tipkovnice"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Zaklepanje in odklepanje zaslona"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Drugi zvoki dotikov"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibriranje ob dotiku"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Dostop do obvestil"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Aplikacije ne morejo brati obvestil"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"Aplikacija (%d) lahko bere obvestila"</item>
+    <item quantity="other" msgid="980049191810249052">"Aplikacije (%d) lahko berejo obvestila"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Ni nameščenih poslušalcev obvestil."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Poslušalec <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> bo lahko bral vsa obvestila, ki jih objavi sistem ali katera koli nameščena aplikacija, kar lahko vključuje osebne podatke, kot so imena stikov in besedilo sporočil, poslanih vam. Lahko bo tudi opustil ta obvestila ali se dotikal interaktivnih gumbov v njih."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Ponudniki pogojev"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Nobena aplikacija ne ponuja pogojev"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d aplikacija ponuja pogoje"</item>
+    <item quantity="other" msgid="358057362115673258">"%d aplikacije ponujajo pogoje"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Ni nameščenih ponudnikov pogojev."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Želite omogočiti <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Ponudnik pogojev <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> bo lahko dodal pogoje za izhod iz načina »Ne moti«."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Nalaganje aplikacij ..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Pokaži obvestila"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Zelo pomembno"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Prikaži na vrhu seznama"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Skrij občutljivo vsebino, ko je naprava zaklenjena"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokirano"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Vrh seznama"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Občutljivo"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Končano"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Izklopljeno"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Vklopljeno"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Dokler tega ne izklopite"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blokiraj vse prekinitve, razen"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Ponoči"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Druga avtomatizacija"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Samodejni vklop"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Nikoli"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonski klici"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Sporočila"</string>
@@ -2171,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Ura začetka"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Ura konca"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> naslednji dan"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Obvestila aplikacij"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Nastavitve obvestil"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Pošlji povratne info. o tej napravi"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index c1f3d1c..6e5cc3a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Постали сте програмер!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Нема потребе, већ сте програмер."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕЖИЧНА ВЕЗА И МРЕЖЕ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"УРЕЂАЈ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ЛИЧНО"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМ"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Бежична веза и мреже"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Уређај"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Лично"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Систем"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Укључи радио"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Искључи радио"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Укључи SMS преко IMS-а"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифровање"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифруј таблет"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифруј телефон"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Захтева нумерички PIN или лозинку за дешифровање таблета сваки пут када га укључите"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Захтева нумерички PIN или лозинку за дешифровање телефона сваки пут када га укључите"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали таблет, треба да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете таблет осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете таблет док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, медије и друге датотеке. Када будете шифровали телефон, треба да унесете нумерички PIN или лозинку да бисте га дешифровали сваки пут када га укључите. Не можете да дешифрујете телефон осим ако га не вратите на фабричке податке, чиме ћете избрисати све податке.\n\nШифровање траје сат времена или дуже. Потребно је да почнете са напуњеном батеријом и да не искључујете телефон док се шифровање не доврши. Ако прекинете процес шифровања, изгубићете све податке или део њих."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, као и медијске и друге датотеке. Када шифрујете таблет, ако сте поставили закључавање екрана (то јест, шаблон, нумерички PIN или лозинку), мораћете да откључате екран да бисте дешифровали таблет сваки пут када га укључите. Једини алтернативни начин за дешифровање је ресетовање фабричких података, чиме се бришу сви подаци.\n\nШифровање траје сат времена или дуже. Морате да га започнете са пуном батеријом и прикључите таблет на пуњач током целог процеса. Ако прекинете процес, изгубићете неке или све податке"</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Можете да шифрујете налоге, подешавања, преузете апликације и њихове податке, као и медијске и друге датотеке. Када шифрујете телефон, ако сте поставили закључавање екрана (то јест, шаблон, нумерички PIN или лозинку), мораћете да откључате екран да бисте дешифровали телефон сваки пут када га укључите. Једини алтернативни начин за дешифровање је ресетовање фабричких података, чиме се бришу сви подаци.\n\nШифровање траје сат времена или дуже. Морате да га започнете са пуном батеријом и прикључите телефон на пуњач током целог процеса. Ако прекинете процес, изгубићете неке или све податке."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифруј таблет"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифруј телефон"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Напуните батерију и покушајте поново."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Преглед или деактивирање администратора уређаја"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Trust agents"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Trust agents - Приказ или деактивирање"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Приступ обавештењима"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апликације не могу да читају обавештења"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d апликација може да чита обавештења"</item>
-    <item quantity="other" msgid="980049191810249052">"Апликације (%d) могу да читају обавештења"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Нема инсталираних монитора обавештења."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Желите ли да омогућите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ће моћи да чита сва обавештења која поставља систем или било која инсталирана апликација, што може да обухвата личне податке као што су имена контаката и текстови порука које примате. Такође ће моћи да одбацује ова обавештења или додирује дугмад за радње у оквиру њих."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Добављачи услова"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ниједна апликација не пружа услове"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d апликација пружа услове"</item>
-    <item quantity="other" msgid="358057362115673258">"%d апликације(а) пружају услове"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Ниједан добављач услова није инсталиран."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Желите ли да омогућите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ће моћи да додаје услове за излаз режиму Не узнемиравај."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Укључи Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Повежи са мрежом"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Заборави мрежу"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Измени мрежу"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"Немате дозволу да мењате Wi‑Fi мрежу."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS је доступан)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", обезбеђено помоћу <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Унесите лозинку за мрежу."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Ништа"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Због побољшања прецизности локације и у друге сврхе, <xliff:g id="APP_NAME">%1$s</xliff:g> жели да укључи скенирање мреже чак и када је Wi-Fi искључен.\n\nЖелите ли да дозволите ово за све апликације које желе да скенирају?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволи"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Почетна"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Приказ"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Јачине звука"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Музички ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Јачина звука звона"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вибрација у нечујном режиму"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Подразумевани звук обавештења"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсирајуће обавештење"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Искаче за висок приоритет"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Звук звона"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Обавештење"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Искључи музику и друге медије"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Искључи звук обавештења"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Искључи звук аларма"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вибрирај када звони"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Причвршћивање"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Подешавања базне станице"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Аудио"</string>
@@ -758,8 +738,13 @@
     <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="2354961343555249270">"Осветљеност"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Прилагођавање осветљености екрана"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Спавај"</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>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Отклањање USB грешака"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Режим отклањања грешака када је USB повезан"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Опозивање одобрења за уклањање USB грешака"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Извештаји о грешкама у менију напајања"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Омогућите опцију за прављење извештаја о грешкама у менију напајања"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Не закључавај"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран неће бити у режиму спавања током пуњења"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Омогући snoop евиденцију за Bluetooth HCI"</string>
@@ -1628,8 +1615,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ниво"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Утиче на тон изговореног текста"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Језик"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Користи језик система"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Језик није изабран"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Подешава глас специфичан за језик намењен говорном тексту"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Послушај пример"</string>
@@ -1821,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC адреса"</string>
     <string name="enter_password" msgid="4131758584074246224">"Унесите лозинку да бисте дешифровали меморију"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Унесите PIN да бисте дешифровали складишни простор"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Нацртајте шаблон да бисте дешифровали складишни простор"</string>
     <string name="try_again" msgid="4272075051293936921">"Покушајте поново."</string>
     <string name="delete" msgid="4219243412325163003">"Избриши"</string>
     <string name="misc_files" msgid="6720680815969643497">"Разне датотеке"</string>
@@ -2073,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Промена величине фонта"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Додирни и плати"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Само додирните да бисте платили"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Дај предност апликацији у првом плану"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Сазнајте више"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Пронађи апликације"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Желите ли да поставите као жељено подешавање?"</string>
@@ -2126,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Недавне претраге"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Резултати"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi мрежа веза"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Када је уређај закључан"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Сакриј осетљив садржај обавештења"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи сав садржај обавештења"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Не узнемиравај"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не узнемиравај"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Обавештења"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Фина подешавања"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Обавешт. апликација"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Подесите NFC ознаку за Wi-Fi упаривање"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Напиши"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Додирните ознаку да бисте писали..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Лозинка је неважећа. Покушајте поново."</string>
@@ -2143,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Није могуће писање података у NFC ознаку. Ако се проблем и даље јавља, покушајте са другом ознаком"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC ознака не подржава писање. Користите другу ознаку."</string>
     <string name="default_sound" msgid="8821684447333687810">"Подразумевани звук"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавање апликација..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Звуци и обавештења"</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="zen_mode_settings_title" msgid="2689740350895257590">"Не узнемиравај"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"За долазне позиве и обавештења"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Звони"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Вибрирај без звона"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Не звони и не вибрирај"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Звук звона телефона"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Подразумевана мелодија звона обавештења"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вибрирај када звони"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Приказивање обавештења"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсирајуће обавештење"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Када је уређај закључан"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи сав садржај обавештења"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Сакриј осетљив садржај обавештења"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Не приказуј никаква обавештења"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Када је укључена опција „не узнемиравај“"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Сакриј нова обавештења са листе"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Приказуј сва обавештења на листи"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Обавештења апликација"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Звуци при додиру"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Тонови нумеричке тастатуре"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Закључавање и откључавање екрана"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Други звуци при додиру"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Вибрација при додиру"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Приступ обавештењима"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Апликације не могу да читају обавештења"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d апликација може да чита обавештења"</item>
+    <item quantity="other" msgid="980049191810249052">"Апликације (%d) могу да читају обавештења"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Нема инсталираних монитора обавештења."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Желите ли да омогућите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ће моћи да чита сва обавештења која поставља систем или било која инсталирана апликација, што може да обухвата личне податке као што су имена контаката и текстови порука које примате. Такође ће моћи да одбацује ова обавештења или додирује дугмад за радње у оквиру њих."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Добављачи услова"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Ниједна апликација не пружа услове"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d апликација пружа услове"</item>
+    <item quantity="other" msgid="358057362115673258">"%d апликације(а) пружају услове"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Ниједан добављач услова није инсталиран."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Желите ли да омогућите <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> ће моћи да додаје услове за излаз режиму Не узнемиравај."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Учитавање апликација..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Прикажи обавештења"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Висок приоритет"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Прикажи на врху листе"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Сакриј осетљиви садржај када је уређај закључан"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Блокирано"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Врх листе"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Осетљиво"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Искључено"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Укључено"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Док не искључите"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Блокирај све прекиде осим"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Ноћу"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Друга аутоматизација"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Аутоматски укључи"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Никада"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Телефонски позиви"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Поруке"</string>
@@ -2171,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Време почетка"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Време завршетка"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> следећег дана"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Обавешт. апликација"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Подешавања обавештења"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Шаљи повратне информације о уређају"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 0d90e8e..0dfb672 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Nu är du en utvecklare!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Det behövs inte. Du är redan utvecklare."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"TRÅDLÖST OCH NÄTVERK"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"UTRUSTNING"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONLIGT"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Sätt på radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Stäng av radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Aktivera SMS över IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Kryptering"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Kryptera telefonen"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Ange PIN-kod eller lösenord för att dekryptera surfplattan varje gång du slår på den"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Ange PIN-kod eller lösenord för att dekryptera telefonen varje gång du slår på den"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar surfplattan måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data.\n\nKrypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Du kan kryptera dina konton, inställningar, hämtade appar och tillhörande data, media och andra filer. När du krypterar mobilen måste du ange en numerisk PIN-kod eller ett lösenord och dekryptera enheten varje gång du startar den. Det går endast att ta bort krypteringen genom att återställa standardinställningarna, vilket raderar alla dina data.\n\nKrypteringen tar en timme eller mer. Ladda batteriet helt innan du börjar och låt laddaren vara ansluten tills krypteringen är klar. Om du avbryter den pågående krypteringen kommer du att förlora delar av eller alla dina data."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Kryptera surfplattan"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Kryptera telefonen"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Ladda batteriet och försök igen."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Visa eller inaktivera enhetsadministratörer"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Betrodda agenter"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Visa eller inaktivera betrodda agenter"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Åtkomst till meddelanden"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Appar kan läsa meddelanden"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app kan läsa meddelanden"</item>
-    <item quantity="other" msgid="980049191810249052">"%d appar kan läsa meddelanden"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Inga meddelandelyssnare har installerats."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vill du aktivera <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kommer att kunna läsa alla meddelanden från systemet eller en installerad app. Meddelandena kan innehålla personliga uppgifter som kontaktnamn och texten i meddelanden som skickas till dig. Lyssnaren kan även avvisa sådana meddelanden eller trycka på åtgärdsknappar i dem."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Appar som innehåller villkor"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Inga appar innehåller villkor"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d app innehåller villkor"</item>
-    <item quantity="other" msgid="358057362115673258">"%d appar innehåller villkor"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Inga appar som innehåller villkor har installerats."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vill du aktivera <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan lägga till avslutningsvillkor till läget Stör ej."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Aktivera Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Anslut till nätverk"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Glöm nätverk"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ändra nätverk"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Aktivera Wi-Fi för att visa tillgängliga nätverk."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Söker efter Wi-Fi-nätverk …"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Du har inte behörighet att ändra Wi‑Fi-nätverket."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS tillgängligt)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", skyddad med <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ange nätverkslösenordet."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Ingen"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> vill aktivera nätverkssökning även när Wi-Fi är avstängt för att kunna förbättra positionens exakthet och andra ändamål.\n\nVill du tillåta detta för alla appar som vill söka efter nätverk?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Tillåt"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Startskärm"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skärm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ljud"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Volymer"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Musikeffekter"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ringvolym"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Vibrera vid tyst"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Standardljud för meddelanden"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkande ljusavisering"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Popupfönster vid hög prioritet"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringsignal"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Avisering"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Stäng av ljudet från musik och andra medier"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Stäng av ljudet från meddelanden"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Stäng av ljudet från alarm"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Enheten vibrerar vid samtal"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dockning"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Dockningsinställningar"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ljud"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Växla riktning automatiskt när du roterar telefonen"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Växla riktning automatiskt när du roterar surfplattan"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Byt riktning automatiskt när du roterar telefonen"</string>
-    <string name="brightness" msgid="2354961343555249270">"Ljusstyrka"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Viloläge"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB-felsökning"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Felsökningsläge när USB har anslutits"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Återkalla åtkomst till USB-felsökning"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Felrapporter på startmenyn"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Inkludera alternativet att skapa en felrapport på startmenyn"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Håll aktiverad"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skärmen vilar aldrig när laddning pågår"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivera HCI snoop-logg för Bluetooth"</string>
@@ -1820,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G Mac-adress"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ange lösenord om du vill dekryptera lagringen"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Försök igen."</string>
     <string name="delete" msgid="4219243412325163003">"Ta bort"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc-filer"</string>
@@ -2072,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Ändra teckenstorlek"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Snudda och betala"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Betala med ett enda tryck"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Prioritera app i förgrunden"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Läs mer"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Hitta appar"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Vill du ange den här som standard?"</string>
@@ -2125,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Senaste sökningar"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Resultat"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi-nätverksanslutning"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"När enheten är låst"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Dölj känsligt aviseringsinnehåll"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Visa allt aviseringsinnehåll"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Stör ej"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Stör ej"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Aviseringar"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Ändringar"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appaviseringar"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Konfigurera en NFC-etikett för Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Skriv"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Tryck på en etikett för att skriva ..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Lösenordet är ogiltigt. Försök igen."</string>
@@ -2142,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Det går inte att skriva data till NFC-etiketter. Om problemet kvarstår testar du med en annan etikett"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Du kan inte skriva i NFC-etiketten. Använd en annan etikett."</string>
     <string name="default_sound" msgid="8821684447333687810">"Standardsignal"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Stör ej"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Telefonens ringsignal"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Enheten vibrerar vid samtal"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkande ljusavisering"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Visa allt aviseringsinnehåll"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Dölj känsligt aviseringsinnehåll"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Appaviseringar"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Appar kan läsa meddelanden"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d app kan läsa meddelanden"</item>
+    <item quantity="other" msgid="980049191810249052">"%d appar kan läsa meddelanden"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Inga meddelandelyssnare har installerats."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Vill du aktivera <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> kommer att kunna läsa alla meddelanden från systemet eller en installerad app. Meddelandena kan innehålla personliga uppgifter som kontaktnamn och texten i meddelanden som skickas till dig. Lyssnaren kan även avvisa sådana meddelanden eller trycka på åtgärdsknappar i dem."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Appar som innehåller villkor"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Inga appar innehåller villkor"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d app innehåller villkor"</item>
+    <item quantity="other" msgid="358057362115673258">"%d appar innehåller villkor"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Inga appar som innehåller villkor har installerats."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Vill du aktivera <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> kan lägga till avslutningsvillkor till läget Stör ej."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Läser in appar ..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Visa aviseringar"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Hög prioritet"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Klart"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Av"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"På"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Tills du inaktiverar detta"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Blockera alla avbrott utom"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"På natten"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Annan automatisering"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Aktivera automatiskt"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Aldrig"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefonsamtal"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Meddelanden"</string>
@@ -2170,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Starttid"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Sluttid"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> nästa dag"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Appaviseringar"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Aviseringsinställningar"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Skicka feedback om den här enhet"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9838095..bdd7302 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Sasa wewe ni msanidi programu!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hakuna haja, tayari wewe ni msanidi programu."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"MITANDAO NA MITANDAO-HEWA"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"KIFAA"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"BINAFSI"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"MFUMO"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Isiyotumia waya na Mitandao"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Kifaa"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Binafsi"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Mfumo"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Fungua radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Zima radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Washa SMS juu ya IMS"</string>
@@ -334,11 +334,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Usimbaji fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Simba kompyuta kibao kwa njia fiche"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Simba simu"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Unahitaji PIN yenye nambari au nenosiri ili kusimbua kompyuta yako kibao kila unapoiwasha"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Unahitaji PIN yenye nambari au nenosiri ili kusimbua simu yako kila unapoiwasha"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Usimbaji fiche"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Unaweza kusimba, kwa njia fiche, akaunti, mipangilio, programu zilizopakuliwa na data yake, vyombo vya habari na faili zako zingine. Ukisha simba kwenye kompyuta yako kibao, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua kompyuta yako kibao isipokuwa kwa kurejesha mipangilio ya mwanzo, na kufuta data yako yote.\n\nUsimbaji fiche unachukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke kompyuta yako kibao kwenye chaji mpaka usimbaji fiche ukamilike. Ukiukatiza mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Unaweza kusimba, kwa njia fiche, akaunti, mipangilio, programu zilizopakiwa na data yake, vyombo vya habari na faili zako zingine. Ukisha simba kwenye simu yako, unahitaji kucharaza PIN ya nambari au nenosiri ili kuisimbua kila mara unapoiwasha. Huwezi kusimbua simu yako isipokuwa kwa kurejesha mipangilio ya mwanzo,na kufuta data yako yote\n\nUsimbaji fiche huchukua saa moja au zaidi. Lazima uanze na betri iliyo na chaji na uweke simu yako kwenye chaji mpaka usimbaji fiche ukamilike. Ukiukatiza mchakato wa usimbaji fiche, utapoteza baadhi ya data au data yote."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data zao, maudhui, na faili nyingine kwa njia fiche. Baada ya kusimba kompyuta yako kibao kwa njia fiche, tukichukulia kwamba umeweka kufunga skrini (yaani, mchoro au PIN ya nambari au nenosiri), itabidi ufungue skrini kwa kuondoa msimbo kwa njia fiche kwenye kompyuta yako kibao kila wakati unapoiwasha. Njia nyingine pekee ya kuondoa msimbo kwa njia fiche ni kurejesha mipangilio ya kiwandani, inayofuta data yako yote. \n\n Kusimba kwa njia fiche huchukua saa moja au zaidi. Lazima uanze kwa betri iliyojaa chaji na uweke kompyuta yako kibao ikiwa imechomekwa kwenye nishati muda wote wa mchakato. Ukikatisha, utapoteza baadhi ya au data yako yote."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data zao, maudhui, na faili nyingine kwa njia fiche. Baada ya kusimba simu yako kwa njia fiche, tukichukulia kwamba umeweka kufunga skrini (yaani, mchoro au PIN ya nambari au nenosiri), itabidi ufungue skrini kwa kuondoa msimbo kwa njia fiche kwenye simu yako kila wakati unapoiwasha. Njia nyingine pekee ya kuondoa msimbo kwa njia fiche ni kurejesha mipangilio ya kiwandani, inayofuta data yako yote. \n\n Kusimba kwa njia fiche huchukua saa moja au zaidi. Lazima uanze kwa betri iliyojaa chaji na uweke simu yako ikiwa imechomekwa kwenye nishati muda wote wa mchakato. Ukikatisha, utapoteza baadhi ya au data yako yote."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Simba kompyuta kibao kwa njia fiche"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Simba fiche simu"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Tafadhali chaji betri yako kisha ujaribu tena."</string>
@@ -427,24 +425,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Angalia au uzime wasimamizi wa kifaa"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Madalali wa kuaminiwa"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Angalia ama uzime madalali wa kuaminiwa"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Kufikia arifa"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programu haziwezi kusoma arifa"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Programu %d inaweza kusoma arifa"</item>
-    <item quantity="other" msgid="980049191810249052">"Programu %d zinaweza kusoma arifa"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Hakuna visikilizaji vya arifa vilivyosakinishwa."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Je, unataka kuwezesha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> itaweza kusoma arifa zote zilizochapishwa na mfumo au programu yoyote iliyosakinishwa, inayoweza kujumuisha maelezo ya binafsi kama vile majina ya anwani na maandishi ya ujumbe uliotumwa kwako. Pia itaweza kukataa arifa hizi au kugusa vitufe vya kutenda ndani yake."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Vitoa masharti"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hakuna programu za kutoa masharti"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d programu hutoa masharti"</item>
-    <item quantity="other" msgid="358057362115673258">"%d programu zinatoa masharti"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Hakuna vitoa masharti vilivyosanikishwa."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Je, ungependa kuwasha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> itaweza kuongeza au kuondoa masharti katika hali ya Usinisumbue."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Washa Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -582,6 +562,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Unganisha kwa mtandao"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Sahau mtandao"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Mtandao umerekebishwa"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ili kutazama mitandao inayopatikana, washa Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Inatafuta mitandao ya Wi-Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Huna ruhusa ya kubadilisha mtandao wa Wi -Fi."</string>
@@ -630,7 +612,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" WPS inapatikana"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", umelindwa kwa <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ingiza nenosiri la mtandao wako."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Hamna"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ili kuboresha usahihi wa mahali na kwa madhumuni mengine, <xliff:g id="APP_NAME">%1$s</xliff:g> inataka kuwasha ukaguaji mitandao, hata wakati Wi-Fi imezimwa.\n\nJe, ungependa kuruhusu programu zote ambazo zingependa kukagua ziweza kufanya hivyo?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Ruhusu"</string>
@@ -648,7 +631,7 @@
     <string name="wifi_skipped_message" product="default" msgid="1192848364146401759">"ILANI: Huenda ukatozwa gharama ya ziada ya data ya mtoa huduma.\n\nUsanidi wa simu unaweza kuhitaji huduma muhimu ya mtandao."</string>
     <string name="wifi_and_mobile_skipped_message" product="tablet" msgid="6161024589991810940">"ILANI:Hadi uwe na muunganisho wa intaneti, kompyuta kibao yako haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
     <string name="wifi_and_mobile_skipped_message" product="default" msgid="3773473163264984767">"ILANI: Hadi uwe na muunganisho wa intaneti, simu haitaweza kuthibitisha kuwa programu yako imesasishwa."</string>
-    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Kompyuta ndogo haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
+    <string name="wifi_connect_failed_message" product="tablet" msgid="4474691090681670156">"Kompyuta kibao haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_connect_failed_message" product="default" msgid="2185803140161396572">"Simu haikuweza kuunganishwa kwenye mtandao huu wa Wi-Fi."</string>
     <string name="wifi_advanced_titlebar" msgid="4485841401774142908">"Wi-Fi mahiri"</string>
     <string name="wifi_setting_frequency_band_title" msgid="3655327399028584656">"Bendi ya masafa ya Wi-Fi"</string>
@@ -694,14 +677,12 @@
     <string name="home_settings" msgid="212375129455718176">"Mwanzo"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Skrini"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Sauti"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Sauti"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Athari za muziki"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Sauti ya Mlio"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Tetema wakati imenyamaza"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Sauti chaguo-msingi ya arifa"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Arifu ya mwangaza wa palsi"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Chomoza ikiwa kipaumbele cha kwanza"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Mlio wa simu"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Arifa"</string>
@@ -724,7 +705,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Zima sauti ya muziki na midia nyingine"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Puuza arifa"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Zima kengele"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Tetema wakati wa kutoa mlio"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Gati"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Mipangilio ya gati"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Faili ya kusikika"</string>
@@ -750,8 +730,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Badili uelekezaji kiotomatiki wakati wa kuzungusha simu"</string>
-    <string name="brightness" msgid="2354961343555249270">"Ung\'avu"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Rekebisha mwangaza wa skrini"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Zima skrini"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> za kutokuwa na shughuli"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Mandhari"</string>
@@ -775,7 +760,7 @@
     <string name="sim_pin_toggle" msgid="1742123478029451888">"Funga SIM kadi"</string>
     <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">"Inahitaji PIN ili kutumia kompyuta ndogo"</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">"PIN iwe sharti ili kutumia simu"</string>
     <string name="sim_pin_change" msgid="6311414184279932368">"Badilisha PIN ya SIM"</string>
     <string name="sim_enter_pin" msgid="6608715137008508432">"PIN ya SIM"</string>
@@ -1300,7 +1285,7 @@
     <string name="user_dict_settings_all_languages" msgid="6742000040975959247">"Ya lugha zote"</string>
     <string name="user_dict_settings_more_languages" msgid="7316375944684977910">"Lugha zaidi..."</string>
     <string name="testing" msgid="6584352735303604146">"Majaribio"</string>
-    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maelezo ya kompyuta ndogo"</string>
+    <string name="testing_phone_info" product="tablet" msgid="193561832258534798">"Maelezo ya kompyuta kibao"</string>
     <string name="testing_phone_info" product="default" msgid="8656693364332840056">"Maelezo ya simu"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Maelezo ya betri"</string>
     <string name="quick_launch_title" msgid="7904609846945905306">"Kufungua kwa kasi"</string>
@@ -1337,8 +1322,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Utatuzi wa USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Muundo wa kurekebisha wakati USB imeunganishwa"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Batilisha idhini za kurekebisha USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Ripoti za hitilafu za menyu ya nguvu"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Jumuisha chaguo katika menyu ya nishati la kupeleka ripoti ya hitilafu"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Weka skrini ikiwa imewashwa"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Washa kumbukumbu ya Bluetooth HCI Snoop"</string>
@@ -1622,8 +1609,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Giza"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Huadhiri hali ya maandishi yaliyosemwa"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Lugha"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Tumia lugha ya mfumo"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Lugha haijachaguliwa"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Huweka sauti maalum ya lugha inayolingana na yanayozungumzwa"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Sikiliza mfano"</string>
@@ -1815,6 +1801,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Anwani ya 4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Ingiza nenosiri ili kusimbua hifadhi"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Ingiza PIN yako ili uondoe msimbo kwa njia fiche kwenye hifadhi"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Chora mchoro wako ili uondoe msimbo kwa njia fiche kwenye hifadhi"</string>
     <string name="try_again" msgid="4272075051293936921">"Jaribu tena."</string>
     <string name="delete" msgid="4219243412325163003">"Futa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Faili Nyinginezo"</string>
@@ -2038,7 +2026,7 @@
     <string name="user_setup_profile_dialog_message" msgid="3896568553327558731">"Ungependa kuweka wasifu sasa?"</string>
     <string name="user_setup_button_setup_now" msgid="3391388430158437629">"Sanidi sasa"</string>
     <string name="user_setup_button_setup_later" msgid="3068729597269172401">"Siyo sasa"</string>
-    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Mmiliki wa kompyuta ndogo pekee ndiye anayeweza kudhibiti watumiaji."</string>
+    <string name="user_cannot_manage_message" product="tablet" msgid="8440449301994432789">"Mmiliki wa kompyuta kibao pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_manage_message" product="default" msgid="1133251987818014757">"Mmiliki wa simu pekee ndiye anayeweza kudhibiti watumiaji."</string>
     <string name="user_cannot_add_accounts_message" msgid="5116692653439737050">"Wasifu zilizodhibitiwa haziwezi kuongeza akaunti"</string>
     <string name="user_remove_user_menu" msgid="6897150520686691355">"Futa <xliff:g id="USER_NAME">%1$s</xliff:g> kutoka kwenye kifaa hiki"</string>
@@ -2067,6 +2055,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Badilisha ukubwa wa fonti"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Gusisha ili ulipe"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Lipa kwa kugonga tu"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Pendelea programu ya mandhari ya mbele"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Pata maelezo zaidi"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Tafuta programu"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Ungependa kuweka kama mapendeleo yako?"</string>
@@ -2120,16 +2109,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Utafutaji wa hivi majuzi"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Matokeo"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"muunganisho wa mtandao wa wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Wakati kifaa kimefungwa"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ficha arifa za maudhui nyeti"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Onyesha arifa za maudhui yote"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Usinisumbue"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Usinisumbue"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Arifa"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Marekebisho"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Arifa za programu"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Sanidi tagi ya NFC ya WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Andika"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Gonga tagi ya NFC ili uandike..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Nenosiri si sahihi, jaribu tena."</string>
@@ -2137,19 +2118,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Haiwezi kuandika data kwenye tagi ya NFC. Kama tatizo litaendelea, jaribu tagi tofauti"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Tagi ya NFC haiandikiki. Tafadhali tumia tagi tofauti."</string>
     <string name="default_sound" msgid="8821684447333687810">"Sauti chaguo-msingi"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Sauti na Arifa"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Sauti ya media"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Sauti ya kengele"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Sauti ya mlio"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Usinisumbue"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Simu na arifa zinapoingia"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Piga"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Iteteme badala ya kutoa mlio"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Isitoe mlio au kutetema"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Mlio wa simu"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Mlio wa simu chaguo-msingi wa arifa"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Tetema wakati wa kutoa mlio"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Inaonyesha arifa"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Arifu ya mwangaza wa palsi"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Wakati kifaa kimefungwa"</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>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Usionyeshe arifa kabisa"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Wakati usinisumbue imewashwa"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ficha arifa mpya kwenye orodha"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Onyesha arifa zote katika orodha"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Arifa za programu"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Itoe sauti inapoguswa"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Sauti za vitufe vya kupiga simu"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Kufunga skrini na kufungua"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Sauti nyingine inapoguswa"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Iteteme inapoguswa"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Kufikia arifa"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Programu haziwezi kusoma arifa"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"Programu %d inaweza kusoma arifa"</item>
+    <item quantity="other" msgid="980049191810249052">"Programu %d zinaweza kusoma arifa"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Hakuna visikilizaji vya arifa vilivyosakinishwa."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Je, unataka kuwezesha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> itaweza kusoma arifa zote zilizochapishwa na mfumo au programu yoyote iliyosakinishwa, inayoweza kujumuisha maelezo ya binafsi kama vile majina ya anwani na maandishi ya ujumbe uliotumwa kwako. Pia itaweza kukataa arifa hizi au kugusa vitufe vya kutenda ndani yake."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Vitoa masharti"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hakuna programu za kutoa masharti"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d programu hutoa masharti"</item>
+    <item quantity="other" msgid="358057362115673258">"%d programu zinatoa masharti"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Hakuna vitoa masharti vilivyosanikishwa."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Je, ungependa kuwasha <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> itaweza kuongeza au kuondoa masharti katika hali ya Usinisumbue."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Inapakia programu ..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Onyesha arifa"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Kipaumbele cha kwanza"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Onyesha mwanzoni wa orodha"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ficha maudhui nyeti kifaa kinapokuwa kimefungwa"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Amezuiwa"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Mwanzoni wa orodha"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nyeti"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Imemaliza"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Kimezimwa"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Washa"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hadi utakapozima hili"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Zuia usumbufu wote isipokuwa"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Wakati wa usiku"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Ujumbe mwingine wa kiotomatiki"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Washa kiotomatiki"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Isiwahi kamwe"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Simu"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Barua pepe"</string>
@@ -2165,5 +2192,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Wakati wa Kuanza"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Wakati wa kuisha"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> siku inayofuata"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Arifa za programu"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Mipangilio ya arifa"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Tuma maoni kuhusu kifaa hiki"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index f868b54..0788160 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"ตอนนี้คุณเป็นนักพัฒนาซอฟต์แวร์แล้ว!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"ไม่จำเป็น คุณเป็นนักพัฒนาซอฟต์แวร์อยู่แล้ว"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"ระบบไร้สายและเครือข่าย"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"อุปกรณ์"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ส่วนบุคคล"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"ระบบ"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"เปิดวิทยุ"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"ปิดวิทยุ"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"เปิดการรับส่ง SMS ผ่าน IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"การเข้ารหัส"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"เข้ารหัสแท็บเล็ต"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"เข้ารหัสโทรศัพท์"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"จำเป็นต้องใช้ PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสแท็บเล็ตของคุณทุกครั้งที่คุณเปิดเครื่อง"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"จำเป็นต้องใช้ PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสโทรศัพท์ของคุณทุกครั้งที่คุณเปิดเครื่อง"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ที่เข้ารหัส"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสแท็บเล็ตแล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสแท็บเล็ตได้เว้นแต่จะทำการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด\n\nการเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กแท็บเล็ตไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปพลิเคชันที่ดาวน์โหลดมาและข้อมูล สื่อ และไฟล์อื่นๆ ของแอปพลิเคชันนั้นได้ เมื่อคุณเข้ารหัสโทรศัพท์แล้ว คุณจะต้องพิมพ์รหัส PIN หรือรหัสผ่านที่เป็นตัวเลขเพื่อถอดรหัสในแต่ละครั้งที่คุณเปิดเครื่อง คุณไม่สามารถถอดรหัสโทรศัพท์ได้เว้นแต่จะรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะเป็นการลบข้อมูลทั้งหมด\n\nการเข้ารหัสใช้เวลาอย่างน้อยหนึ่งชั่วโมง คุณต้องเริ่มต้นด้วยการใช้แบตเตอรี่ที่ชาร์จไฟแล้วและเสียบปลั๊กโทรศัพท์ไว้จนกว่าการเข้ารหัสจะเสร็จสมบูรณ์ หากมีการขัดจังหวะกระบวนการเข้ารหัส คุณจะสูญเสียข้อมูลบางส่วนหรือทั้งหมดไป"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"ดูหรือปิดการใช้งานผู้ดูแลอุปกรณ์"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"ตัวแทนที่เชื่อถือได้"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"ดูหรือปิดใช้งานตัวแทนที่เชื่อถือได้"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"การเข้าถึงการแจ้งเตือน"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"แอปไม่สามารถอ่านการแจ้งเตือน"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d แอปสามารถอ่านการแจ้งเตือนได้"</item>
-    <item quantity="other" msgid="980049191810249052">"%d แอปสามารถอ่านการแจ้งเตือนได้"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"ไม่มีตัวฟังการแจ้งเตือนติดตั้งอยู่"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ต้องการเปิดใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> จะสามารถอ่านการแจ้งเตือนทั้งหมดที่โพสต์โดยระบบหรือแอปใดๆ ที่ติดตั้ง ซึ่งอาจรวมถึงข้อมูลส่วนบุคคล เช่น ชื่อติดต่อและข้อความที่ส่งถึงคุณ นอกจากนี้ยังจะสามารถที่จะปิดการแจ้งเตือนดังกล่าวหรือแตะปุ่มการทำงานภายในตัว"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"ผู้ให้บริการเงื่อนไข"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ไม่มีแอปที่ให้บริการเงื่อนไข"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d แอปให้บริการเงื่อนไข"</item>
-    <item quantity="other" msgid="358057362115673258">"%d แอปให้บริการเงื่อนไข"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"ไม่มีการติดตั้งผู้ให้บริการเงื่อนไข"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ต้องการเปิดใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> จะสามารถเพิ่มเงื่อนไขการออกไปยังโหมด \"ห้ามรบกวน\""</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"บลูทูธ"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"เปิดบลูทูธ"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"บลูทูธ"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"เชื่อมต่อกับเครือข่าย"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"ไม่จำเครือข่าย"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"แก้ไขเครือข่าย"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"หากต้องการดูเครือข่ายที่ใช้ได้ ให้เปิด WiFi"</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"กำลังค้นหาเครือข่าย WiFi…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"คุณไม่ได้รับอนุญาตให้เปลี่ยนแปลงเครือข่าย WiFi"</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS ใช้งานได้)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">" ป้องกันด้วย <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"ป้อนรหัสผ่านเครือข่ายของคุณ"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"ไม่มี"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"เพื่อปรับปรุงความแม่นยำของตำแหน่ง และเพื่อวัตถุประสงค์อื่น ๆ <xliff:g id="APP_NAME">%1$s</xliff:g> ต้องการเปิดการสแกนเครือข่าย แม้ในขณะที่ไม่มี WiFi \n \n อนุญาตให้ดำเนินการนี้สำหรับแอปทั้งหมดที่ต้องการสแกนหรือไม่"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"อนุญาต"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"หน้าแรก"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"แสดง"</string>
     <string name="sound_settings" msgid="5534671337768745343">"เสียง"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้า"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"ระดับเสียง"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"เอฟเฟ็กต์เพลง"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"ระดับความดังเสียงเรียกเข้า"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"สั่นเตือนเมื่อปิดเสียง"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"เสียงแจ้งเตือนเริ่มต้น"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"ไฟแจ้งเตือนพัลซ์"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"แสดงป๊อปอัปเมื่อมีความสำคัญมาก"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"เสียงเรียกเข้า"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"การแจ้งเตือน"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"ปิดเสียงเพลงและสื่ออื่นๆ"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"ปิดเสียงการแจ้งเตือน"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"ปิดเสียงนาฬิกาปลุก"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"สั่นเมื่อมีสายเข้า"</string>
     <string name="dock_settings" msgid="1820107306693002541">"แท่นชาร์จ"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"การตั้งค่าแท่นชาร์จ"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"เสียง"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"ความสว่าง"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"ปรับความสว่างหน้าจอ"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"สลีป"</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>
@@ -1170,7 +1161,7 @@
     <string name="sd_card_storage" product="default" msgid="7623513618171928235">"ที่เก็บข้อมูลการ์ด Sd"</string>
     <string name="recompute_size" msgid="7722567982831691718">"กำลังคำนวณขนาดใหม่..."</string>
     <string name="clear_data_dlg_title" msgid="5605258400134511197">"ลบข้อมูลในแอปพลิเคชันหรือไม่"</string>
-    <string name="clear_data_dlg_text" msgid="8847257251846779938">"ข้อมูลทั้งหมดของแอปพลิเคชันนี้จะถูกลบอย่างถาวร ซึ่งรวมถึงไฟล์ การตั้งค่า บัญชี ฐานข้อมูล และอื่นๆ ทั้งหมด"</string>
+    <string name="clear_data_dlg_text" msgid="8847257251846779938">"ข้อมูลทั้งหมดของแอปพลิเคชันนี้ จะถูกลบอย่างถาวร ซึ่งรวมถึงไฟล์ การตั้งค่าบัญชี ฐานข้อมูล และอื่นๆ ทั้งหมด"</string>
     <string name="dlg_ok" msgid="2402639055725653590">"ตกลง"</string>
     <string name="dlg_cancel" msgid="1674753358972975911">"ยกเลิก"</string>
     <string name="app_not_found_dlg_title" msgid="3127123411738434964"></string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"การแก้ไขข้อบกพร่อง USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"โหมดแก้ไขข้อบกพร่องเมื่อเชื่อมต่อ USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"ยกเลิกการให้สิทธิ์การแก้ปัญหา USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"รายงานข้อบกพร่องเกี่ยวกับเมนูเปิดปิด"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"เพิ่มตัวเลือกในเมนูเปิดปิดสำหรับการใช้รายงานข้อบกพร่อง"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"เปิดหน้าจอค้าง"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"หน้าจอจะไม่เข้าสู่โหมดสลีปขณะชาร์จ"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"เปิดใช้งานบันทึกสอดแนมบลูทูธ HCI"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"ความสูง-ต่ำของเสียง"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"มีผลต่อโทนเสียงของข้อความที่พูด"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"ภาษา"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"ใช้ภาษาของระบบ"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"ไม่ได้เลือกภาษา"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"ตั้งค่าเสียงในภาษาที่ระบุสำหรับข้อความที่ได้ยิน"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"ฟังตัวอย่าง"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"ที่อยู่ MAC ใน 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"พิมพ์รหัสผ่านเพื่อถอดรหัสที่จัดเก็บข้อมูล"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"ลองอีกครั้ง"</string>
     <string name="delete" msgid="4219243412325163003">"ลบ"</string>
     <string name="misc_files" msgid="6720680815969643497">"ไฟล์เบ็ดเตล็ด"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"เปลี่ยนขนาดแบบอักษร"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"แตะและจ่าย"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"จ่ายเงินด้วยการแตะเพียงครั้งเดียว"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"ใช้แอปที่ใช้งานอยู่แทน"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"เรียนรู้เพิ่มเติม"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"ค้นหาแอป"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"ตั้งเป็นค่ากำหนดของคุณไหม"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"การค้นหาล่าสุด"</string>
     <string name="search_results_label" msgid="4163304782363526148">"ผลลัพธ์"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"การเชื่อมต่อเครือข่าย wifi wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"เมื่ออุปกรณ์ล็อก"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ซ่อนเนื้อหาการแจ้งเตือนที่ละเอียดอ่อน"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"แสดงเนื้อหาการแจ้งเตือนทั้งหมด"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"ห้ามรบกวน"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"ห้ามรบกวน"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"การแจ้งเตือน"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"ปรับแต่ง"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"การแจ้งเตือนของแอป"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"ตั้งค่าแท็ก WiFi NFC"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"เขียน"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"แตะแท็กเพื่อเขียน..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"รหัสผ่านไม่ถูกต้อง โปรดลองอีกครั้ง"</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"ไม่สามารถเขียนข้อมูลลงแท็ก NFC ได้ หากยังคงมีปัญหา โปรดลองใช้แท็กอื่น"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"แท็ก NFC ไม่สามารถเขียนได้ โปรดใช้แท็กอื่น"</string>
     <string name="default_sound" msgid="8821684447333687810">"เสียงเริ่มต้น"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"ห้ามรบกวน"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"เสียงเรียกเข้า"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"สั่นเมื่อมีสายเข้า"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"ไฟแจ้งเตือนพัลซ์"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"แสดงเนื้อหาการแจ้งเตือนทั้งหมด"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ซ่อนเนื้อหาการแจ้งเตือนที่ละเอียดอ่อน"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"การแจ้งเตือนของแอป"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"แอปไม่สามารถอ่านการแจ้งเตือน"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d แอปสามารถอ่านการแจ้งเตือนได้"</item>
+    <item quantity="other" msgid="980049191810249052">"%d แอปสามารถอ่านการแจ้งเตือนได้"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"ไม่มีตัวฟังการแจ้งเตือนติดตั้งอยู่"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"ต้องการเปิดใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> จะสามารถอ่านการแจ้งเตือนทั้งหมดที่โพสต์โดยระบบหรือแอปใดๆ ที่ติดตั้ง ซึ่งอาจรวมถึงข้อมูลส่วนบุคคล เช่น ชื่อติดต่อและข้อความที่ส่งถึงคุณ นอกจากนี้ยังจะสามารถที่จะปิดการแจ้งเตือนดังกล่าวหรือแตะปุ่มการทำงานภายในตัว"</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"ผู้ให้บริการเงื่อนไข"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"ไม่มีแอปที่ให้บริการเงื่อนไข"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d แอปให้บริการเงื่อนไข"</item>
+    <item quantity="other" msgid="358057362115673258">"%d แอปให้บริการเงื่อนไข"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"ไม่มีการติดตั้งผู้ให้บริการเงื่อนไข"</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"ต้องการเปิดใช้ <xliff:g id="SERVICE">%1$s</xliff:g> ไหม"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> จะสามารถเพิ่มเงื่อนไขการออกไปยังโหมด \"ห้ามรบกวน\""</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"กำลังโหลดแอป..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"แสดงการแจ้งเตือน"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"มีความสำคัญมาก"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"เสร็จสิ้น"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"ปิด"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"เปิด"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"จนกว่าคุณจะปิดฟังก์ชันนี้"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"บล็อกการรบกวนทั้งหมดยกเว้น"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"เวลากลางคืน"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"ระบบอัตโนมัติอื่นๆ"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"เปิดโดยอัตโนมัติ"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"ไม่ใช้เลย"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"การโทรศัพท์"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"ข้อความ"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"เวลาเริ่มต้น"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"เวลาสิ้นสุด"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ของวันถัดไป"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"การแจ้งเตือนของแอป"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"การตั้งค่าการแจ้งเตือน"</string>
     <string name="device_feedback" msgid="3238056036766293294">"ส่งความคิดเห็นเกี่ยวกับอุปกรณ์นี้"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 35fcd45..898a0cd 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Isa ka nang developer!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Hindi na kailangan, isa ka nang developer."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"WIRELESS &amp; MGA NETWORK"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"DEVICE"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"PERSONAL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SYSTEM"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"I-on ang radyo"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"I-off ang radyo"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"I-on ang SMS sa IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Pag-encrypt"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"I-encrypt ang tablet"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"I-encrypt ang telepono"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Humiling ng numerong PIN o password upang i-decrypt ang iyong tablet sa bawat oras na i-on mo ito"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Humiling ng numerong PIN o password upang i-decrypt ang iyong telepono sa bawat oras na i-on mo ito"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Na-encrypt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong tablet, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong tablet maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data.\n\nTumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong tablet hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan o lahat ng iyong data."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na apps at data ng mga ito, media, at iba pang mga file. Sa sandaling ma-encrypt mo ang iyong telepono, kailangan mong mag-type ng numeric na PIN o password upang i-decrypt ito sa tuwing i-o-on mo ito. Hindi mo maaaring i-decrypt ang iyong telepono maliban sa pamamagitan ng pagsasagawa ng pag-reset ng factory data, na bubura sa lahat ng iyong data.\n\nTumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may naka-charge na baterya at panatilihing naka-plug in ang iyong telepono hanggang sa makumpleto ang pag-encrypt. Kung aantalahin mo ang proseso ng pag-encrypt, mawawala mo ang ilan sa o lahat ng iyong data."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"I-encrypt ang tablet"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"I-encrypt ang telepono"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"I-charge ang iyong baterya at subukang muli."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Tingnan o alisin sa pagkaka-activate ang mga administrator ng device"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Mga trust agent"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Tingnan o i-deactivate ang mga trust agent"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Access sa notification"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Hindi makakapagbasa ng mga notification ang apps"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d app ang makakapagbasa ng mga notification"</item>
-    <item quantity="other" msgid="980049191810249052">"%d (na) apps ang makakapagbasa ng mga notification"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Walang mga naka-install na notification listener."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Paganahin ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Mababasa ng <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ang lahat ng notification na na-post ng system o ng anumang naka-install na app, na maaaring may kasamang personal na impormasyon tulad ng mga pangalan ng contact at teksto ng mga mensaheng ipinadala sa iyo. Magagawa din nitong i-dismiss ang mga notification na ito o pumindot ng mga button ng pagkilos sa loob ng mga ito."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Mga provider ng kundisyon"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Walang app ang nagbibigay ng mga kundisyon"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Nagbibigay ang %d app ng mga kundisyon"</item>
-    <item quantity="other" msgid="358057362115673258">"Nagbibigay ang %d (na) app ng mga kundisyon"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Walang naka-install na mga provider ng kundisyon."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"I-enable ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Magagawa ng <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> na magdagdag ng mga kundisyon sa paglabas sa mode na Huwag istorbohin."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"I-on ang Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kumonekta sa network"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Kalimutan ang network"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Baguhin ang network"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Para makita ang available network, i-on ang Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Naghahanap ng mga Wi-Fi network..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Wala kang pahintulot na baguhin ang Wi‑Fi network."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Available ang WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", naka-secure gamit ang <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ilagay ang iyong password sa network."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Wala"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Upang mapahusay ang katumpakan ng lokasyon at para sa iba pang mga layunin, gustong i-on ng <xliff:g id="APP_NAME">%1$s</xliff:g> ang pag-scan ng network, kahit na naka-off ang Wi-Fi.\n\nPayagan ito para sa lahat ng apps na gustong mag-scan?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Payagan"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Home"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ipakita"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Tunog"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Mga Volume"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Mga effect sa musika"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Volume ng ringer"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"I-vibrate kapag naka-silent"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Default na tunog ng notification"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse na ilaw ng notification"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Pop up kung mataas priyoridad"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Ringtone"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notification"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"I-mute ang musika at iba pang media"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"I-mute ang mga notification"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"I-mute ang mga alarm"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"I-vibrate kapag nagri-ring"</string>
     <string name="dock_settings" msgid="1820107306693002541">"I-dock"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Mga setting ng dock"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Audio"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Ilipat nang awtomatiko ang oryentasyon kapag niro-rotate ang telepono"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Ilipat nang awtomatiko ang oryentasyon kapag niro-rotate ang telepono"</string>
-    <string name="brightness" msgid="2354961343555249270">"Liwanag"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ayusin ang liwanag ng screen"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Sleep"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Debugging ng USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode kapag nakakonekta ang USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Bawiin ang mga pahintulot sa pag-debug ng USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Mga ulat sa bug sa menu ng power"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Isama ang pagpipilian sa menu ng power para sa pagkuha ng ulat sa bug"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Manatiling gumagana"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Hindi kailanman hihinto ang screen kapag kinakargahan"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"I-enable ang Bluetooth HCI snoop log"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Pitch"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Naaapektuhan ang tono ng tekstong sinasabi"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Wika"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Gamitin ang wika ng system"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Walang napiling wika"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Itinatakda ang boses na partikular sa wika para sa sinasambit na teksto"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Makinig sa isang halimbawa"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC address"</string>
     <string name="enter_password" msgid="4131758584074246224">"I-type ang password upang i-decrypt ang storage"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Subukang muli."</string>
     <string name="delete" msgid="4219243412325163003">"Tanggalin"</string>
     <string name="misc_files" msgid="6720680815969643497">"Misc na mga file"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Baguhin ang laki ng font"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Mag-tap at magbayad"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Magbayad sa pamamagitan ng pag-tap"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Paboran ang foreground na app"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Matuto nang higit pa"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Maghanap ng apps"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Itakda bilang iyong kagustuhan?"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Mga kamakailang paghahanap"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Mga Resulta"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Kapag naka-lock"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Itago ang sensitibong nilalaman ng notification"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ipakita ang lahat ng nilalaman ng notification"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Huwag istorbohin"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Huwag istorbohin"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Mga Notification"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Mga Pagbabago"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notification sa app"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"I-set up ang Tag ng NFC ng WiFi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Magsulat"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Mag-tap ng tag upang magsulat..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Di-wastong password, subukang muli."</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Hindi makapagsulat ng data sa tag ng NFC. Kung magpapatuloy ang problema, sumubok ng ibang tag"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Hindi nasusulatan ang tag ng NFC. Mangyaring gumamit ng ibang tag."</string>
     <string name="default_sound" msgid="8821684447333687810">"Default na tunog"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Huwag istorbohin"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Ringtone ng telepono"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"I-vibrate kapag nagri-ring"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse na ilaw ng notification"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ipakita ang lahat ng nilalaman ng notification"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Itago ang sensitibong nilalaman ng notification"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Mga notification sa app"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Hindi makakapagbasa ng mga notification ang apps"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d app ang makakapagbasa ng mga notification"</item>
+    <item quantity="other" msgid="980049191810249052">"%d (na) apps ang makakapagbasa ng mga notification"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Walang mga naka-install na notification listener."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Paganahin ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"Mababasa ng <xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> ang lahat ng notification na na-post ng system o ng anumang naka-install na app, na maaaring may kasamang personal na impormasyon tulad ng mga pangalan ng contact at teksto ng mga mensaheng ipinadala sa iyo. Magagawa din nitong i-dismiss ang mga notification na ito o pumindot ng mga button ng pagkilos sa loob ng mga ito."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Mga provider ng kundisyon"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Walang app ang nagbibigay ng mga kundisyon"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"Nagbibigay ang %d app ng mga kundisyon"</item>
+    <item quantity="other" msgid="358057362115673258">"Nagbibigay ang %d (na) app ng mga kundisyon"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Walang naka-install na mga provider ng kundisyon."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"I-enable ang <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"Magagawa ng <xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> na magdagdag ng mga kundisyon sa paglabas sa mode na Huwag istorbohin."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Naglo-load ng mga app..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Magpakita ng mga notification"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Mataas na priyoridad"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tapos na"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Naka-off"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Naka-on"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Hanggang sa i-off mo ito"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"I-block ang lahat ng abala maliban sa"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Sa gabi"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Iba pang automation"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Awtomatikong i-on"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hindi Kailanman"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Tawag sa telepono"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Mga Mensahe"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Oras ng pagsisimula"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Oras ng pagtatapos"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> sa susunod na araw"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Notification sa app"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Mga setting ng notification"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Magpadala ng feedback tungkol sa device na ito"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 0ea1054..e23fa60 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Artık siz bir geliştiricisiniz!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Gerekli değil, siz zaten bir geliştiricisiniz."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"KABLOSUZ ve AĞLAR"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"CİHAZ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"KİŞİSEL"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"SİSTEM"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Radyoyu aç"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Radyoyu kapat"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"IMS üzerinden SMS\'i aç"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Şifreleme"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Tableti şifrele"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Telefonu şifreleme"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Tabletinizin her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Telefonunuzun her açılışında şifresinin çözülmesi için sayısal bir PIN veya şifre istensin"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Şifreli"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Tabletinizdeki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız.\n\nŞifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar tabletinizi fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ait verileri, medyaları ve diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, cihazı her açtığınızda şifresini çözmek için sayısal bir PIN veya şifre girmeniz gerekir. Telefonunuzdaki tüm verileri silen fabrika verilerine sıfırlama işlemi yapmadan şifrelemeyi kaldıramazsınız.\n\nŞifreleme işlemi bir saat kadar sürer. İşlemi, dolu bir pille başlatmalı ve şifreleme tamamlanana kadar telefonunuzu fişe takılı tutmalısınız. Şifreleme işlemini yarıda keserseniz, verilerinizin bir kısmını veya tamamını kaybedersiniz."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tableti şifrele"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefonu şifrele"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Pilinizi şarj edip tekrar deneyin."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Cihaz yöneticilerini görüntüle veya devre dışı bırak"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Güven aracıları"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Güven aracılarını görüntüle veya devre dışı bırak"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Bildirim erişimi"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Uygulamalar bildirimleri okuyamaz"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d uygulama, bildirimleri okuyabilir"</item>
-    <item quantity="other" msgid="980049191810249052">"%d uygulama, bildirimleri okuyabilir"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Bildirim dinleyici yüklü değil."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> etkinleştirilsin mi?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sistem veya uygulama tarafından yayınlanan tüm bildirimleri okuyabilecektir. Bu bildirimler kişi adları ve size gönderilen iletilerin metinleri gibi kişisel bilgileri içerebilir. Ayrıca bu bildirimleri kapatabilecek veya içindeki işlem düğmelerine dokunabilecektir."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Koşul sağlayıcılar"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hiçbir uygulama koşul sağlamıyor"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d uygulama koşul sağlıyor"</item>
-    <item quantity="other" msgid="358057362115673258">"%d uygulama koşul sağlıyor"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Hiçbir koşul sağlayıcı yüklü değil."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> etkinleştirilsin mi?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>, Rahatsız etmeyin moduna çıkış koşulları ekleyebilecektir."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bluetooth\'u aç"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Ağa bağlan"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Ağı unut"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Ağı değiştir"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Kullanılabilir ağları görmek için Kablosuz\'u açın."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Kablosuz ağlar aranıyor…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Kablosuz ağı değiştirme izniniz yok."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (WPS kullanılabilir)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", güvenliği <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> ile sağlanıyor"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Ağ şifrenizi girin."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Yok"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Konum bilgisinin doğruluğunu artırmak ve diğer amaçlar için, <xliff:g id="APP_NAME">%1$s</xliff:g> Kablosuz bağlantı kapalı olduğunda bile ağ tarama işlevini açmak istiyor.\n\nTarama yapmak isteyen tüm uygulamaların bu işlevi kullanmalarına izin veriyor musunuz?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"İzin ver"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Ana Ekran"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ekran"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Ses"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Ses Düzeyleri"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Müzik efektleri"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Zil sesi düzeyi"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Sessizken titret"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Varsayılan bildirim sesi"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Bildirim ışığını yakıp söndür"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Yüksek öncelikliyse pop-up kullan"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Zil sesi"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Bildirim"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Müzik ve diğer medyaların sesini kapat"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Bildirimlerin sesini kapat"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Alarmları kapat"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Çalarken titret"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Yuva"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Yuva ayarları"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Ses"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Telefonu döndürürken yönü otomatik değiştir"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tableti döndürürken yönü otomatik değiştir"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Telefonu döndürürken yönü otomatik değiştir"</string>
-    <string name="brightness" msgid="2354961343555249270">"Parlaklık"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Uyku"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB hata ayıklaması"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"USB bağlandığında hata ayıklama modu"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"USB hata ayıklama yetkilerini kaldır"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Güç menüsü hata raporları"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Güç menüsünde hata raporunu alma seçeneğini dahil et"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Uyanık kal"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI araştırmayı etkinleştir"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Perde"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Konuşulan metnin sesini etkiler"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Dil"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Sistem dilini kullan"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Dil seçilmedi"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Dil için tanımlı sesi, konuşulan metin için ayarlar"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Bir örnek dinleyin"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC adresi"</string>
     <string name="enter_password" msgid="4131758584074246224">"Depolamanın şifresini çözmek için şifre yazın"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Tekrar deneyin."</string>
     <string name="delete" msgid="4219243412325163003">"Sil"</string>
     <string name="misc_files" msgid="6720680815969643497">"Çeşitli dosyalar"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Yazı tipi boyutunu değiştir"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Dokundur ve öde"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Yalnızca dokunarak ödeyin"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Ön plan uygulamayı tercih et"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Daha fazla bilgi edinin"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Uygulama bul"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Tercihiniz olarak ayarlansın mı?"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Son aramalar"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Sonuçlar"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi kablosuz ağ bağlantısı"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Cihaz kilitliyken"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hassas içerikli bildirimleri gizle"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tüm bildirim içeriklerini göster"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Rahatsız etmeyin"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Rahatsız etmeyin"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Bildirimler"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"İnce ayarlar"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Uygulama bildirimleri"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Kablosuz NFC Etiketi Oluştur"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Yaz"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Yazmak için bir etikete hafifçe vurun..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Geçersiz şifre. Tekrar deneyin."</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"NFC etiketine veri yazılamıyor. Sorun devam ederse başka bir etiket deneyin"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"NFC etiketine yazılamıyor. Lütfen farklı bir etiket kullanın."</string>
     <string name="default_sound" msgid="8821684447333687810">"Varsayılan ses"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Rahatsız etmeyin"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Telefon zil sesi"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Çalarken titret"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Bildirim ışığını yakıp söndür"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tüm bildirim içeriklerini göster"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hassas içerikli bildirimleri gizle"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Uygulama bildirimleri"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Uygulamalar bildirimleri okuyamaz"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d uygulama, bildirimleri okuyabilir"</item>
+    <item quantity="other" msgid="980049191810249052">"%d uygulama, bildirimleri okuyabilir"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Bildirim dinleyici yüklü değil."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"<xliff:g id="SERVICE">%1$s</xliff:g> etkinleştirilsin mi?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> sistem veya uygulama tarafından yayınlanan tüm bildirimleri okuyabilecektir. Bu bildirimler kişi adları ve size gönderilen iletilerin metinleri gibi kişisel bilgileri içerebilir. Ayrıca bu bildirimleri kapatabilecek veya içindeki işlem düğmelerine dokunabilecektir."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Koşul sağlayıcılar"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Hiçbir uygulama koşul sağlamıyor"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d uygulama koşul sağlıyor"</item>
+    <item quantity="other" msgid="358057362115673258">"%d uygulama koşul sağlıyor"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Hiçbir koşul sağlayıcı yüklü değil."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"<xliff:g id="SERVICE">%1$s</xliff:g> etkinleştirilsin mi?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>, Rahatsız etmeyin moduna çıkış koşulları ekleyebilecektir."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Uygulamalar yükleniyor..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Bildirimleri göster"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Yüksek öncelik"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Tamam"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Kapalı"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Açık"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Siz bunu kapatana kadar"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Şunlar hariç tüm kesmeleri engelle:"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Gece"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Diğer otomasyon"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Otomatik olarak aç"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Hiçbir zaman"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Telefon çağrıları"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"İletiler"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Başlangıç zamanı"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Bitiş zamanı"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g>, sonraki gün"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Uygulama bildirimleri"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Bildirim ayarları"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Bu cihazla ilgili geri bildirim gönder"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 07f1caa..2d85c08 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Тепер ви – розробник!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Немає потреби, ви вже розробник."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"БЕЗДРОТОВИЙ ЗВ’ЯЗОК І МЕРЕЖІ"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"ПРИСТРІЙ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"ОСОБИСТЕ"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"СИСТЕМА"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Бездротові та дротові мережі"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Пристрій"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Особисте"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Система"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Увімкнути радіо"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Вимкнути радіо"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Увімкнути SMS в IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Шифрування"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифрувати пристрій"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифрувати телефон"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Вимагає введення цифрового PIN-коду чи пароля для шифрування пристрою щоразу при його ввімкненні"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Вимагає введення цифрового PIN-коду чи пароля для шифрування телефону щоразу при його ввімкненні"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій планшетний ПК, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування планшетного ПК щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних.\n\nШифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Планшетний ПК має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ви можете шифрувати свої облікові записи, налаштування, завантажені програми та їх дані, медіа-файли й інші файли. Щойно ви зашифруєте свій телефон, потрібно буде вводити цифровий PIN-код чи пароль для розшифрування телефону щоразу під час його ввімкнення. Ви зможете скасувати шифрування, лише відновивши заводські налаштування, що призведе до видалення всіх ваших даних.\n\nШифрування триває не менше години. Перш ніж розпочати процес шифрування, переконайтеся, що акумулятор заряджено. Телефон має перебувати в підключеному стані до завершення шифрування. Переривання процесу шифрування призведе до втрати частини чи всіх ваших даних."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Ви можете шифрувати свої облікові записи, налаштування, завантажені додатки та їх дані, медіа-файли й інші файли. Якщо ви встановили блокування екрана (тобто ключ, числовий PIN-код або пароль) і зашифрували планшет, для його розшифрування потрібно буде розблоковувати екран щоразу, коли ви вмикаєте планшет. Єдиний інший спосіб розшифрувати планшет – відновити заводські налаштування, але так стираються всі дані.\n\nШифрування триває не менше години. Перш ніж почати шифрування, переконайтеся, що акумулятор повністю заряджений. Не можна відключати планшет до завершення процесу. Якщо перервати шифрування, буде втрачено деякі або всі дані."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Ви можете шифрувати свої облікові записи, налаштування, завантажені додатки та їх дані, медіа-файли й інші файли. Якщо ви встановили блокування екрана (тобто ключ, числовий PIN-код або пароль) і зашифрували телефон, для його розшифрування потрібно буде розблоковувати екран щоразу, коли ви вмикаєте телефон. Єдиний інший спосіб розшифрувати телефон – відновити заводські налаштування, але так стираються всі дані.\n\nШифрування триває не менше години. Перш ніж почати шифрування, переконайтеся, що акумулятор повністю заряджений. Не можна відключати телефон до завершення процесу. Якщо перервати шифрування, буде втрачено деякі або всі дані."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Шифрувати пристрій"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Шифрувати телефон"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Зарядіть акумулятор і повторіть спробу."</string>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Переглянути чи відключити адміністраторів пристрою"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Довірчі агенти"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Переглядати або вимикати довірчі агенти"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Доступ до сповіщень"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Програми не можуть читати сповіщення"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"Програми, що можуть читати сповіщення: %d"</item>
-    <item quantity="other" msgid="980049191810249052">"Програми, що можуть читати сповіщення: %d"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Служби читання сповіщень не встановлено."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Увімкнути <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> зможе читати всі сповіщення, надіслані системою або будь-якою встановленою програмою. У сповіщеннях може бути особиста інформація, зокрема імена контактів і текст отриманих повідомлень. Ця програма також зможе закривати сповіщення або активувати в них кнопки."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Додатки, які надають умови"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Немає додатків, які надають умови"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"Додаток %d надає умови"</item>
-    <item quantity="other" msgid="358057362115673258">"Додатки %d надають умови"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Не встановлено додатків, які надають умови."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Увімкнути <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> зможе додавати умови виходу для режиму \"Не турбувати\"."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Увімк. Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Підключ. до мережі"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Видалити мережу"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Змінити мережу"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"У вас немає дозволу на змінення мережі Wi‑Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" Є доступ до WPS"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", захищено: <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Введіть пароль своєї мережі."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Немає"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Щоб покращити точність даних про місцезнаходження, а також для інших цілей, програма <xliff:g id="APP_NAME">%1$s</xliff:g> хоче вмикати сканування мережі, навіть коли Wi-Fi вимкнено.\n\nДозволити це для всіх програм, які потребують сканування?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Дозволити"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Головний екран"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Відображ."</string>
     <string name="sound_settings" msgid="5534671337768745343">"Звук"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Мелодія телефону"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Гучність"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Музичні ефекти"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Гучність дзвінка"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Вібр. в беззвуч. реж."</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Звук сповіщення за умовчанням"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Блим. світл. сигн. сповіщ."</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Важливі сповіщення поверх вікон"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Мелодія"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Сповіщення"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Вимкнути звук музичних та інших медіа-файлів"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Вимкнути звук сповіщень"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Вимкнути звук сповіщень"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вібрувати під час дзвінка"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Станц."</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Налашт. станц."</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Звук"</string>
@@ -758,8 +738,13 @@
     <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="2354961343555249270">"Яскравість"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Налаштуйте яскравість екрана"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Режим сну"</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>
@@ -1343,8 +1328,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Налагодження USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Реж. налагодж., коли підкл. ч-з USB"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Скасувати доступ до налагодження USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Повідомлення про помилки в меню \"Живлення\""</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Внести в меню \"Живлення\" опцію створення повідомлень про помилку"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Залишати активним"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран не засинатиме під час заряджання"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Увімкнути журнал відстеження інтерфейсу Bluetooth"</string>
@@ -1820,6 +1807,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC-адреса"</string>
     <string name="enter_password" msgid="4131758584074246224">"Введіть пароль, щоб розшифрувати носій"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Введіть PIN-код, щоб розшифрувати носій"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Намалюйте ключ, щоб розшифрувати носій"</string>
     <string name="try_again" msgid="4272075051293936921">"Повторіть спробу."</string>
     <string name="delete" msgid="4219243412325163003">"Видалити"</string>
     <string name="misc_files" msgid="6720680815969643497">"Різні файли"</string>
@@ -2072,6 +2061,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Змінити розмір шрифту"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Натиснути й оплатити"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Платіть одним дотиком"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Надавати перевагу активному додатку"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Докладніше"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Пошук програм"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Надавати перевагу?"</string>
@@ -2125,16 +2115,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Останні пошукові запити"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Результати"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi network connection"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Коли пристрій заблоковано"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ховати конфіденційний вміст сповіщень"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показувати весь вміст сповіщень"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Не турбувати"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не турбувати"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Сповіщення"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Налаштування"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Сповіщення додатків"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Налаштувати NFC-тег Wi-Fi"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Записати"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Торкніться тегу, у який потрібно записати дані…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Недійсний пароль. Повторіть спробу."</string>
@@ -2142,19 +2124,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Не вдалося записати дані в NFC-тег. Якщо проблема не зникне, виберіть інший тег"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"У цей NFC-тег не можна записувати дані. Виберіть інший."</string>
     <string name="default_sound" msgid="8821684447333687810">"Звук за умовчанням"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Звуки та сповіщення"</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="zen_mode_settings_title" msgid="2689740350895257590">"Не турбувати"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Коли надходять дзвінки та сповіщення"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Дзвінок"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Вібросигнал замість дзвінка"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Беззвучний режим або вібросигнал"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Мелодія телефону"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Сигнал сповіщень за умовчанням"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вібрувати під час дзвінка"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Показ сповіщень"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Блим. світл. сигн. сповіщ."</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Коли пристрій заблоковано"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показувати весь вміст сповіщень"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ховати конфіденційний вміст сповіщень"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Узагалі не показувати сповіщення"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Коли ввімкнено опцію \"Не турбувати\""</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ховати нові сповіщення в списку"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Показувати всі сповіщення в списку"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Сповіщення з додатків"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Звуки під час дотику"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Звуки цифрової клавіатури"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Блокування та розблокування екрана"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Інші звуки під час дотику"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Вібрація під час дотику"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ до сповіщень"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Програми не можуть читати сповіщення"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"Програми, що можуть читати сповіщення: %d"</item>
+    <item quantity="other" msgid="980049191810249052">"Програми, що можуть читати сповіщення: %d"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Служби читання сповіщень не встановлено."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Увімкнути <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> зможе читати всі сповіщення, надіслані системою або будь-якою встановленою програмою. У сповіщеннях може бути особиста інформація, зокрема імена контактів і текст отриманих повідомлень. Ця програма також зможе закривати сповіщення або активувати в них кнопки."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Додатки, які надають умови"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Немає додатків, які надають умови"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"Додаток %d надає умови"</item>
+    <item quantity="other" msgid="358057362115673258">"Додатки %d надають умови"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Не встановлено додатків, які надають умови."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Увімкнути <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> зможе додавати умови виходу для режиму \"Не турбувати\"."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Завантаження додатків…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Показувати сповіщення"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Високий пріоритет"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Показувати вгорі списку"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ховати конфіденційний вміст, коли пристрій заблоковано"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Заблоковано"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Угорі списку"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Конфіденційно"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Готово"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Вимкнено"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Увімкнено"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Доки ви не вимкнете"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Блокувати всі перешкоди, крім таких:"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Уночі"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Інша автоматизація"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Вмикати автоматично"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Ніколи"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Телефонні дзвінки"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Повідомлення"</string>
@@ -2170,5 +2198,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Час початку"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Час завершення"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"Наступного дня о <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Сповіщення додатків"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Налаштування сповіщень"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Надіслати відгук про цей пристрій"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 413ea07..71f2290 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Bạn đã là nhà phát triển!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Không cần, bạn đã là nhà phát triển."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"KHÔNG DÂY &amp; MẠNG"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"THIẾT BỊ"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"CÁ NHÂN"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"HỆ THỐNG"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"Bật radio"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Tắt radio"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Bật SMS qua IMS"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Mã hóa"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Mã hóa máy tính bảng"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Mã hóa điện thoại"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Yêu cầu PIN số hoặc mật khẩu để giải mã điện thoại của bạn mỗi lần bạn bật điện thoại"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Đã mã hóa"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa máy tính bảng, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật máy tính bảng: bạn không thể hủy mã hóa máy tính bảng trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn.\n\nQuá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm máy tính bảng cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Bạn có thể mã hóa tài khoản, cài đặt, ứng dụng đã tải xuống và dữ liệu, phương tiện của các ứng dụng đó cũng như các tệp khác của bạn. Sau khi mã hóa điện thoại, bạn cần nhập mã PIN số hoặc mật khẩu để giải mã mỗi lần bạn bật điện thoại. Bạn không thể hủy mã hóa điện thoại trừ khi thiết lập lại dữ liệu ban đầu, xóa tất cả dữ liệu của bạn.\n\nQuá trình mã hóa mất ít nhất một giờ. Bạn phải bắt đầu khi pin đã được sạc và vẫn cắm điện thoại cho tới khi quá trình mã hóa hoàn tất. Nếu làm gián đoạn quá trình mã hóa, bạn sẽ mất một số hoặc tất cả dữ liệu của bạn."</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Mã hóa máy tính bảng"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Mã hóa điện thoại"</string>
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Vui lòng sạc pin và thử lại."</string>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Xem hoặc hủy kích hoạt quản trị viên điện thoại"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Đại lý đáng tin cậy"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Xem hoặc hủy kích hoạt đại lý đáng tin cậy"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Quyền quy cập thông báo"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ứng dụng không thể đọc thông báo"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d ứng dụng có thể đọc thông báo"</item>
-    <item quantity="other" msgid="980049191810249052">"%d ứng dụng có thể đọc thông báo"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Không có trình xử lý thông báo nào được cài đặt."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Bật <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> có thể đọc tất cả thông báo được đăng bởi hệ thống hoặc bất kỳ ứng dụng đã cài đặt nào. Thông báo đó có thể bao gồm thông tin cá nhân như tên liên hệ và văn bản thông báo được gửi tới bạn. Trình xử lý cũng sẽ có thể loại bỏ những thông báo này hoặc chạm vào nút tác vụ trong các thông báo đó."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Trình cung cấp điều kiện"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Không có ứng dụng nào cung cấp điều kiện"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d ứng dụng cung cấp điều kiện"</item>
-    <item quantity="other" msgid="358057362115673258">"%d ứng dụng cung cấp điều kiện"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Không có trình cung cấp điều kiện nào được cài đặt."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Bật <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> có thể thêm điều kiện thoát vào chế độ Không làm phiền."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Bật Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Kết nối tới mạng"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Quên mạng"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Sửa đổi mạng"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Để xem các mạng khả dụng, hãy bật Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Đang tìm kiếm mạng Wi‑Fi..."</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Bạn không có quyền thay đổi mạng Wi‑Fi."</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (Có WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", được bảo mật bằng <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Nhập mật khẩu mạng của bạn."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Không"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Để nâng cao độ chính xác vị trí và phục vụ các mục đích khác, <xliff:g id="APP_NAME">%1$s</xliff:g> muốn bật tính năng quét mạng ngay cả khi Wi-Fi đang tắt.\n\nCho phép cài đặt này đối với tất cả ứng dụng muốn quét?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Cho phép"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"Trang chủ"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Hiển thị"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Âm thanh"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Nhạc chuông điện thoại"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Âm lượng"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Hiệu ứng âm nhạc"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Âm lượng chuông"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Rung khi im lặng"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Âm thanh thông báo mặc định"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Đèn thông báo dạng xung"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Bật lên nếu mức độ ưu tiên cao"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Nhạc chuông"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Thông báo"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Tắt nhạc và phương tiện khác"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Ẩn thông báo"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Tắt báo thức"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Rung khi đổ chuông"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Đế"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Cài đặt đế"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Âm thanh"</string>
@@ -758,8 +744,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Tự động chuyển hướng khi xoay điện thoại"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Tự động chuyển hướng khi xoay máy tính bảng"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Tự động chuyển hướng khi xoay điện thoại"</string>
-    <string name="brightness" msgid="2354961343555249270">"Độ sáng"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Điều chỉnh độ sáng của màn hình"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Thời gian sáng"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Gỡ lỗi USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Chế độ gỡ lỗi khi USB được kết nối"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Thu hồi ủy quyền gỡ lỗi USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Báo cáo lỗi trong trình đơn nguồn"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Bao gồm tùy chọn trong trình đơn nguồn để thêm báo cáo lỗi"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Không khóa màn hình"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Màn hình sẽ không bao giờ chuyển sang chế độ nghỉ khi sạc"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bật nhật ký theo dõi HCI Bluetooth"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Độ cao"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Ảnh hưởng đến âm của văn bản nói"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Ngôn ngữ"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"Sử dụng ngôn ngữ hệ thống"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Không thể chọn ngôn ngữ"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Đặt giọng nói ngôn ngữ cụ thể cho văn bản nói"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Nghe ví dụ"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Địa chỉ MAC 4G"</string>
     <string name="enter_password" msgid="4131758584074246224">"Nhập mật khẩu để giải mã bộ nhớ"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"Thử lại."</string>
     <string name="delete" msgid="4219243412325163003">"Xóa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Tệp khác"</string>
@@ -2073,6 +2069,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Thay đổi cỡ chữ"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Nhấn và thanh toán"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Thanh toán chỉ bằng một lần chạm"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Ứng dụng nổi ưa thích"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Tìm hiểu thêm"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Tìm ứng dụng"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Đặt làm tùy chọn của bạn?"</string>
@@ -2126,16 +2123,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Tìm kiếm gần đây"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Kết quả"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi kết nối mạng"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Khi thiết bị bị khóa"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ẩn nội dung thông báo nhạy cảm"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Hiển thị tất cả nội dung thông báo"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Đừng làm phiền"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Đừng làm phiền"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Thông báo"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Chỉnh sửa"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Thông báo ứng dụng"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Thiết lập thẻ WiFi NFC"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Ghi"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Nhấn vào một thẻ để ghi..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Mật khẩu không hợp lệ, hãy thử lại."</string>
@@ -2143,19 +2132,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Không thể ghi dữ liệu vào thẻ NFC. Nếu sự cố tiếp diễn, hãy thử một thẻ khác"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Thẻ NFC không thể ghi được. Vui lòng sử dụng một thẻ khác."</string>
     <string name="default_sound" msgid="8821684447333687810">"Âm thanh mặc định"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Đừng làm phiền"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"Nhạc chuông điện thoại"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Rung khi đổ chuông"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Đèn thông báo dạng xung"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Hiển thị tất cả nội dung thông báo"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ẩn nội dung thông báo nhạy cảm"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"Thông báo ứng dụng"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Ứng dụng không thể đọc thông báo"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d ứng dụng có thể đọc thông báo"</item>
+    <item quantity="other" msgid="980049191810249052">"%d ứng dụng có thể đọc thông báo"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Không có trình xử lý thông báo nào được cài đặt."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Bật <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> có thể đọc tất cả thông báo được đăng bởi hệ thống hoặc bất kỳ ứng dụng đã cài đặt nào. Thông báo đó có thể bao gồm thông tin cá nhân như tên liên hệ và văn bản thông báo được gửi tới bạn. Trình xử lý cũng sẽ có thể loại bỏ những thông báo này hoặc chạm vào nút tác vụ trong các thông báo đó."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Trình cung cấp điều kiện"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Không có ứng dụng nào cung cấp điều kiện"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d ứng dụng cung cấp điều kiện"</item>
+    <item quantity="other" msgid="358057362115673258">"%d ứng dụng cung cấp điều kiện"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Không có trình cung cấp điều kiện nào được cài đặt."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Bật <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> có thể thêm điều kiện thoát vào chế độ Không làm phiền."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Đang tải ứng dụng..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Hiện thông báo"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Mức độ ưu tiên cao"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Xong"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Tắt"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Bật"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Cho đến khi bạn tắt tính năng này"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Chặn tất cả các gián đoạn ngoại trừ"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Vào ban đêm"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Tự động hóa khác"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Tự động bật"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Không bao giờ"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Cuộc gọi điện thoại"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Tin nhắn"</string>
@@ -2171,5 +2233,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Thời gian bắt đầu"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Thời gian kết thúc"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> ngày hôm sau"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Thông báo ứng dụng"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Cài đặt thông báo"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Gửi phản hồi về thiết bị này"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b845168..687ab07 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您现在处于开发者模式！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"您已处于开发者模式，无需进行此操作。"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"无线和网络"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"设备"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"个人"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"系统"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"打开无线通信"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"关闭无线通信"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"启用通过 IMS 发送短信的功能"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密平板电脑"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密手机"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"您每次开机时都需要输入数字 PIN 或密码才能解密平板电脑"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"您每次开机时都需要输入数字 PIN 或密码才能解密手机"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密平板电脑后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除平板电脑上的所有数据。\n\n加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以加密自己的帐户、设置、已下载的应用及其数据、媒体和其他文件。加密手机后，您每次开机时都需要输入数字 PIN 或密码才能解密。取消加密的唯一方法就是恢复出厂设置，但这会清除手机上的所有数据。\n\n加密过程需要 1 小时或更长时间。在开始加密前，电池必须有电，并且在加密完成前必须一直连接电源。如果您中断加密过程，则会丢失部分或全部数据。"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或停用设备管理器"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"信任的代理"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"查看或停用信任的代理"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"通知读取权限"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"应用无法读取通知"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d个应用可以读取通知"</item>
-    <item quantity="other" msgid="980049191810249052">"%d个应用可以读取通知"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"未安装任何通知侦听器。"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"要启用“<xliff:g id="SERVICE">%1$s</xliff:g>”吗？"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"“<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>”将可读取系统或任何已安装应用发布的任何通知（可能包括联系人姓名和别人发送给您的消息文字等个人信息），还将可以关闭这些通知或触摸其中的操作按钮。"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"条件提供程序"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"没有任何应用可提供条件"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d个应用可提供条件"</item>
-    <item quantity="other" msgid="358057362115673258">"%d个应用可提供条件"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"未安装任何条件提供程序。"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"要启用“<xliff:g id="SERVICE">%1$s</xliff:g>”吗？"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"“<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>”将可为勿扰模式添加退出条件。"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"蓝牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"打开蓝牙"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"蓝牙"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"连接到网络"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"取消保存网络"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改网络"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"您无权更改 WLAN 网络。"</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" （可使用 WPS）"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，通过 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 进行保护"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"请输入您的网络密码。"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"无"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"为了提高位置信息精确度以及其他目的，“<xliff:g id="APP_NAME">%1$s</xliff:g>”请求启用网络扫描功能（在关闭了 WLAN  时也可进行扫描）。\n\n是否对所有需要进行扫描的应用批准这项请求？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允许"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"主屏幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"显示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"声音"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"音乐效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"铃声音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"静音时振动"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"默认通知提示音"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"收到通知时指示灯闪烁"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"弹出显示高优先级的通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"铃声"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"使音乐和其他媒体静音"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"使通知静音"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"使闹钟静音"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"响铃时振动"</string>
     <string name="dock_settings" msgid="1820107306693002541">"基座"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"基座设置"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"音频"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"亮度"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</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>
@@ -980,19 +971,19 @@
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"您需要绘制解锁图案以确认要清空 SD 卡。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通话设置"</string>
     <string name="call_settings_summary" msgid="7291195704801002886">"设置语音信箱、来电转接、来电等待和本机号码显示"</string>
-    <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 共享网络"</string>
+    <string name="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_bluetooth" msgid="355855408317564420">"蓝牙网络共享"</string>
     <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"网络共享"</string>
     <string name="tether_settings_title_all" msgid="8356136101061143841">"网络共享与便携式热点"</string>
     <string name="usb_title" msgid="7483344855356312510">"USB"</string>
-    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB 共享网络"</string>
+    <string name="usb_tethering_button_text" msgid="585829947108007917">"USB网络共享"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB 已连接，选中以共享网络"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"已共享网络"</string>
     <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"使用 USB 存储设备时无法共享网络"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB 未连接"</string>
-    <string name="usb_tethering_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="8811610320942954709">"共享该平板电脑的互联网连接"</string>
     <string name="bluetooth_tethering_available_subtext" product="default" msgid="4229220575771946723">"共享该手机的互联网连接"</string>
     <string name="bluetooth_tethering_device_connected_subtext" product="tablet" msgid="2730938191906597896">"将该平板电脑的互联网连接与 1 台设备共享"</string>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"连接 USB 后启用调试模式"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"撤消 USB 调试授权"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"电源键菜单错误报告"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在电源键菜单中添加提交错误报告的选项"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"不锁定屏幕"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充电时屏幕不会休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"启用蓝牙 HCI 信息收集日志"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音高"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"更改所播放的文字的音调"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"语言"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"使用系统语言"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"未选择语言"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"设置文字转语音功能要使用的语言"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"收听示例"</string>
@@ -1821,6 +1813,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 地址"</string>
     <string name="enter_password" msgid="4131758584074246224">"键入密码以解密存储设备"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"请重试。"</string>
     <string name="delete" msgid="4219243412325163003">"删除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他文件"</string>
@@ -2018,8 +2014,7 @@
     <string name="ssl_ca_cert_settings_button" msgid="8760495070836213605">"查看受信任的凭据"</string>
     <string name="user_settings_title" msgid="6151874007858148344">"用户"</string>
     <string name="user_list_title" msgid="7937158411137563543">"用户和个人资料"</string>
-    <!-- no translation found for user_add_user_or_profile_menu (6923838875175259418) -->
-    <skip />
+    <string name="user_add_user_or_profile_menu" msgid="6923838875175259418">"添加用户或个人资料"</string>
     <string name="user_add_user_menu" msgid="1675956975014862382">"添加用户"</string>
     <string name="user_summary_restricted_profile" msgid="6354966213806839107">"受限个人资料"</string>
     <string name="user_summary_managed_profile" msgid="5729429961989469287">"受管理个人资料"</string>
@@ -2074,6 +2069,8 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"更改字体大小"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"触碰付款"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"轻轻一碰，即可付款"</string>
+    <!-- no translation found for nfc_payment_favor_foreground (8881893980929835838) -->
+    <skip />
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"了解详情"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"查找应用"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"要设为您的偏好设置吗？"</string>
@@ -2127,16 +2124,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近执行的搜索"</string>
     <string name="search_results_label" msgid="4163304782363526148">"搜索结果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"WLAN网络连接"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"设备锁定时"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隐藏敏感通知内容"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"显示所有通知内容"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"勿扰"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"勿扰"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"通知"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"调整"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"应用通知"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"设置WLAN NFC标签"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"写入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"点按标签即可写入…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"密码无效，请重试。"</string>
@@ -2144,19 +2133,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"无法将数据写入NFC标签。如果该问题一直存在，请尝试使用其他标签"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"无法将数据写入NFC标签，请使用其他标签。"</string>
     <string name="default_sound" msgid="8821684447333687810">"默认铃声"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"勿扰"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"手机铃声"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"响铃时振动"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"收到通知时指示灯闪烁"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"显示所有通知内容"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隐藏敏感通知内容"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"应用通知"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"应用无法读取通知"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d个应用可以读取通知"</item>
+    <item quantity="other" msgid="980049191810249052">"%d个应用可以读取通知"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"未安装任何通知侦听器。"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"要启用“<xliff:g id="SERVICE">%1$s</xliff:g>”吗？"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"“<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>”将可读取系统或任何已安装应用发布的任何通知（可能包括联系人姓名和别人发送给您的消息文字等个人信息），还将可以关闭这些通知或触摸其中的操作按钮。"</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"条件提供程序"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"没有任何应用可提供条件"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d个应用可提供条件"</item>
+    <item quantity="other" msgid="358057362115673258">"%d个应用可提供条件"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"未安装任何条件提供程序。"</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"要启用“<xliff:g id="SERVICE">%1$s</xliff:g>”吗？"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"“<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g>”将可为勿扰模式添加退出条件。"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"正在加载应用…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"显示通知"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"高优先级"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"关闭"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"开启"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"直到您将其关闭"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"只允许以下这些人和通讯类型打扰我"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"夜间"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"其他自动化设置"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自动开启"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">"，"</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"一律不"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"电话"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"消息"</string>
@@ -2172,5 +2234,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"开始时间"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"结束时间"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"次日<xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"应用通知"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"通知设置"</string>
     <string name="device_feedback" msgid="3238056036766293294">"发送有关此设备的反馈"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 12411cd..4c09c1f 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您現已成為開發人員！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線與網絡"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"裝置"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"個人"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"系統"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"開啟無線電"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"關閉無線電"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"開啟透過 IMS 發送短訊"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"對平板電腦進行加密"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"每次平板電腦開機後，需輸入數字 PIN 或密碼才能對平板電腦解密。"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"每次手機開機後，需輸入數字 PIN 或密碼才能將手機解密"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以將帳戶、設定、已下載的應用程式和資料、媒體以及其他檔案加密。一旦您將平板電腦加密，就必須在每次開機時輸入數字 PIN 或密碼才能解密。除了透過恢復原廠設定 (這樣會清除平板電腦上的所有資料) 之外，您無法解除加密狀態。\n\n加密程序需時 1 個小時或以上。加密前必須先將電池充滿電，並且在過程中讓平板電腦持續連接電源，直到加密完成為止。如果加密程序中斷，您將失去部分或全部資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以將帳戶、設定、已下載的應用程式和資料、媒體以及其他檔案加密。一旦您將手機加密，就必須在每次開機時輸入數字 PIN 或密碼才能解密。除了透過恢復原廠設定 (這樣會清除手機上的所有資料) 之外，您無法解除加密狀態。\n\n加密程序需時 1 個小時或以上。加密前必須先將電池充滿電，並且在過程中讓手機持續連接電源，直到加密完成為止。如果加密程序中斷，您將失去部分或全部資料。"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或停用裝置管理員"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"信任的代理程式"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"查看或停用信任的代理程式"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"通知存取權"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d 個應用程式可讀取通知"</item>
-    <item quantity="other" msgid="980049191810249052">"%d 個應用程式可讀取通知"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"沒有安裝任何通知接聽器。"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」將可讀取系統或任何已安裝的應用程式發佈的所有通知 (可能包括聯絡人姓名和他人傳送給您的訊息文字之類的個人資訊)，並可關閉這些通知或其中的觸控操作按鈕。"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"條件供應商"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"沒有應用程式提供條件"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d 個應用程式提供條件"</item>
-    <item quantity="other" msgid="358057362115673258">"%d 個應用程式提供條件"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"尚未安裝任何條件供應商。"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"是否啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> 可新增結束「請勿騷擾」模式的條件。"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"藍芽"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"開啟藍牙功能"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"藍牙"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網絡"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"刪除網絡"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改網絡"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"您無權更改 Wi-Fi 網絡。"</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (有 WPS 可供使用)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"以 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 保護連線安全性"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，以 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 保護連線安全性"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"輸入您的網絡密碼。"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」要求開啟網絡掃瞄功能 (即使 Wi-Fi 已關閉)，以提升定位精確度及用於其他用途。\n\n您要允許所有需要掃瞄的應用程式這項要求嗎？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"主畫面"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"音樂效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"鈴聲音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"預設通知音效"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"彈出顯示高度優先的通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"關閉音樂和其他媒體音效"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"關閉通知音效"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"關閉鬧鐘音效"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"鈴響時震動"</string>
     <string name="dock_settings" msgid="1820107306693002541">"座架"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"座架設定"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"音效設定"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"亮度"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"調校屏幕亮度"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"撤銷 USB 偵錯授權"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"電源選單錯誤報告"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在電源選單中包括取得錯誤報告的選項"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"保持啟用"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時屏幕一律不進入休眠狀態"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探記錄"</string>
@@ -1824,6 +1817,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
     <string name="enter_password" msgid="4131758584074246224">"輸入密碼即可為儲存裝置解密"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"請再試一次。"</string>
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他檔案"</string>
@@ -2076,6 +2073,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"更改字型大小"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"輕按付款"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"輕按一下即可付款"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"偏好前景應用程式"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"瞭解詳情"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"尋找應用程式"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設為您的喜好設定？"</string>
@@ -2129,16 +2127,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近的搜尋查詢"</string>
     <string name="search_results_label" msgid="4163304782363526148">"搜尋結果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"WiFi Wi-Fi 網絡連線"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"當裝置上鎖時"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏敏感通知內容"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"請勿干擾"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"請勿干擾"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"通知"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"調整"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"設定 Wi-Fi NFC 標籤"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕按標籤即可寫入…"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"密碼無效，請再試一次。"</string>
@@ -2146,19 +2136,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"無法將資料寫入 NFC 標籤。如果問題仍然持續，請嘗試使用其他標籤"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"無法寫入 NFC 標籤，請使用其他標籤。"</string>
     <string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"請勿干擾"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"鈴響時震動"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏敏感通知內容"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d 個應用程式可讀取通知"</item>
+    <item quantity="other" msgid="980049191810249052">"%d 個應用程式可讀取通知"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"沒有安裝任何通知接聽器。"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」將可讀取系統或任何已安裝的應用程式發佈的所有通知 (可能包括聯絡人姓名和他人傳送給您的訊息文字之類的個人資訊)，並可關閉這些通知或其中的觸控操作按鈕。"</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"條件供應商"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"沒有應用程式提供條件"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d 個應用程式提供條件"</item>
+    <item quantity="other" msgid="358057362115673258">"%d 個應用程式提供條件"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"尚未安裝任何條件供應商。"</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"是否啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> 可新增結束「請勿騷擾」模式的條件。"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式…"</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"顯示通知"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"高度優先"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"關閉"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"開啟"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"直至您關閉這項設定"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"除以下項目之外，封鎖所有干擾："</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"晚上"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"其他自動化設定"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">"，"</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永不"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"通話"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
@@ -2174,5 +2237,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"開始時間"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"完結時間"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"下一天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送有關這個裝置的意見"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 6a0586c..f42686b 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -28,10 +28,14 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"您現在已成為開發人員！"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"不需要了，您已經是開發人員。"</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"無線與網路"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"裝置"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"個人"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"系統"</string>
+    <!-- no translation found for header_category_wireless_networks (7617195369015536614) -->
+    <skip />
+    <!-- no translation found for header_category_device (4544026001618307754) -->
+    <skip />
+    <!-- no translation found for header_category_personal (3310195187905720823) -->
+    <skip />
+    <!-- no translation found for header_category_system (2816866961183068977) -->
+    <skip />
     <string name="turn_on_radio" msgid="8706561489788373676">"開啟無線通訊"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"關閉無線通訊"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"開啟 IMS 簡訊"</string>
@@ -332,11 +336,11 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"加密"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密保護平板電腦"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"每次平板電腦開機後，需輸入數字 PIN 或密碼才能對平板電腦解密。"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"每次手機開機後，需輸入數字 PIN 或密碼才能對手機解密。"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將平板電腦加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除平板電腦上的所有資料。\n\n加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓平板電腦持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"您可以將帳戶、設定、已下載的應用程式及其資料、媒體和其他檔案加密。一旦您將手機加密，就必須在每次開機時輸入數字 PIN 或密碼，如此才能解密。如要解除加密狀態，必須恢復原廠設定，但這樣會清除手機上所有的資料。\n\n加密過程可能需要 1 個小時以上的時間。加密前必須先將電池充滿電，並且在過程中讓手機持續連接電源，直到加密完成為止。如果加密過程中斷，您將失去部分或所有資料。"</string>
+    <!-- no translation found for crypt_keeper_desc (7966195172468864148) -->
+    <skip />
+    <!-- no translation found for crypt_keeper_desc (9182896617884899822) -->
+    <skip />
     <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>
@@ -435,24 +439,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"查看或撤銷裝置管理員"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"信任的代理程式"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"查看或停用信任的代理程式"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"通知存取權"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d 個應用程式可以讀取通知"</item>
-    <item quantity="other" msgid="980049191810249052">"%d 個應用程式可以讀取通知"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"沒有安裝任何通知接聽器。"</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」將可讀取系統或任何已安裝的應用程式發佈的所有通知 (可能包括聯絡人姓名和他人傳送給您的訊息文字等個人資訊)，並可關閉這些通知或其中的觸控操作按鈕。"</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"條件提供者"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"沒有任何應用程式提供條件"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"%d 個應用程式提供了條件"</item>
-    <item quantity="other" msgid="358057362115673258">"%d 個應用程式提供了條件"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"尚未安裝任何條件提供者。"</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> 將可新增結束「請勿打擾」模式的條件。"</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"藍牙"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"開啟藍牙"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"藍牙"</string>
@@ -590,6 +576,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"連線至網路"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"清除網路"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"修改網路"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <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="8280257225419947565">"您沒有變更 Wi-Fi 網路的權限。"</string>
@@ -638,7 +626,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (可使用 WPS)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">"，透過 <xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g> 加密保護"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"輸入您的網路密碼。"</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"無"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"<xliff:g id="APP_NAME">%1$s</xliff:g> 要求開啟網路掃描功能 (即使 Wi-Fi 已關閉)，藉此提升定位精確度及用於其他用途。\n\n您要對所有需要執行掃描的應用程式允許這項要求嗎？"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"允許"</string>
@@ -702,14 +691,12 @@
     <string name="home_settings" msgid="212375129455718176">"主螢幕"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"顯示"</string>
     <string name="sound_settings" msgid="5534671337768745343">"音效"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"音量"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"音樂效果"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"鈴聲音量"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"靜音時震動"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"預設通知音效"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"彈出顯示高優先順序的通知"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"鈴聲"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"通知"</string>
@@ -732,7 +719,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"關閉音樂和其他媒體音效"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"關閉通知音效"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"關閉鬧鐘音效"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"鈴響時震動"</string>
     <string name="dock_settings" msgid="1820107306693002541">"座架"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"座架設定"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"音效"</string>
@@ -758,8 +744,13 @@
     <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="2354961343555249270">"亮度"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"休眠"</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>
@@ -1343,8 +1334,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"撤銷 USB 偵錯授權"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"電源選單錯誤報告"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"在電源選單中納入取得錯誤報告的選項"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"保持清醒"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕不會進入休眠"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探紀錄"</string>
@@ -1628,8 +1621,7 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"音調"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"影響文字轉語音功能的播放音調"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"語言"</string>
-    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
-    <skip />
+    <string name="tts_lang_use_system" msgid="2679252467416513208">"使用系統設定"</string>
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"未選取語言"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"設定文字轉語音功能要用的語言"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"聆聽範例"</string>
@@ -1825,6 +1817,10 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"4G MAC 位址"</string>
     <string name="enter_password" msgid="4131758584074246224">"輸入密碼即可為儲存裝置解密"</string>
+    <!-- no translation found for enter_pin (286221169871526876) -->
+    <skip />
+    <!-- no translation found for enter_pattern (5707838886272453608) -->
+    <skip />
     <string name="try_again" msgid="4272075051293936921">"請再試一次。"</string>
     <string name="delete" msgid="4219243412325163003">"刪除"</string>
     <string name="misc_files" msgid="6720680815969643497">"其他檔案"</string>
@@ -2077,6 +2073,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"變更字型大小"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"感應付款"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"輕點一下即可付款"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"偏好前景應用程式"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"瞭解詳情"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"尋找應用程式"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"設為您的偏好設定？"</string>
@@ -2130,16 +2127,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"最近的搜尋查詢"</string>
     <string name="search_results_label" msgid="4163304782363526148">"搜尋結果"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"wifi wi-fi 網路連線"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"裝置鎖定時"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏機密通知內容"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"勿干擾"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"勿干擾"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"通知"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"調整"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"設定 WiFi NFC 標記"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"寫入"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"輕按標記即可寫入..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"密碼無效，請再試一次。"</string>
@@ -2147,19 +2136,92 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"無法將資料寫入 NFC 標記。如果問題持續發生，請嘗試使用其他標記"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"無法寫入 NFC 標記，請使用其他標記。"</string>
     <string name="default_sound" msgid="8821684447333687810">"預設音效"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
+    <!-- no translation found for notification_settings (7558043253996992936) -->
+    <skip />
+    <!-- no translation found for media_volume_option_title (2811531786073003825) -->
+    <skip />
+    <!-- no translation found for alarm_volume_option_title (8219324421222242421) -->
+    <skip />
+    <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
+    <skip />
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"勿干擾"</string>
+    <!-- no translation found for ringer_mode_title (7489457312298627735) -->
+    <skip />
+    <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
+    <skip />
+    <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
+    <skip />
+    <!-- no translation found for ringer_mode_silent (4812605852723880795) -->
+    <skip />
+    <string name="ringtone_title" msgid="5379026328015343686">"電話鈴聲"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"鈴響時震動"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
+    <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
+    <!-- no translation found for lock_screen_notifications_title (9118805570775519455) -->
+    <skip />
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏機密通知內容"</string>
+    <!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
+    <skip />
+    <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
+    <skip />
     <string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
+    <!-- no translation found for touch_sound_settings (8861737295513989009) -->
+    <skip />
+    <!-- no translation found for dial_pad_tones_title (1999293510400911558) -->
+    <skip />
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
+    <skip />
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
+    <skip />
+    <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
+    <skip />
+    <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
+    <skip />
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"應用程式無法讀取通知"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d 個應用程式可以讀取通知"</item>
+    <item quantity="other" msgid="980049191810249052">"%d 個應用程式可以讀取通知"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"沒有安裝任何通知接聽器。"</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"「<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g>」將可讀取系統或任何已安裝的應用程式發佈的所有通知 (可能包括聯絡人姓名和他人傳送給您的訊息文字等個人資訊)，並可關閉這些通知或其中的觸控操作按鈕。"</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"條件提供者"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"沒有任何應用程式提供條件"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"%d 個應用程式提供了條件"</item>
+    <item quantity="other" msgid="358057362115673258">"%d 個應用程式提供了條件"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"尚未安裝任何條件提供者。"</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"啟用 <xliff:g id="SERVICE">%1$s</xliff:g>？"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> 將可新增結束「請勿打擾」模式的條件。"</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"正在載入應用程式..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"顯示通知"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"高優先順序"</string>
+    <!-- no translation found for app_notifications_dialog_priority (3025242591043646494) -->
+    <skip />
+    <!-- no translation found for app_notifications_dialog_visibility (2983683711202708107) -->
+    <skip />
+    <!-- no translation found for app_notification_row_banned (5983655258784814773) -->
+    <skip />
+    <!-- no translation found for app_notification_row_priority (7597101427045166499) -->
+    <skip />
+    <!-- no translation found for app_notification_row_sensitive (1809610030432329940) -->
+    <skip />
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"完成"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"關閉"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"開啟"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"手動關閉這項設定前一律啟用"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"封鎖所有干擾，但以下項目除外："</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"夜間"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"其他自動化設定"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"自動開啟"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">"、"</string>
+    <!-- no translation found for summary_divider_text (3087735442599707533) -->
+    <skip />
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"永遠不要"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"通話"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"訊息"</string>
@@ -2175,5 +2237,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"開始時間"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"結束時間"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"隔天 <xliff:g id="FORMATTED_TIME">%s</xliff:g>"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"應用程式通知"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"通知設定"</string>
     <string name="device_feedback" msgid="3238056036766293294">"傳送您對這個裝置的意見回饋"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3a374aa..8dedc0e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -28,10 +28,10 @@
   </plurals>
     <string name="show_dev_on" msgid="1110711554982716293">"Manje ungunjiniyela!"</string>
     <string name="show_dev_already" msgid="2151632240145446227">"Asikho isidingo, usuvele ungunjiniyela."</string>
-    <string name="header_category_wireless_networks" msgid="4944823405420438623">"AMANETHIWEKHI NOKUNGENANTAMBO"</string>
-    <string name="header_category_device" msgid="5781174212691167553">"IDIVAYISI"</string>
-    <string name="header_category_personal" msgid="6225932173498802187">"YOMUNTU UQOBO LWAKHE"</string>
-    <string name="header_category_system" msgid="2073558547468647128">"ISISTIMU"</string>
+    <string name="header_category_wireless_networks" msgid="7617195369015536614">"Okungenantambo namanethiwekhi"</string>
+    <string name="header_category_device" msgid="4544026001618307754">"Idivayisi"</string>
+    <string name="header_category_personal" msgid="3310195187905720823">"Okomuntu siqu"</string>
+    <string name="header_category_system" msgid="2816866961183068977">"Isistimu"</string>
     <string name="turn_on_radio" msgid="8706561489788373676">"Vula umsakazo"</string>
     <string name="turn_off_radio" msgid="1820294552893884115">"Vala umsakazo"</string>
     <string name="sms_over_ims_on" msgid="5085290395865632925">"Vula i-SMS phezulu kwe-IMS"</string>
@@ -332,11 +332,9 @@
     <string name="crypt_keeper_settings_title" msgid="4219233835490520414">"Ukubethelwa"</string>
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Bethela ithebhulethi"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Bethela ifoni"</string>
-    <string name="crypt_keeper_encrypt_summary" product="tablet" msgid="6291564408810586">"Dinga i-PIN yenombolo noma iphasiwedi ukubonisa umbhalo wemfihlo kwithebhulethi ngazo zonke izikhathi lapho uyivula"</string>
-    <string name="crypt_keeper_encrypt_summary" product="default" msgid="514138079795442371">"Dinga i-PIN yenombolo noma iphasiwedi ukungabhali ngemfihlo ifoni yakho njalo lapho uyivula"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Betheliwe"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="3839235202103924154">"Ungabethela ama-akhawunti wakho, izilungiselelo, ulande izinhlelo zokusebenza nedatha yazo, imidiya, namanye amafayela. Uma usubethele ikhompyutha yakho, udinga ukuthayipha i-PIN yenombolo noma iphasiwedi ukususa ukubhala ngekhodi ngaso isikathi ukhanyisa: awukwazi ukususa ukubhala ngakhodi ikhompyutha yakho ngaphandle kokwenza kabusha idatha yakho yenkampani, sula yonke idatha yakho.\n\nUkubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe futhi ugcine ikhompyutha yakho iplakiwe kuze kuphele ukubethela. Uma uphazamisa inqubo yokubethela, uzolahlekelwa enye noma yonke idatha yakho."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="7663118199519229502">"Ungabhala ngakhodi ama-akhawunti wakho, izilungiselelo, ulande ama-apps nedatha yawo, imidiya namanye amafayela. Uma usubhale ngekhodi ucingo lakho, udinga ukuthayipha i-PIN yezinombolo noma iphasiwedi ukususa ukubhala ngakhodi ngaso sonke isikhathi uma uyikhanyisa: awukwazi ukususa ukubhala ngekhodi ucingo lakho ngaphandle kokwenza ukusetha kabusha idatha yenkampani, ususe yonke idatha yakho.\n\nUkubhala ngekhodi kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhitri elishajiwe futhi ugcine ucingo lakho luplakiwe kuze ukubhala ngekhodi kuqedele. Uma uphazamisa inqubo yokubhala ngekhodi, uzolahlekelwa enye noma yonke idatha yakho."</string>
+    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Ungabhala ngemfihlo ama-akhawunti wakho, izilungiselelo, izinhlelo zokusebenza ezilandiwe kanye nedatha yazo, imidiya, namanye amafayela. Ngemva kokubhala ngemfihlo ithebhulethi yakho, sicabangela ukuthi usethe ukukhiya isikrini  (okungukuthi, iphethini noma iphinikhodi yezinombolo noma iphasiwedi), uzodinga ukuvula isikrini ukuqhaqha ithebhulethi njalo uma uyivula. Enye kuphela indlela ukuqhaqha ukwenza ukusetha kabusha yonke idatha, ususe yonke idatha yakho.\n\nUkubhala ngemfihlo kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe bese ugcine ithebhulethi yakho ixhunyiwe kuyo yonke inqubo. Uma uphazamisa, uzolahlekelwe enye noma yonke idatha yakho."</string>
+    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Ungabhala ngemfihlo ama-akhawunti wakho, izilungiselelo, izinhlelo zokusebenza ezilandiwe kanye nedatha yazo, imidiya, namanye amafayela. Ngemva kokubhala ngemfihlo ifoni yakho, sicabangela ukuthi usethe ukukhiya isikrini (okungukuthi, iphethini noma iphinikhodi yezinombolo noma iphasiwedi), uzodinga ukuvula isikrini ukuqhaqha ifoni njalo uma uyivula. Enye kuphela indlela ukuqhaqha ukwenza ukusetha kabusha yonke idatha, ususe yonke idatha yakho.\n\nUkubhala ngemfihlo kuthatha ihora noma ngaphezulu. Kufanele uqale ngebhtri elishajiwe bese ugcine ifoni yakho ixhunyiwe kuyo yonke inqubo. Uma uphazamisa, uzolahlekelwe enye 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>
@@ -435,24 +433,6 @@
     <string name="manage_device_admin_summary" msgid="7672709110988761075">"Buka noma yenza abaphathi bedivaysi bengasebenzi"</string>
     <string name="manage_trust_agents" msgid="4629279457536987768">"Abenzeli bethemba"</string>
     <string name="manage_trust_agents_summary" msgid="6804319935640148441">"Buka noma wenze kungasebenzi abenzeli bethemba"</string>
-    <string name="manage_notification_access" msgid="5799781079264981979">"Ukufinyelela isaziso"</string>
-    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Izinhlelo zokusebenza azikwazi ukufunda izaziso"</string>
-  <plurals name="manage_notification_access_summary_nonzero">
-    <item quantity="one" msgid="8344183614159211585">"%d uhlelo lokusebenza lungakwazi ukufunda izaziso"</item>
-    <item quantity="other" msgid="980049191810249052">"%d izinhlelo zokusebenza zingakwazi ukufunda izaziso"</item>
-  </plurals>
-    <string name="no_notification_listeners" msgid="2767405417723149879">"Abekho abalaleli besaziso abafakiwe."</string>
-    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Nika amandla i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"I-<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> izokwazi ukufunda zonke izaziso eziposwe isistimu noma yinoma yiluphi uhlelo lokusebenza olufakiwe, olungase lufake ulwazi lomuntu siqu njengamagama oxhumana nabo nemilayezo yombhalo ethunyelwe kuwe. Izokwazi futhi ukucashisa lezi zaziso noma ukuthinta amabhathini esenzo aphakathi kwawo."</string>
-    <string name="manage_condition_providers" msgid="3039306415273606730">"Izihlinzeki zesimo"</string>
-    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Azikho izinhlelo zokusebenza ezinikeza ngezimo"</string>
-  <plurals name="manage_condition_providers_summary_nonzero">
-    <item quantity="one" msgid="7871716594997778198">"I-%d yohlelo lokusebenza inikeza ngezimo"</item>
-    <item quantity="other" msgid="358057362115673258">"I-%d yezinhlelo zokusebenza inikeza ngezimo"</item>
-  </plurals>
-    <string name="no_condition_providers" msgid="6183782892066424125">"Azikho izihlinzeki zesimo ezifakiwe."</string>
-    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Nika amandla i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
-    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"I-<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> izokwazi ukungeza izimo zokuphuma kumodi yokungaphazamisi."</string>
     <string name="bluetooth_quick_toggle_title" msgid="1037056952714061893">"Bluetooth"</string>
     <string name="bluetooth_quick_toggle_summary" msgid="5293641680139873341">"Vula i-Bluetooth"</string>
     <string name="bluetooth_settings" msgid="1810521656168174329">"Bluetooth"</string>
@@ -590,6 +570,8 @@
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
     <string name="wifi_menu_modify" msgid="2068554918652440105">"Guqula inethiwekhi"</string>
+    <!-- no translation found for wifi_menu_write_to_nfc (7692881642188240324) -->
+    <skip />
     <string name="wifi_empty_list_wifi_off" msgid="8056223875951079463">"Ukubona amanethiwekhi atholakalayo, vula i-Wi-Fi."</string>
     <string name="wifi_empty_list_wifi_on" msgid="8746108031587976356">"Isesha amanethiwekhi e-Wi-Fi…"</string>
     <string name="wifi_empty_list_user_restricted" msgid="8280257225419947565">"Awunayo imvume yokushintsha inethiwekhi ye-Wi-Fi."</string>
@@ -638,7 +620,8 @@
     <string name="wifi_wps_available_second_item" msgid="8427520131718215301">" (i-WPS iyatholakala)"</string>
     <string name="wifi_secured_first_item" msgid="4072076186051083451">"Ivikelwe nge-<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
     <string name="wifi_secured_second_item" msgid="1326000076939056265">", ivikelwe nge-<xliff:g id="WIFI_SECURITY_SHORT">%1$s</xliff:g>"</string>
-    <string name="wifi_wps_nfc_enter_password" msgid="2860076442481710770">"Faka iphasiwedi yakho yenethiwekhi."</string>
+    <!-- no translation found for wifi_wps_nfc_enter_password (2288214226916117159) -->
+    <skip />
     <string name="wifi_security_none" msgid="7985461072596594400">"Lutho"</string>
     <string name="wifi_scan_always_turnon_message" msgid="203123538572122989">"Ukuze kuthuthukiswe ukufaneleka kwendawo nezinye izinjongo, i-<xliff:g id="APP_NAME">%1$s</xliff:g> ifuna ukuvula ukuskena kwenethiwekhi, noma ngabe i-Wi-Fi ivaliwe.\n\nVumela lokhu ngazo zonke izinhlelo zokusebenza ezifuna ukuskena?"</string>
     <string name="wifi_scan_always_confirm_allow" msgid="5355973075896817232">"Vumela"</string>
@@ -702,14 +685,12 @@
     <string name="home_settings" msgid="212375129455718176">"Ikhaya"</string>
     <string name="display_settings_title" msgid="1708697328627382561">"Ukubukeka"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Umsindo"</string>
-    <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
     <string name="ringtone_summary" msgid="2630023412632683493"></string>
     <string name="all_volume_title" msgid="4296957391257836961">"Amavolumu"</string>
     <string name="musicfx_title" msgid="3415566786340790345">"Imphumelo Yomculo"</string>
     <string name="ring_volume_title" msgid="7938706566797464165">"Ivolumu yesikhali"</string>
     <string name="vibrate_in_silent_title" msgid="3897968069156767036">"Idlidliza uma ithulile"</string>
     <string name="notification_sound_title" msgid="5137483249425507572">"Umsindo wokwazisa ozenzakalelayo"</string>
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Ukukhanya kwesaziso sephalsi"</string>
     <string name="heads_up_enabled_title" msgid="1031078221910921622">"Vela uma kubalulekile"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Iringithoni"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Isaziso"</string>
@@ -732,7 +713,6 @@
     <string name="volume_media_mute" msgid="3399059928695998166">"Thulisa umculo &amp; enye imidiya"</string>
     <string name="volume_notification_mute" msgid="7955193480006444159">"Thulisa izaziso"</string>
     <string name="volume_alarm_mute" msgid="4452239420351035936">"Thulisa i-alamu"</string>
-    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Dlidlizisa uma ikhala"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Dokha"</string>
     <string name="dock_settings_title" msgid="9161438664257429372">"Izilungiselelo zokudokha"</string>
     <string name="dock_audio_settings_title" msgid="3324750259959570305">"Umsindo"</string>
@@ -758,8 +738,13 @@
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ifoni"</string>
     <string name="accelerometer_summary_off" product="tablet" msgid="4781734213242521682">"Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi"</string>
     <string name="accelerometer_summary_off" product="default" msgid="5485489363715740761">"Shintsha ukujikeleza ngokuzenzakalelayo lapho ujikelezisa ifoni"</string>
-    <string name="brightness" msgid="2354961343555249270">"Ukukhanya"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Lungisa ukukhanya kwesikrini"</string>
+    <!-- no translation found for auto_brightness_title (6341042882350279391) -->
+    <skip />
+    <!-- no translation found for auto_brightness_summary (1799041158760605375) -->
+    <skip />
     <string name="screen_timeout" msgid="4351334843529712571">"Lala"</string>
     <string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
     <string name="wallpaper_settings_title" msgid="5449180116365824625">"Iphephadonga"</string>
@@ -1350,8 +1335,10 @@
     <string name="enable_adb" msgid="7982306934419797485">"Ukulungisa iphutha le-USB"</string>
     <string name="enable_adb_summary" msgid="4881186971746056635">"Lungisa iphutha lemodi lapho i-USB ixhunyiwe"</string>
     <string name="clear_adb_keys" msgid="4038889221503122743">"Buyisa ukugunyaza kokususa iphutha le-USB"</string>
-    <string name="bugreport_in_power" msgid="4548816486587403971">"Imibiko yeziphazamiso zenenyu yamandla"</string>
-    <string name="bugreport_in_power_summary" msgid="5764234382355067053">"Faka phakathi inketho kumenyu yamandla yokuthatha umbiko wesiphazamiso"</string>
+    <!-- no translation found for bugreport_in_power (7923901846375587241) -->
+    <skip />
+    <!-- no translation found for bugreport_in_power_summary (3245617665067320992) -->
+    <skip />
     <string name="keep_screen_on" msgid="1146389631208760344">"Hlala uphapheme"</string>
     <string name="keep_screen_on_summary" msgid="2173114350754293009">"Isikrini asisoze salala ngenkathi sishaja"</string>
     <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Nika amandla i-Bluetooth HCI yelogu lokuhlola"</string>
@@ -1827,6 +1814,8 @@
     <string name="wimax_settings" msgid="2655139497028469039">"4G"</string>
     <string name="status_wimax_mac_address" msgid="8390791848661413416">"Ikheli le-4G MAC"</string>
     <string name="enter_password" msgid="4131758584074246224">"Faka iphasiwedi ukuze ususe okufakwe kwindawo yokugcina"</string>
+    <string name="enter_pin" msgid="286221169871526876">"Faka iphinikhodi yakho ukuze uqhaqhe isitoreji sakho"</string>
+    <string name="enter_pattern" msgid="5707838886272453608">"Dweba iphethini ukuze uqhaqhe isitoreji sakho"</string>
     <string name="try_again" msgid="4272075051293936921">"Zama futhi."</string>
     <string name="delete" msgid="4219243412325163003">"Susa"</string>
     <string name="misc_files" msgid="6720680815969643497">"Amafayela axubene"</string>
@@ -2079,6 +2068,7 @@
     <string name="global_font_change_title" msgid="1887126466191012035">"Shintsha usayizi wefonti"</string>
     <string name="nfc_payment_settings_title" msgid="1807298287380821613">"Thepha ukhokhe"</string>
     <string name="nfc_payment_no_apps" msgid="2481080809791416010">"Khokha ngokuthepha nje"</string>
+    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Nika umusa uhlelo lokusebenza elingaphambili"</string>
     <string name="nfc_payment_learn_more" msgid="5583407773744324447">"Funda kabanzi"</string>
     <string name="nfc_payment_menu_item_add_service" msgid="2885947408068969081">"Thola izinhlelo zokusebenza"</string>
     <string name="nfc_payment_set_default_label" msgid="7315817259485674542">"Setha njengokuncanyelwayo kwakho?"</string>
@@ -2132,16 +2122,8 @@
     <string name="search_recents_queries_label" msgid="2128811638532309069">"Usesho lwakamuva"</string>
     <string name="search_results_label" msgid="4163304782363526148">"Imiphumela"</string>
     <string name="keywords_wifi" msgid="8947676711698613374">"ukuxhumeka kwenethiwekhi ye-wi-fi"</string>
-    <string name="lock_screen_notifications" msgid="654679491031356676">"Uma idivayisi ikhiyiwe"</string>
-    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Fihla okuqukethwe kwesaziso esizwelayo"</string>
-    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bonisa konke okuqukethwe kwesaziso"</string>
-    <string name="title_zen_mode" msgid="4587203077066257425">"Ungaphazamisi"</string>
-    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ungaphazamisi"</string>
-    <string name="notification_settings" msgid="8342078884790733726">"Izaziso"</string>
-    <string name="notification_settings_tweaks" msgid="659628355469765848">"Amathwikhi"</string>
-    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Izaziso zohlelo lokusebenza"</string>
-    <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
-    <string name="setup_wifi_nfc_tag" msgid="654375687941126332">"Setha umaki wei-WiFi NFC"</string>
+    <!-- no translation found for setup_wifi_nfc_tag (9028353016222911016) -->
+    <skip />
     <string name="write_tag" msgid="8571858602896222537">"Bhala"</string>
     <string name="status_awaiting_tap" msgid="2130145523773160617">"Thepha umaki ukuze ubhale..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Iphasiwedi elingalungile, zama futhi."</string>
@@ -2149,19 +2131,65 @@
     <string name="status_failed_to_write" msgid="8072752734686294718">"Ayikwazi ukubhala idatha kumaki we-NFC. Uma inkinga iqhubeka, zama umaki owehlukile"</string>
     <string name="status_tag_not_writable" msgid="2511611539977682175">"Umaki we-NFC akabhaleki. Sicela usebenzise umaki owehlukile."</string>
     <string name="default_sound" msgid="8821684447333687810">"Umsindo owufica ukhona"</string>
-    <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
+    <string name="notification_settings" msgid="7558043253996992936">"Imisindo nezaziso"</string>
+    <string name="media_volume_option_title" msgid="2811531786073003825">"Ivolumu yabezindaba"</string>
+    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ivolumu ye-alamu"</string>
+    <string name="ring_volume_option_title" msgid="6767101703671248309">"Ivolumu yokukhala"</string>
+    <string name="zen_mode_settings_title" msgid="2689740350895257590">"Ungaphazamisi"</string>
+    <string name="ringer_mode_title" msgid="7489457312298627735">"Uma amakhli nezaziso zifika"</string>
+    <string name="ringer_mode_audible" msgid="4196661772746371017">"Khalisa"</string>
+    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Dlidliza esikhundleni sokukhalisa"</string>
+    <string name="ringer_mode_silent" msgid="4812605852723880795">"Ungakhalisi noma ukudlidliza"</string>
+    <string name="ringtone_title" msgid="5379026328015343686">"Iringithoni yefoni"</string>
+    <string name="notification_ringtone_title" msgid="3361201340352664272">"Ithoni yokukhala yezaziso ezenzakalelayo"</string>
+    <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Dlidlizisa uma ikhala"</string>
+    <string name="notification_display_settings" msgid="2274556854544572598">"Ukubonisa izaziso"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Ukukhanya kwesaziso sephalsi"</string>
+    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Uma idivayisi ikhiyiwe"</string>
+    <string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bonisa konke okuqukethwe kwesaziso"</string>
+    <string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Fihla okuqukethwe kwesaziso esizwelayo"</string>
+    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ungabonisi izaziso sanhlobo"</string>
+    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Lapho ukungaphazamiseki kuvuliwe"</string>
+    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Fihla izaziso ezintsha kusuka kuhlu"</string>
+    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Bonisa zonke izaziso ohlwini"</string>
     <string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
+    <string name="touch_sound_settings" msgid="8861737295513989009">"Imisindo yokuthinta"</string>
+    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Amathoni wephedi yokudayela"</string>
+    <string name="screen_locking_sounds_title" msgid="3214032809403683539">"Ukukhiya isikrini nokuvula"</string>
+    <string name="other_touch_sounds_title" msgid="1692523628776677916">"Eminye imisindo yokuthinta"</string>
+    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Dlidliza lapho uthinta"</string>
+    <string name="manage_notification_access_title" msgid="7510080164564944891">"Ukufinyelela isaziso"</string>
+    <string name="manage_notification_access_summary_zero" msgid="2409912785614953348">"Izinhlelo zokusebenza azikwazi ukufunda izaziso"</string>
+  <plurals name="manage_notification_access_summary_nonzero">
+    <item quantity="one" msgid="8344183614159211585">"%d uhlelo lokusebenza lungakwazi ukufunda izaziso"</item>
+    <item quantity="other" msgid="980049191810249052">"%d izinhlelo zokusebenza zingakwazi ukufunda izaziso"</item>
+  </plurals>
+    <string name="no_notification_listeners" msgid="2767405417723149879">"Abekho abalaleli besaziso abafakiwe."</string>
+    <string name="notification_listener_security_warning_title" msgid="6494221261778885893">"Nika amandla i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="notification_listener_security_warning_summary" msgid="2780319203595885564">"I-<xliff:g id="NOTIFICATION_LISTENER_NAME">%1$s</xliff:g> izokwazi ukufunda zonke izaziso eziposwe isistimu noma yinoma yiluphi uhlelo lokusebenza olufakiwe, olungase lufake ulwazi lomuntu siqu njengamagama oxhumana nabo nemilayezo yombhalo ethunyelwe kuwe. Izokwazi futhi ukucashisa lezi zaziso noma ukuthinta amabhathini esenzo aphakathi kwawo."</string>
+    <string name="manage_condition_providers" msgid="3039306415273606730">"Izihlinzeki zesimo"</string>
+    <string name="manage_condition_providers_summary_zero" msgid="3760902189574984100">"Azikho izinhlelo zokusebenza ezinikeza ngezimo"</string>
+  <plurals name="manage_condition_providers_summary_nonzero">
+    <item quantity="one" msgid="7871716594997778198">"I-%d yohlelo lokusebenza inikeza ngezimo"</item>
+    <item quantity="other" msgid="358057362115673258">"I-%d yezinhlelo zokusebenza inikeza ngezimo"</item>
+  </plurals>
+    <string name="no_condition_providers" msgid="6183782892066424125">"Azikho izihlinzeki zesimo ezifakiwe."</string>
+    <string name="condition_provider_security_warning_title" msgid="5834347345913614926">"Nika amandla i-<xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+    <string name="condition_provider_security_warning_summary" msgid="640037330610551763">"I-<xliff:g id="CONDITION_PROVIDER_NAME">%1$s</xliff:g> izokwazi ukungeza izimo zokuphuma kumodi yokungaphazamisi."</string>
+    <string name="loading_notification_apps" msgid="5031818677010335895">"Ilayisha izinhlelo zokusebenza..."</string>
     <string name="app_notifications_dialog_show" msgid="6912410502091785846">"Bonisa izaziso"</string>
-    <string name="app_notifications_dialog_priority" msgid="2692156022435161791">"Okubaluleke kakhulu"</string>
+    <string name="app_notifications_dialog_priority" msgid="3025242591043646494">"Bonisa phezulu kohlu"</string>
+    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Fihla okuqukethwe okuzwelayo uma idivayisi ikhiyiwe"</string>
+    <string name="app_notification_row_banned" msgid="5983655258784814773">"Ivinjelwe"</string>
+    <string name="app_notification_row_priority" msgid="7597101427045166499">"Phezulu kuhlu"</string>
+    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Ukuzwela"</string>
     <string name="app_notifications_dialog_done" msgid="3484067728568791014">"Kwenziwe"</string>
-    <string name="zen_mode_option_off" msgid="7812737562592973403">"Valiwe"</string>
-    <string name="zen_mode_option_on" msgid="6914392434474823822">"Vuliwe"</string>
     <string name="zen_mode_default_option" msgid="6940069025071935243">"Uze uvale lokhu"</string>
     <string name="zen_mode_general_category" msgid="4816396530154508930">"Vimba zonke iziphazamisi ngaphandle kwe-"</string>
     <string name="zen_mode_automatic_category" msgid="2168130971038236488">"Ebusuku"</string>
     <string name="zen_mode_automation_category" msgid="4175437418329803902">"Okunye kwemishini"</string>
     <string name="zen_mode_entry_conditions_title" msgid="8467976490601914289">"Vula ngokuzenzakalela"</string>
-    <string name="zen_mode_entry_conditions_summary_divider" msgid="7956558495698961343">","</string>
+    <string name="summary_divider_text" msgid="3087735442599707533">","</string>
     <string name="zen_mode_entry_conditions_summary_none" msgid="6589476427475076533">"Akusoze"</string>
     <string name="zen_mode_phone_calls" msgid="2872774457193013585">"Amakholi efoni"</string>
     <string name="zen_mode_messages" msgid="5886440273537510894">"Imilayezo"</string>
@@ -2177,5 +2205,11 @@
     <string name="zen_mode_start_time" msgid="8102602297273744441">"Isikhathi sokuqala"</string>
     <string name="zen_mode_end_time" msgid="8774327885892705505">"Isikhathi sokugcina"</string>
     <string name="zen_mode_end_time_summary_format" msgid="1941585278888784451">"<xliff:g id="FORMATTED_TIME">%s</xliff:g> usuku olulandelayo"</string>
+    <string name="notification_settings_apps_title" msgid="1125354590652967250">"Izaziso zohlelo lokusebenza"</string>
+    <string name="notification_app_settings_button" msgid="6685640230371477485">"Izilungiselelo zesaziso"</string>
     <string name="device_feedback" msgid="3238056036766293294">"Thumela impendulo mayelana nale divayisi"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 945dd3d..060ff54 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -185,14 +185,14 @@
 
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_unknown">Unknown</string>
-    <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
+    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging from an unknown source.  -->
     <string name="battery_info_status_charging">Charging</string>
-    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="battery_info_status_charging_ac">(AC)</string>
-    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="battery_info_status_charging_usb">(USB)</string>
-    <!-- Battery Info screen. Units shown after a value.  Used for diagnostic info screens, precise translation isn't needed -->
-    <string name="battery_info_status_charging_wireless">(wireless)</string>
+    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging on AC.  -->
+    <string name="battery_info_status_charging_ac">Charging on AC</string>
+    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over USB.  -->
+    <string name="battery_info_status_charging_usb">Charging over USB</string>
+    <!-- [CHAR_LIMIT=20] Battery use screen.  Battery status shown in chart label when charging over a wireless connection.  -->
+    <string name="battery_info_status_charging_wireless">Charging wirelessly</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
     <string name="battery_info_status_discharging">Not charging</string>
     <!-- Battery Info screen. Value for a status item.  Used for diagnostic info screens, precise translation isn't needed -->
@@ -2374,7 +2374,7 @@
     <string name="network_scorer_change_active_no_previous_dialog_text" translatable="false">Use <xliff:g id="new_app">%s</xliff:g> as your network scorer?</string>
 
     <!-- The SIM operator is not known [CHAR_ LIMIT=50]-->
-    <string name="mobile_unknown_sim_operator" translatable="true">Uknown SIM operator</string>
+    <string name="mobile_unknown_sim_operator" translatable="true">Unknown SIM operator</string>
 
     <!-- There is no mobile provisiong website for the operator which is the firat parameter [CHAR_ LIMIT=50]-->
     <string name="mobile_no_provisioning_url" translatable="true">%1$s has no known provisioning website</string>
@@ -3551,6 +3551,16 @@
     <string name="battery_stats_phone_signal_label">Mobile network signal</string>
     <!-- Battery usage during last unplugged period -->
     <string name="battery_stats_last_duration">@string/menu_stats_last_unplugged</string>
+    <!-- [CHAR_LIMIT=5] Label for an hour time when using 24 hour mode -->
+    <string name="battery_stats_hour_24_label"><xliff:g id="time">%1$d</xliff:g>:00</string>
+    <!-- [CHAR_LIMIT=5] Label for an hour time when using 12 hour mode in the AM -->
+    <string name="battery_stats_hour_am_label"><xliff:g id="time">%1$d</xliff:g> AM</string>
+    <!-- [CHAR_LIMIT=5] Label for an hour time when using 12 hour mode in the PM -->
+    <string name="battery_stats_hour_pm_label"><xliff:g id="time">%1$d</xliff:g> PM</string>
+    <!-- [CHAR_LIMIT=3] Label for date of day and month (not year) when the day is shown first -->
+    <string name="battery_stats_date_day_first_label"><xliff:g id="day">%1$d</xliff:g>/<xliff:g id="month">%2$d</xliff:g></string>
+    <!-- [CHAR_LIMIT=3] Label for date of day and month (not year) when the month is shown first -->
+    <string name="battery_stats_date_month_first_label"><xliff:g id="month">%2$d</xliff:g>/<xliff:g id="day">%1$d</xliff:g></string>
     <!-- CPU awake time title -->
     <string name="awake">Device awake time</string>
     <!-- Wifi on time -->
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index 705fd80..63949cb 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -58,6 +58,7 @@
                 android:id="@+id/wireless_settings"
                 android:title="@string/radio_controls_title"
                 android:fragment="com.android.settings.WirelessSettings"
+                android:icon="@drawable/ic_settings_more"
                 />
 
     </dashboard-category>
diff --git a/src/com/android/settings/HighlightingFragment.java b/src/com/android/settings/HighlightingFragment.java
index 3595eec..1424abd 100644
--- a/src/com/android/settings/HighlightingFragment.java
+++ b/src/com/android/settings/HighlightingFragment.java
@@ -32,6 +32,7 @@
 
     private String mViewKey;
     private boolean mViewHighlighted = false;
+    private Drawable mHighlightDrawable;
 
     @Override
     public void onCreate(Bundle icicle) {
@@ -67,7 +68,10 @@
     }
 
     private Drawable getHighlightDrawable() {
-        return getResources().getDrawable(R.drawable.preference_highlight);
+        if (mHighlightDrawable == null) {
+            mHighlightDrawable = getActivity().getDrawable(R.drawable.preference_highlight);
+        }
+        return mHighlightDrawable;
     }
 
     private void highlightView(String key) {
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 9fbdebe..67432c0 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -61,6 +61,7 @@
 
     private String mPreferenceKey;
     private boolean mPreferenceHighlighted = false;
+    private Drawable mHighlightDrawable;
 
     private boolean mIsDataSetObserverRegistered = false;
     private DataSetObserver mDataSetObserver = new DataSetObserver() {
@@ -103,6 +104,11 @@
         if (!TextUtils.isEmpty(mHelpUrl)) {
             setHasOptionsMenu(true);
         }
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
 
         final Bundle args = getArguments();
         if (args != null) {
@@ -144,7 +150,10 @@
     }
 
     private Drawable getHighlightDrawable() {
-        return getResources().getDrawable(R.drawable.preference_highlight);
+        if (mHighlightDrawable == null) {
+            mHighlightDrawable = getActivity().getDrawable(R.drawable.preference_highlight);
+        }
+        return mHighlightDrawable;
     }
 
     /**
@@ -170,6 +179,8 @@
 
         final int position = canUseListViewForHighLighting(key);
         if (position >= 0) {
+            mPreferenceHighlighted = true;
+
             final ListView listView = getListView();
             final ListAdapter adapter = listView.getAdapter();
 
@@ -189,17 +200,16 @@
                             highlight.setHotspot(centerX, centerY);
                             v.setPressed(true);
                             v.setPressed(false);
-                            ((PreferenceGroupAdapter) adapter).setHighlighted(-1);
                         }
                     }, DELAY_HIGHLIGHT_DURATION_MILLIS);
-
-                    mPreferenceHighlighted = true;
                 }
             });
         } else {
             // Try locating the Preference View thru its tag
             View preferenceView = findPreferenceViewForKey(getView(), key);
             if (preferenceView != null ) {
+                mPreferenceHighlighted = true;
+
                 preferenceView.setBackground(highlight);
                 final int centerX = preferenceView.getWidth() / 2;
                 final int centerY = preferenceView.getHeight() / 2;
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 36e1904..1b64064 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -312,18 +312,17 @@
                 BatteryManager.BATTERY_STATUS_UNKNOWN);
         String statusString;
         if (status == BatteryManager.BATTERY_STATUS_CHARGING) {
-            statusString = res.getString(R.string.battery_info_status_charging);
-            if (plugType > 0) {
-                int resId;
-                if (plugType == BatteryManager.BATTERY_PLUGGED_AC) {
-                    resId = R.string.battery_info_status_charging_ac;
-                } else if (plugType == BatteryManager.BATTERY_PLUGGED_USB) {
-                    resId = R.string.battery_info_status_charging_usb;
-                } else {
-                    resId = R.string.battery_info_status_charging_wireless;
-                }
-                statusString = statusString + " " + res.getString(resId);
+            int resId;
+            if (plugType == BatteryManager.BATTERY_PLUGGED_AC) {
+                resId = R.string.battery_info_status_charging_ac;
+            } else if (plugType == BatteryManager.BATTERY_PLUGGED_USB) {
+                resId = R.string.battery_info_status_charging_usb;
+            } else if (plugType == BatteryManager.BATTERY_PLUGGED_WIRELESS) {
+                resId = R.string.battery_info_status_charging_wireless;
+            } else {
+                resId = R.string.battery_info_status_charging;
             }
+            statusString = res.getString(resId);
         } else if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {
             statusString = res.getString(R.string.battery_info_status_discharging);
         } else if (status == BatteryManager.BATTERY_STATUS_NOT_CHARGING) {
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index da6729c..f718b42 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -17,8 +17,13 @@
 package com.android.settings.fuelgauge;
 
 import android.content.Intent;
+import android.graphics.DashPathEffect;
 import android.os.BatteryManager;
+import android.provider.Settings;
+import android.text.format.DateFormat;
 import android.text.format.Formatter;
+import android.util.Log;
+import android.util.TimeUtils;
 import com.android.settings.R;
 
 import android.content.Context;
@@ -36,8 +41,15 @@
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.View;
+import libcore.icu.LocaleData;
+
+import java.util.ArrayList;
+import java.util.Calendar;
 
 public class BatteryHistoryChart extends View {
+    static final boolean DEBUG = false;
+    static final String TAG = "BatteryHistoryChart";
+
     static final int CHART_DATA_X_MASK = 0x0000ffff;
     static final int CHART_DATA_BIN_MASK = 0xffff0000;
     static final int CHART_DATA_BIN_SHIFT = 16;
@@ -116,28 +128,35 @@
     final Paint mBatteryGoodPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     final Paint mBatteryWarnPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     final Paint mBatteryCriticalPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    final Paint mTimeRemainPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
     final Paint mChargingPaint = new Paint();
     final Paint mScreenOnPaint = new Paint();
     final Paint mGpsOnPaint = new Paint();
     final Paint mWifiRunningPaint = new Paint();
     final Paint mCpuRunningPaint = new Paint();
+    final Paint mDateLinePaint = new Paint();
     final ChartData mPhoneSignalChart = new ChartData();
     final TextPaint mTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
     final TextPaint mHeaderTextPaint = new TextPaint(Paint.ANTI_ALIAS_FLAG);
+    final Paint mDebugRectPaint = new Paint();
 
     final Path mBatLevelPath = new Path();
     final Path mBatGoodPath = new Path();
     final Path mBatWarnPath = new Path();
     final Path mBatCriticalPath = new Path();
+    final Path mTimeRemainPath = new Path();
     final Path mChargingPath = new Path();
     final Path mScreenOnPath = new Path();
     final Path mGpsOnPath = new Path();
     final Path mWifiRunningPath = new Path();
     final Path mCpuRunningPath = new Path();
+    final Path mDateLinePath = new Path();
     
     BatteryStats mStats;
     Intent mBatteryBroadcast;
     long mStatsPeriod;
+    String mMaxPercentLabelString;
+    String mMinPercentLabelString;
     String mDurationString;
     String mChargeLabelString;
     String mChargeDurationString;
@@ -153,6 +172,8 @@
     int mTextDescent;
     int mHeaderTextAscent;
     int mHeaderTextDescent;
+    int mMaxPercentLabelStringWidth;
+    int mMinPercentLabelStringWidth;
     int mDurationStringWidth;
     int mChargeLabelStringWidth;
     int mChargeDurationStringWidth;
@@ -160,6 +181,9 @@
 
     boolean mLargeMode;
 
+    int mLastWidth = -1;
+    int mLastHeight = -1;
+
     int mLineWidth;
     int mThinLineWidth;
     int mChargingOffset;
@@ -171,19 +195,29 @@
     int mLevelOffset;
     int mLevelTop;
     int mLevelBottom;
+    int mLevelLeft;
+    int mLevelRight;
     static final int PHONE_SIGNAL_X_MASK = CHART_DATA_X_MASK;
     static final int PHONE_SIGNAL_BIN_MASK = CHART_DATA_BIN_MASK;
     static final int PHONE_SIGNAL_BIN_SHIFT = CHART_DATA_BIN_SHIFT;
     
     int mNumHist;
     long mHistStart;
+    long mHistDataEnd;
     long mHistEnd;
+    long mStartWallTime;
+    long mEndDataWallTime;
+    long mEndWallTime;
+    boolean mDischarging;
     int mBatLow;
     int mBatHigh;
     boolean mHaveWifi;
     boolean mHaveGps;
     boolean mHavePhoneSignal;
 
+    final ArrayList<TimeLabel> mTimeLabels = new ArrayList<TimeLabel>();
+    final ArrayList<DateLabel> mDateLabels = new ArrayList<DateLabel>();
+
     static class TextAttrs {
         ColorStateList textColor = null;
         int textSize = 15;
@@ -273,10 +307,56 @@
         }
     }
 
+    static class TimeLabel {
+        final int x;
+        final String label;
+        final int width;
+
+        TimeLabel(Context context, TextPaint paint, int x, Calendar cal, boolean use24hr) {
+            this.x = x;
+            if (use24hr) {
+                label = context.getString(R.string.battery_stats_hour_24_label,
+                        cal.get(Calendar.HOUR_OF_DAY));
+            } else {
+                int hour = cal.get(Calendar.HOUR);
+                if (hour == 0) {
+                    hour = 12;
+                }
+                if (cal.get(Calendar.AM_PM) == Calendar.AM) {
+                    label = context.getString(R.string.battery_stats_hour_am_label, hour);
+                } else {
+                    label = context.getString(R.string.battery_stats_hour_pm_label, hour);
+                }
+            }
+            width = (int)paint.measureText(label);
+        }
+    }
+
+    static class DateLabel {
+        final int x;
+        final String label;
+        final int width;
+
+        DateLabel(Context context, TextPaint paint, int x, Calendar cal, boolean dayFirst) {
+            this.x = x;
+            if (dayFirst) {
+                label = context.getString(R.string.battery_stats_date_day_first_label,
+                        cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.MONTH));
+            } else {
+                label = context.getString(R.string.battery_stats_date_month_first_label,
+                        cal.get(Calendar.DAY_OF_MONTH), cal.get(Calendar.MONTH));
+            }
+            width = (int)paint.measureText(label);
+        }
+    }
+
     public BatteryHistoryChart(Context context, AttributeSet attrs) {
         super(context, attrs);
         
-        mBatteryBackgroundPaint.setARGB(255, 128, 128, 128);
+        mThinLineWidth = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                2, getResources().getDisplayMetrics());
+
+        mBatteryBackgroundPaint.setColor(0xff263238);
         mBatteryBackgroundPaint.setStyle(Paint.Style.FILL);
         mBatteryGoodPaint.setARGB(128, 0, 255, 0);
         mBatteryGoodPaint.setStyle(Paint.Style.STROKE);
@@ -284,6 +364,8 @@
         mBatteryWarnPaint.setStyle(Paint.Style.STROKE);
         mBatteryCriticalPaint.setARGB(192, 255, 0, 0);
         mBatteryCriticalPaint.setStyle(Paint.Style.STROKE);
+        mTimeRemainPaint.setColor(0xffA5B1B7);
+        mTimeRemainPaint.setStyle(Paint.Style.FILL);
         mChargingPaint.setARGB(255, 0, 128, 0);
         mChargingPaint.setStyle(Paint.Style.STROKE);
         mScreenOnPaint.setStyle(Paint.Style.STROKE);
@@ -294,7 +376,9 @@
                 0x00000000, 0xffa00000, 0xffa07000, 0xffa0a000,
                 0xff80a000, 0xff409000, 0xff008000
         });
-        
+        mDebugRectPaint.setARGB(255, 255, 0, 0);
+        mDebugRectPaint.setStyle(Paint.Style.STROKE);
+
         TypedArray a =
             context.obtainStyledAttributes(
                 attrs, R.styleable.BatteryHistoryChart, 0, 0);
@@ -355,12 +439,22 @@
         mainTextAttrs.apply(context, mTextPaint);
         headTextAttrs.apply(context, mHeaderTextPaint);
 
+        mDateLinePaint.set(mTextPaint);
+        mDateLinePaint.setStyle(Paint.Style.STROKE);
+        int hairlineWidth = mThinLineWidth/2;
+        if (hairlineWidth < 1) {
+            hairlineWidth = 1;
+        }
+        mDateLinePaint.setStrokeWidth(hairlineWidth);
+        mDateLinePaint.setPathEffect(new DashPathEffect(new float[] {
+                mThinLineWidth * 2, mThinLineWidth * 2 }, 0));
+
         if (shadowcolor != 0) {
             mTextPaint.setShadowLayer(r, dx, dy, shadowcolor);
             mHeaderTextPaint.setShadowLayer(r, dx, dy, shadowcolor);
         }
     }
-    
+
     void setStats(BatteryStats stats, Intent broadcast) {
         mStats = stats;
         mBatteryBroadcast = broadcast;
@@ -376,50 +470,21 @@
         mWifiRunningLabel = getContext().getString(R.string.battery_stats_wifi_running_label);
         mCpuRunningLabel = getContext().getString(R.string.battery_stats_wake_lock_label);
         mPhoneSignalLabel = getContext().getString(R.string.battery_stats_phone_signal_label);
-        
-        int pos = 0;
-        int lastInteresting = 0;
-        byte lastLevel = -1;
-        mBatLow = 0;
-        mBatHigh = 100;
-        int aggrStates = 0;
-        boolean first = true;
-        if (stats.startIteratingHistoryLocked()) {
-            final HistoryItem rec = new HistoryItem();
-            while (stats.getNextHistoryLocked(rec)) {
-                pos++;
-                if (rec.isDeltaData()) {
-                    if (first) {
-                        first = false;
-                        mHistStart = rec.time;
-                    }
-                    if (rec.batteryLevel != lastLevel || pos == 1) {
-                        lastLevel = rec.batteryLevel;
-                    }
-                    lastInteresting = pos;
-                    mHistEnd = rec.time;
-                    aggrStates |= rec.states;
-                }
-            }
-        }
-        mNumHist = lastInteresting;
-        mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
-        mHaveWifi = (aggrStates&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
-        if (!com.android.settings.Utils.isWifiOnly(getContext())) {
-            mHavePhoneSignal = true;
-        }
-        if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
 
-        //String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000, true);
-        //mDurationString = getContext().getString(R.string.battery_stats_on_battery,
-        //        durationString);
-        mDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart, true);
+        mMaxPercentLabelString = getContext().getResources().getString(
+                R.string.percentage, 100);
+        mMinPercentLabelString = getContext().getResources().getString(
+                R.string.percentage, 0);
+
         int batteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);
         final int status = mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_STATUS,
                 BatteryManager.BATTERY_STATUS_UNKNOWN);
+        long remainingTimeUs = 0;
+        mDischarging = true;
         if (status == BatteryManager.BATTERY_STATUS_DISCHARGING) {
             final long drainTime = mStats.computeBatteryTimeRemaining(elapsedRealtimeUs);
             if (drainTime > 0) {
+                remainingTimeUs = drainTime;
                 String timeString = Formatter.formatShortElapsedTime(getContext(),
                         drainTime / 1000);
                 mChargeLabelString = getContext().getResources().getString(
@@ -433,6 +498,8 @@
             final String statusLabel = com.android.settings.Utils.getBatteryStatus(getResources(),
                     mBatteryBroadcast);
             if (chargeTime > 0 && status != BatteryManager.BATTERY_STATUS_FULL) {
+                mDischarging = false;
+                remainingTimeUs = chargeTime;
                 String timeString = Formatter.formatShortElapsedTime(getContext(),
                         chargeTime / 1000);
                 mChargeLabelString = getContext().getResources().getString(
@@ -444,11 +511,69 @@
         }
         mDrainString = "";
         mChargeDurationString = "";
+
+        int pos = 0;
+        int lastInteresting = 0;
+        byte lastLevel = -1;
+        mBatLow = 0;
+        mBatHigh = 100;
+        mStartWallTime = 0;
+        mEndDataWallTime = 0;
+        mEndWallTime = 0;
+        mHistStart = 0;
+        mHistEnd = 0;
+        long lastWallTime = 0;
+        long lastRealtime = 0;
+        int aggrStates = 0;
+        boolean first = true;
+        if (stats.startIteratingHistoryLocked()) {
+            final HistoryItem rec = new HistoryItem();
+            while (stats.getNextHistoryLocked(rec)) {
+                pos++;
+                if (first) {
+                    first = false;
+                    mHistStart = rec.time;
+                }
+                if (rec.cmd == HistoryItem.CMD_CURRENT_TIME
+                        || rec.cmd == HistoryItem.CMD_RESET) {
+                    lastWallTime = rec.currentTime;
+                    lastRealtime = rec.time;
+                    if (mStartWallTime == 0) {
+                        mStartWallTime = lastWallTime;
+                    }
+                }
+                if (rec.isDeltaData()) {
+                    if (rec.batteryLevel != lastLevel || pos == 1) {
+                        lastLevel = rec.batteryLevel;
+                    }
+                    lastInteresting = pos;
+                    mHistDataEnd = rec.time;
+                    aggrStates |= rec.states;
+                }
+            }
+        }
+        mHistEnd = mHistDataEnd + (remainingTimeUs/1000);
+        mEndDataWallTime = lastWallTime + mHistDataEnd - lastRealtime;
+        mEndWallTime = mEndDataWallTime + (remainingTimeUs/1000);
+        mNumHist = lastInteresting;
+        mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
+        mHaveWifi = (aggrStates&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+        if (!com.android.settings.Utils.isWifiOnly(getContext())) {
+            mHavePhoneSignal = true;
+        }
+        if (mHistEnd <= mHistStart) mHistEnd = mHistStart+1;
+
+        //String durationString = Utils.formatElapsedTime(getContext(), mStatsPeriod / 1000, true);
+        //mDurationString = getContext().getString(R.string.battery_stats_on_battery,
+        //        durationString);
+        mDurationString = Utils.formatElapsedTime(getContext(), mHistEnd - mHistStart, true);
     }
 
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        mMaxPercentLabelStringWidth = (int)mTextPaint.measureText(mMaxPercentLabelString);
+        mMinPercentLabelStringWidth = (int)mTextPaint.measureText(mMinPercentLabelString);
         mDurationStringWidth = (int)mTextPaint.measureText(mDurationString);
         mDrainStringWidth = (int)mHeaderTextPaint.measureText(mDrainString);
         mChargeLabelStringWidth = (int)mHeaderTextPaint.measureText(mChargeLabelString);
@@ -493,15 +618,51 @@
             mPhoneSignalChart.finish(w);
         }
     }
-    
+
+    private boolean is24Hour() {
+        return DateFormat.is24HourFormat(getContext());
+    }
+
+    private boolean isDayFirst() {
+        String value = Settings.System.getString(mContext.getContentResolver(),
+                Settings.System.DATE_FORMAT);
+        if (value == null) {
+            LocaleData d = LocaleData.get(mContext.getResources().getConfiguration().locale);
+            value = d.shortDateFormat4;
+        }
+        return value.indexOf('M') > value.indexOf('d');
+    }
+
+    /*
+    private void buildTime() {
+        java.text.DateFormat shortDateFormat = DateFormat.getDateFormat(context);
+        final Calendar now = Calendar.getInstance();
+        mDummyDate.setTimeZone(now.getTimeZone());
+        // We use December 31st because it's unambiguous when demonstrating the date format.
+        // We use 13:00 so we can demonstrate the 12/24 hour options.
+        mDummyDate.set(now.get(Calendar.YEAR), 11, 31, 13, 0, 0);
+        Date dummyDate = mDummyDate.getTime();
+        mTimePref.setSummary(DateFormat.getTimeFormat(getActivity()).format(now.getTime()));
+        mTimeZone.setSummary(getTimeZoneText(now.getTimeZone(), true));
+        mDatePref.setSummary(shortDateFormat.format(now.getTime()));
+        mDateFormat.setSummary(shortDateFormat.format(dummyDate));
+        mTime24Pref.setSummary(DateFormat.getTimeFormat(getActivity()).format(dummyDate));
+
+    }
+    */
+
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
-        
+
+        if (DEBUG) Log.d(TAG, "onSizeChanged: " + oldw + "x" + oldh + " to " + w + "x" + h);
+
+        if (mLastWidth == w && mLastHeight == h) {
+            return;
+        }
+
         int textHeight = mTextDescent - mTextAscent;
         int headerTextHeight = mHeaderTextDescent - mHeaderTextAscent;
-        mThinLineWidth = (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
-                2, getResources().getDisplayMetrics());
         if (h > (textHeight*12)) {
             mLargeMode = true;
             if (h > (textHeight*15)) {
@@ -511,7 +672,6 @@
                 // Compress lines to make more room for chart.
                 mLineWidth = textHeight/3;
             }
-            mLevelTop = headerTextHeight*2 + mLineWidth;
             mScreenOnPaint.setARGB(255, 32, 64, 255);
             mGpsOnPaint.setARGB(255, 32, 64, 255);
             mWifiRunningPaint.setARGB(255, 32, 64, 255);
@@ -519,13 +679,18 @@
         } else {
             mLargeMode = false;
             mLineWidth = mThinLineWidth;
-            mLevelTop = headerTextHeight*2 + mLineWidth;
             mScreenOnPaint.setARGB(255, 0, 0, 255);
             mGpsOnPaint.setARGB(255, 0, 0, 255);
             mWifiRunningPaint.setARGB(255, 0, 0, 255);
             mCpuRunningPaint.setARGB(255, 0, 0, 255);
         }
         if (mLineWidth <= 0) mLineWidth = 1;
+
+        mLevelTop = headerTextHeight*2 - mTextAscent;
+        mLevelLeft = mMaxPercentLabelStringWidth + mThinLineWidth*3;
+        mLevelRight = w;
+        int levelWidth = mLevelRight-mLevelLeft;
+
         mTextPaint.setStrokeWidth(mThinLineWidth);
         mBatteryGoodPaint.setStrokeWidth(mThinLineWidth);
         mBatteryWarnPaint.setStrokeWidth(mThinLineWidth);
@@ -535,26 +700,26 @@
         mGpsOnPaint.setStrokeWidth(mLineWidth);
         mWifiRunningPaint.setStrokeWidth(mLineWidth);
         mCpuRunningPaint.setStrokeWidth(mLineWidth);
+        mDebugRectPaint.setStrokeWidth(1);
+
+        int fullBarOffset = textHeight + mLineWidth;
 
         if (mLargeMode) {
-            int barOffset = textHeight + mLineWidth;
             mChargingOffset = mLineWidth;
-            mScreenOnOffset = mChargingOffset + barOffset;
-            mCpuRunningOffset = mScreenOnOffset + barOffset;
-            mWifiRunningOffset = mCpuRunningOffset + barOffset;
-            mGpsOnOffset = mWifiRunningOffset + (mHaveWifi ? barOffset : 0);
-            mPhoneSignalOffset = mGpsOnOffset + (mHaveGps ? barOffset : 0);
-            mLevelOffset = mPhoneSignalOffset + (mHavePhoneSignal ? barOffset : 0)
-                    + ((mLineWidth*3)/2);
+            mScreenOnOffset = mChargingOffset + fullBarOffset;
+            mCpuRunningOffset = mScreenOnOffset + fullBarOffset;
+            mWifiRunningOffset = mCpuRunningOffset + fullBarOffset;
+            mGpsOnOffset = mWifiRunningOffset + (mHaveWifi ? fullBarOffset : 0);
+            mPhoneSignalOffset = mGpsOnOffset + (mHaveGps ? fullBarOffset : 0);
+            mLevelOffset = mPhoneSignalOffset + (mHavePhoneSignal ? fullBarOffset : 0)
+                    + mLineWidth*2 + mLineWidth/2;
             if (mHavePhoneSignal) {
                 mPhoneSignalChart.init(w);
             }
         } else {
             mScreenOnOffset = mGpsOnOffset = mWifiRunningOffset
-                    = mCpuRunningOffset = mLineWidth;
-            mChargingOffset = mLineWidth*2;
-            mPhoneSignalOffset = 0;
-            mLevelOffset = mLineWidth*3;
+                    = mCpuRunningOffset = mChargingOffset = mPhoneSignalOffset = 0;
+            mLevelOffset = fullBarOffset + mThinLineWidth*4;
             if (mHavePhoneSignal) {
                 mPhoneSignalChart.init(0);
             }
@@ -563,23 +728,26 @@
         mBatLevelPath.reset();
         mBatGoodPath.reset();
         mBatWarnPath.reset();
+        mTimeRemainPath.reset();
         mBatCriticalPath.reset();
         mScreenOnPath.reset();
         mGpsOnPath.reset();
         mWifiRunningPath.reset();
         mCpuRunningPath.reset();
         mChargingPath.reset();
-        
-        final long timeStart = mHistStart;
-        final long timeChange = mHistEnd-mHistStart;
-        
+
+        final long walltimeStart = mStartWallTime;
+        final long walltimeChange = mEndWallTime-walltimeStart;
+        long curWalltime = 0;
+        long lastRealtime = 0;
+
         final int batLow = mBatLow;
         final int batChange = mBatHigh-mBatLow;
-        
+
         final int levelh = h - mLevelOffset - mLevelTop;
         mLevelBottom = mLevelTop + levelh;
-        
-        int x = 0, y = 0, startX = 0, lastX = -1, lastY = -1;
+
+        int x = mLevelLeft, y = 0, startX = mLevelLeft, lastX = -1, lastY = -1;
         int i = 0;
         Path curLevelPath = null;
         Path lastLinePath = null;
@@ -589,8 +757,25 @@
         if (mStats.startIteratingHistoryLocked()) {
             final HistoryItem rec = new HistoryItem();
             while (mStats.getNextHistoryLocked(rec) && i < N) {
-                if (rec.isDeltaData()) {
-                    x = (int)(((rec.time-timeStart)*w)/timeChange);
+                if (rec.cmd == HistoryItem.CMD_CURRENT_TIME || rec.cmd == HistoryItem.CMD_RESET) {
+                    curWalltime = rec.currentTime;
+                    lastRealtime = rec.time;
+                } else if (curWalltime != 0) {
+                    curWalltime += rec.time-lastRealtime;
+                    lastRealtime = rec.time;
+                }
+                if (curWalltime != 0 && rec.isDeltaData()) {
+                    x = mLevelLeft + (int)(((curWalltime-walltimeStart)*levelWidth)/walltimeChange);
+                    if (false) {
+                        StringBuilder sb = new StringBuilder(128);
+                        sb.append("walloff=");
+                        TimeUtils.formatDuration(curWalltime - walltimeStart, sb);
+                        sb.append(" wallchange=");
+                        TimeUtils.formatDuration(walltimeChange, sb);
+                        sb.append(" x=");
+                        sb.append(x);
+                        Log.d("foo", sb.toString());
+                    }
                     y = mLevelTop + levelh - ((rec.batteryLevel-batLow)*(levelh-1))/batChange;
 
                     if (lastX != x) {
@@ -625,78 +810,81 @@
                         }
                     }
 
-                    final boolean charging =
-                        (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
-                    if (charging != lastCharging) {
-                        if (charging) {
-                            mChargingPath.moveTo(x, h-mChargingOffset);
-                        } else {
-                            mChargingPath.lineTo(x, h-mChargingOffset);
+                    if (mLargeMode) {
+                        final boolean charging =
+                            (rec.states&HistoryItem.STATE_BATTERY_PLUGGED_FLAG) != 0;
+                        if (charging != lastCharging) {
+                            if (charging) {
+                                mChargingPath.moveTo(x, h-mChargingOffset);
+                            } else {
+                                mChargingPath.lineTo(x, h-mChargingOffset);
+                            }
+                            lastCharging = charging;
                         }
-                        lastCharging = charging;
+
+                        final boolean screenOn =
+                            (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
+                        if (screenOn != lastScreenOn) {
+                            if (screenOn) {
+                                mScreenOnPath.moveTo(x, h-mScreenOnOffset);
+                            } else {
+                                mScreenOnPath.lineTo(x, h-mScreenOnOffset);
+                            }
+                            lastScreenOn = screenOn;
+                        }
+
+                        final boolean gpsOn =
+                            (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
+                        if (gpsOn != lastGpsOn) {
+                            if (gpsOn) {
+                                mGpsOnPath.moveTo(x, h-mGpsOnOffset);
+                            } else {
+                                mGpsOnPath.lineTo(x, h-mGpsOnOffset);
+                            }
+                            lastGpsOn = gpsOn;
+                        }
+
+                        final boolean wifiRunning =
+                            (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+                        if (wifiRunning != lastWifiRunning) {
+                            if (wifiRunning) {
+                                mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
+                            } else {
+                                mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
+                            }
+                            lastWifiRunning = wifiRunning;
+                        }
+
+                        final boolean cpuRunning =
+                            (rec.states&HistoryItem.STATE_CPU_RUNNING_FLAG) != 0;
+                        if (cpuRunning != lastCpuRunning) {
+                            if (cpuRunning) {
+                                mCpuRunningPath.moveTo(x, h - mCpuRunningOffset);
+                            } else {
+                                mCpuRunningPath.lineTo(x, h - mCpuRunningOffset);
+                            }
+                            lastCpuRunning = cpuRunning;
+                        }
+
+                        if (mLargeMode && mHavePhoneSignal) {
+                            int bin;
+                            if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
+                                    >> HistoryItem.STATE_PHONE_STATE_SHIFT)
+                                    == ServiceState.STATE_POWER_OFF) {
+                                bin = 0;
+                            } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
+                                bin = 1;
+                            } else {
+                                bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
+                                        >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
+                                bin += 2;
+                            }
+                            mPhoneSignalChart.addTick(x, bin);
+                        }
                     }
 
-                    final boolean screenOn =
-                        (rec.states&HistoryItem.STATE_SCREEN_ON_FLAG) != 0;
-                    if (screenOn != lastScreenOn) {
-                        if (screenOn) {
-                            mScreenOnPath.moveTo(x, h-mScreenOnOffset);
-                        } else {
-                            mScreenOnPath.lineTo(x, h-mScreenOnOffset);
-                        }
-                        lastScreenOn = screenOn;
-                    }
-
-                    final boolean gpsOn =
-                        (rec.states&HistoryItem.STATE_GPS_ON_FLAG) != 0;
-                    if (gpsOn != lastGpsOn) {
-                        if (gpsOn) {
-                            mGpsOnPath.moveTo(x, h-mGpsOnOffset);
-                        } else {
-                            mGpsOnPath.lineTo(x, h-mGpsOnOffset);
-                        }
-                        lastGpsOn = gpsOn;
-                    }
-
-                    final boolean wifiRunning =
-                        (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
-                    if (wifiRunning != lastWifiRunning) {
-                        if (wifiRunning) {
-                            mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
-                        } else {
-                            mWifiRunningPath.lineTo(x, h-mWifiRunningOffset);
-                        }
-                        lastWifiRunning = wifiRunning;
-                    }
-
-                    final boolean cpuRunning =
-                        (rec.states&HistoryItem.STATE_CPU_RUNNING_FLAG) != 0;
-                    if (cpuRunning != lastCpuRunning) {
-                        if (cpuRunning) {
-                            mCpuRunningPath.moveTo(x, h - mCpuRunningOffset);
-                        } else {
-                            mCpuRunningPath.lineTo(x, h - mCpuRunningOffset);
-                        }
-                        lastCpuRunning = cpuRunning;
-                    }
-
-                    if (mLargeMode && mHavePhoneSignal) {
-                        int bin;
-                        if (((rec.states&HistoryItem.STATE_PHONE_STATE_MASK)
-                                >> HistoryItem.STATE_PHONE_STATE_SHIFT)
-                                == ServiceState.STATE_POWER_OFF) {
-                            bin = 0;
-                        } else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
-                            bin = 1;
-                        } else {
-                            bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
-                                    >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
-                            bin += 2;
-                        }
-                        mPhoneSignalChart.addTick(x, bin);
-                    }
-
-                } else if (rec.cmd != BatteryStats.HistoryItem.CMD_OVERFLOW) {
+                } else if (rec.cmd != HistoryItem.CMD_OVERFLOW
+                        && rec.cmd != HistoryItem.CMD_CURRENT_TIME) {
                     if (curLevelPath != null) {
                         finishPaths(x+1, h, levelh, startX, lastY, curLevelPath, lastX,
                                 lastCharging, lastScreenOn, lastGpsOn, lastWifiRunning,
@@ -711,83 +899,241 @@
                 i++;
             }
         }
-        
-        finishPaths(w, h, levelh, startX, lastY, curLevelPath, lastX,
+
+        // Figure out where the actual data ends on the screen.
+        x = mLevelLeft + (int)(((mEndDataWallTime-walltimeStart)*levelWidth)/walltimeChange);
+
+        finishPaths(x, h, levelh, startX, lastY, curLevelPath, lastX,
                 lastCharging, lastScreenOn, lastGpsOn, lastWifiRunning,
                 lastCpuRunning, lastLinePath);
+
+        if (x < w) {
+            // If we reserved room for the remaining time, create a final path to draw
+            // that part of the UI.
+            mTimeRemainPath.moveTo(x, lastY);
+            int fullY = mLevelTop + levelh - ((100-batLow)*(levelh-1))/batChange;
+            int emptyY = mLevelTop + levelh - ((0-batLow)*(levelh-1))/batChange;
+            if (mDischarging) {
+                mTimeRemainPath.lineTo(mLevelRight, emptyY);
+            } else {
+                mTimeRemainPath.lineTo(mLevelRight, fullY);
+                mTimeRemainPath.lineTo(mLevelRight, emptyY);
+            }
+            mTimeRemainPath.lineTo(x, emptyY);
+            mTimeRemainPath.close();
+        }
+
+        // Create the time labels at the bottom.
+        mTimeLabels.clear();
+        boolean is24hr = is24Hour();
+        Calendar calStart = Calendar.getInstance();
+        calStart.setTimeInMillis(mStartWallTime);
+        calStart.set(Calendar.MILLISECOND, 0);
+        calStart.set(Calendar.SECOND, 0);
+        calStart.set(Calendar.MINUTE, 0);
+        long startRoundTime = calStart.getTimeInMillis();
+        if (startRoundTime < mStartWallTime) {
+            calStart.set(Calendar.HOUR_OF_DAY, calStart.get(Calendar.HOUR_OF_DAY)+1);
+            startRoundTime = calStart.getTimeInMillis();
+        }
+        Calendar calEnd = Calendar.getInstance();
+        calEnd.setTimeInMillis(mEndWallTime);
+        calEnd.set(Calendar.MILLISECOND, 0);
+        calEnd.set(Calendar.SECOND, 0);
+        calEnd.set(Calendar.MINUTE, 0);
+        long endRoundTime = calEnd.getTimeInMillis();
+        if (startRoundTime < endRoundTime) {
+            addTimeLabel(calStart, mLevelLeft, mLevelRight, is24hr);
+            Calendar calMid = Calendar.getInstance();
+            calMid.setTimeInMillis(mStartWallTime+((mEndWallTime-mStartWallTime)/2));
+            calMid.set(Calendar.MILLISECOND, 0);
+            calMid.set(Calendar.SECOND, 0);
+            calMid.set(Calendar.MINUTE, 0);
+            long calMidMillis = calMid.getTimeInMillis();
+            if (calMidMillis > startRoundTime && calMidMillis < endRoundTime) {
+                addTimeLabel(calMid, mLevelLeft, mLevelRight, is24hr);
+            }
+            addTimeLabel(calEnd, mLevelLeft, mLevelRight, is24hr);
+        }
+
+        // Create the date labels if the chart includes multiple days
+        mDateLabels.clear();
+        if (calStart.get(Calendar.DAY_OF_YEAR) != calEnd.get(Calendar.DAY_OF_YEAR) ||
+                calStart.get(Calendar.YEAR) != calEnd.get(Calendar.YEAR)) {
+            boolean isDayFirst = isDayFirst();
+            calStart.set(Calendar.HOUR_OF_DAY, 0);
+            startRoundTime = calStart.getTimeInMillis();
+            if (startRoundTime < mStartWallTime) {
+                calStart.set(Calendar.DAY_OF_YEAR, calStart.get(Calendar.DAY_OF_YEAR) + 1);
+                startRoundTime = calStart.getTimeInMillis();
+            }
+            calEnd.set(Calendar.HOUR_OF_DAY, 0);
+            endRoundTime = calEnd.getTimeInMillis();
+            if (startRoundTime < endRoundTime) {
+                addDateLabel(calStart, mLevelLeft, mLevelRight, isDayFirst);
+            }
+            addDateLabel(calEnd, mLevelLeft, mLevelRight, isDayFirst);
+        }
     }
-    
+
+    void addTimeLabel(Calendar cal, int levelLeft, int levelRight, boolean is24hr) {
+        final long walltimeStart = mStartWallTime;
+        final long walltimeChange = mEndWallTime-walltimeStart;
+        mTimeLabels.add(new TimeLabel(getContext(), mTextPaint,
+                levelLeft + (int)(((cal.getTimeInMillis()-walltimeStart)*(levelRight-levelLeft))
+                        / walltimeChange),
+                cal, is24hr));
+    }
+
+    void addDateLabel(Calendar cal, int levelLeft, int levelRight, boolean isDayFirst) {
+        final long walltimeStart = mStartWallTime;
+        final long walltimeChange = mEndWallTime-walltimeStart;
+        mDateLabels.add(new DateLabel(getContext(), mTextPaint,
+                levelLeft + (int)(((cal.getTimeInMillis()-walltimeStart)*(levelRight-levelLeft))
+                        / walltimeChange),
+                cal, isDayFirst));
+    }
+
     @Override
     protected void onDraw(Canvas canvas) {
         super.onDraw(canvas);
 
         final int width = getWidth();
         final int height = getHeight();
+
+        if (DEBUG) Log.d(TAG, "onDraw: " + width + "x" + height);
+
         final boolean layoutRtl = isLayoutRtl();
         final int textStartX = layoutRtl ? width : 0;
         final int textEndX = layoutRtl ? 0 : width;
         final Paint.Align textAlignLeft = layoutRtl ? Paint.Align.RIGHT : Paint.Align.LEFT;
         final Paint.Align textAlignRight = layoutRtl ? Paint.Align.LEFT : Paint.Align.RIGHT;
-        mTextPaint.setTextAlign(textAlignLeft);
 
-        canvas.drawPath(mBatLevelPath, mBatteryBackgroundPaint);
-        int durationHalfWidth = mDurationStringWidth / 2;
-        if (layoutRtl) durationHalfWidth = -durationHalfWidth;
-        if (mLargeMode) {
-            canvas.drawText(mDurationString, (width / 2) - durationHalfWidth,
-                    mLevelBottom - mTextAscent + mThinLineWidth, mTextPaint);
-        } else {
-            canvas.drawText(mDurationString, (width / 2) - durationHalfWidth,
-                    mLevelTop + ((height-mLevelTop) / 2) - ((mTextDescent - mTextAscent) / 2)
-                            - mTextAscent, mTextPaint);
+        if (DEBUG) {
+            canvas.drawRect(1, 1, width, height, mDebugRectPaint);
         }
 
-        int headerTop = mLevelTop/2 + (mHeaderTextDescent-mHeaderTextAscent)/2;
+        if (DEBUG) Log.d(TAG, "Drawing level path.");
+        canvas.drawPath(mBatLevelPath, mBatteryBackgroundPaint);
+        if (!mTimeRemainPath.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "Drawing time remain path.");
+            canvas.drawPath(mTimeRemainPath, mTimeRemainPaint);
+        }
+        int durationHalfWidth = mDurationStringWidth / 2;
+        if (layoutRtl) durationHalfWidth = -durationHalfWidth;
+        if (mTimeLabels.size() > 0) {
+            int y = mLevelBottom - mTextAscent + (mThinLineWidth*4);
+            int ytick = mLevelBottom+mThinLineWidth+(mThinLineWidth/2);
+            mTextPaint.setTextAlign(Paint.Align.LEFT);
+            int lastX = 0;
+            for (int i=0; i<mTimeLabels.size(); i++) {
+                TimeLabel label = mTimeLabels.get(i);
+                if (i == 0) {
+                    int x = label.x - label.width/2;
+                    if (x < 0) {
+                        x = 0;
+                    }
+                    if (DEBUG) Log.d(TAG, "Drawing left label: " + label.label + " @ " + x);
+                    canvas.drawText(label.label, x, y, mTextPaint);
+                    canvas.drawLine(label.x, ytick, label.x, ytick+mThinLineWidth, mTextPaint);
+                    lastX = x + label.width;
+                } else if (i < (mTimeLabels.size()-1)) {
+                    int x = label.x - label.width/2;
+                    if (x < (lastX+mTextAscent)) {
+                        continue;
+                    }
+                    TimeLabel nextLabel = mTimeLabels.get(i+1);
+                    if (x > (width-nextLabel.width-mTextAscent)) {
+                        continue;
+                    }
+                    if (DEBUG) Log.d(TAG, "Drawing middle label: " + label.label + " @ " + x);
+                    canvas.drawText(label.label, x, y, mTextPaint);
+                    canvas.drawLine(label.x, ytick, label.x, ytick + mThinLineWidth, mTextPaint);
+                    lastX = x + label.width;
+                } else {
+                    int x = label.x - label.width/2;
+                    if ((x+label.width) >= width) {
+                        x = width-1-label.width;
+                    }
+                    if (DEBUG) Log.d(TAG, "Drawing right label: " + label.label + " @ " + x);
+                    canvas.drawText(label.label, x, y, mTextPaint);
+                    canvas.drawLine(label.x, ytick, label.x, ytick+mThinLineWidth, mTextPaint);
+                }
+            }
+        }
+
+        if (false) {
+            // Old code for printing label.
+            mTextPaint.setTextAlign(textAlignLeft);
+            if (mLargeMode) {
+                canvas.drawText(mDurationString, (width / 2) - durationHalfWidth,
+                        mLevelBottom - mTextAscent + mThinLineWidth, mTextPaint);
+            } else {
+                canvas.drawText(mDurationString, (width / 2) - durationHalfWidth,
+                        mLevelTop + ((height-mLevelTop) / 2) - ((mTextDescent - mTextAscent) / 2)
+                                - mTextAscent, mTextPaint);
+            }
+        }
+
+        int headerTop = -mHeaderTextAscent + (mHeaderTextDescent-mHeaderTextAscent)/3;
         mHeaderTextPaint.setTextAlign(textAlignLeft);
+        if (DEBUG) Log.d(TAG, "Drawing charge label string: " + mChargeLabelString);
         canvas.drawText(mChargeLabelString, textStartX, headerTop, mHeaderTextPaint);
         durationHalfWidth = mChargeDurationStringWidth / 2;
         if (layoutRtl) durationHalfWidth = -durationHalfWidth;
         int headerCenter = ((width-mChargeDurationStringWidth-mDrainStringWidth)/2)
                 + (layoutRtl ? mDrainStringWidth : mChargeLabelStringWidth);
+        if (DEBUG) Log.d(TAG, "Drawing charge duration string: " + mChargeDurationString);
         canvas.drawText(mChargeDurationString, headerCenter - durationHalfWidth, headerTop,
                 mHeaderTextPaint);
         mHeaderTextPaint.setTextAlign(textAlignRight);
+        if (DEBUG) Log.d(TAG, "Drawing drain string: " + mDrainString);
         canvas.drawText(mDrainString, textEndX, headerTop, mHeaderTextPaint);
 
         if (!mBatGoodPath.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "Drawing good battery path");
             canvas.drawPath(mBatGoodPath, mBatteryGoodPaint);
         }
         if (!mBatWarnPath.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "Drawing warn battery path");
             canvas.drawPath(mBatWarnPath, mBatteryWarnPaint);
         }
         if (!mBatCriticalPath.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "Drawing critical battery path");
             canvas.drawPath(mBatCriticalPath, mBatteryCriticalPaint);
         }
         if (mHavePhoneSignal) {
+            if (DEBUG) Log.d(TAG, "Drawing phone signal path");
             int top = height-mPhoneSignalOffset - (mLineWidth/2);
             mPhoneSignalChart.draw(canvas, top, mLineWidth);
         }
         if (!mScreenOnPath.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "Drawing screen on path");
             canvas.drawPath(mScreenOnPath, mScreenOnPaint);
         }
         if (!mChargingPath.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "Drawing charging path");
             canvas.drawPath(mChargingPath, mChargingPaint);
         }
         if (mHaveGps) {
             if (!mGpsOnPath.isEmpty()) {
+                if (DEBUG) Log.d(TAG, "Drawing gps path");
                 canvas.drawPath(mGpsOnPath, mGpsOnPaint);
             }
         }
         if (mHaveWifi) {
             if (!mWifiRunningPath.isEmpty()) {
+                if (DEBUG) Log.d(TAG, "Drawing wifi path");
                 canvas.drawPath(mWifiRunningPath, mWifiRunningPaint);
             }
         }
         if (!mCpuRunningPath.isEmpty()) {
+            if (DEBUG) Log.d(TAG, "Drawing running path");
             canvas.drawPath(mCpuRunningPath, mCpuRunningPaint);
         }
 
         if (mLargeMode) {
+            if (DEBUG) Log.d(TAG, "Drawing large mode labels");
             if (mHavePhoneSignal) {
                 canvas.drawText(mPhoneSignalLabel, textStartX,
                         height - mPhoneSignalOffset - mTextDescent, mTextPaint);
@@ -806,13 +1152,52 @@
                     height - mChargingOffset - mTextDescent, mTextPaint);
             canvas.drawText(mScreenOnLabel, textStartX,
                     height - mScreenOnOffset - mTextDescent, mTextPaint);
-            canvas.drawLine(0, mLevelBottom+(mThinLineWidth/2), width,
-                    mLevelBottom+(mThinLineWidth/2), mTextPaint);
-            canvas.drawLine(0, mLevelTop, 0,
-                    mLevelBottom+(mThinLineWidth/2), mTextPaint);
+        }
+
+        canvas.drawLine(mLevelLeft-mThinLineWidth, mLevelTop, mLevelLeft-mThinLineWidth,
+                mLevelBottom+(mThinLineWidth/2), mTextPaint);
+        if (mLargeMode) {
             for (int i=0; i<10; i++) {
-                int y = mLevelTop + ((mLevelBottom-mLevelTop)*i)/10;
-                canvas.drawLine(0, y, mThinLineWidth*2, y, mTextPaint);
+                int y = mLevelTop + mThinLineWidth/2 + ((mLevelBottom-mLevelTop)*i)/10;
+                canvas.drawLine(mLevelLeft-mThinLineWidth*2-mThinLineWidth/2, y,
+                        mLevelLeft-mThinLineWidth-mThinLineWidth/2, y, mTextPaint);
+            }
+        }
+        if (DEBUG) Log.d(TAG, "Drawing max percent, origw=" + mMaxPercentLabelStringWidth
+                + ", noww=" + (int)mTextPaint.measureText(mMaxPercentLabelString));
+        canvas.drawText(mMaxPercentLabelString, 0, mLevelTop, mTextPaint);
+        canvas.drawText(mMinPercentLabelString,
+                mMaxPercentLabelStringWidth-mMinPercentLabelStringWidth,
+                mLevelBottom - mThinLineWidth, mTextPaint);
+        canvas.drawLine(0, mLevelBottom+mThinLineWidth, width,
+                mLevelBottom+mThinLineWidth, mTextPaint);
+
+        if (mDateLabels.size() > 0) {
+            int ytop = mLevelTop + mTextAscent;
+            int ybottom = mLevelBottom;
+            int lastLeft = mLevelRight;
+            mTextPaint.setTextAlign(Paint.Align.LEFT);
+            for (int i=mDateLabels.size()-1; i>=0; i--) {
+                DateLabel label = mDateLabels.get(i);
+                int left = label.x - mThinLineWidth;
+                int x = label.x + mThinLineWidth*2;
+                if ((x+label.width) >= lastLeft) {
+                    x = label.x - mThinLineWidth*2 - label.width;
+                    left = x - mThinLineWidth;
+                    if (left >= lastLeft) {
+                        // okay we give up.
+                        continue;
+                    }
+                }
+                if (left < mLevelLeft) {
+                    // Won't fit on left, give up.
+                    continue;
+                }
+                mDateLinePath.reset();
+                mDateLinePath.moveTo(label.x, ytop);
+                mDateLinePath.lineTo(label.x, ybottom);
+                canvas.drawPath(mDateLinePath, mDateLinePaint);
+                canvas.drawText(label.label, x, ytop - mTextAscent, mTextPaint);
             }
         }
     }
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index 87e5d76..e6c2c96 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -21,7 +21,6 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.os.BatteryManager;
 import android.os.BatteryStats;
 import android.os.Bundle;
 import android.os.Handler;
diff --git a/src/com/android/settings/notification/NotificationStation.java b/src/com/android/settings/notification/NotificationStation.java
index 3f37f6d..2471801 100644
--- a/src/com/android/settings/notification/NotificationStation.java
+++ b/src/com/android/settings/notification/NotificationStation.java
@@ -74,10 +74,6 @@
 
     private NotificationListenerService mListener = new NotificationListenerService() {
         @Override
-        public void onListenerConnected(String[] notificationKeys) {
-            // noop
-        }
-        @Override
         public void onNotificationPosted(StatusBarNotification notification) {
             Log.v(TAG, "onNotificationPosted: " + notification);
             final Handler h = getListView().getHandler();