Looks like code is still referencing a dead string.

Revert "Import translations. DO NOT MERGE" This reverts commit 460d5b7400d91afb12f1f5cd25d65544c19cdd4a. Change-Id: I2dbd9cc37413b6612538bf567aa7482fd77f8fb2
author: Baligh Uddin <baligh@google.com> 2014-06-04 05:28:30 +0000
committer: Baligh Uddin <baligh@google.com> 2014-06-04 05:28:30 +0000
commit: 97473868432d6523c6b25ef0ec490589b739a455 (patch)
tree: ff80b2346a6673615f5d6d057801a12eb79565f4
parent: 460d5b7400d91afb12f1f5cd25d65544c19cdd4a (diff)
download: packages_apps_Settings-97473868432d6523c6b25ef0ec490589b739a455.zip
packages_apps_Settings-97473868432d6523c6b25ef0ec490589b739a455.tar.gz
packages_apps_Settings-97473868432d6523c6b25ef0ec490589b739a455.tar.bz2
112 files changed, 4635 insertions, 3131 deletions
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index e022189..f36d23b 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Geen"</item>
     <item msgid="8673874894887358090">"Handmatig"</item>
-    <item msgid="168893341855953140">"Instaan-outo-opstelling"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Af"</item>
+    <item msgid="3165868966179561687">"Berig"</item>
+    <item msgid="6038758039030476855">"Vibreer"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Geen"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Af"</item>
     <item msgid="2751513398307949636">"Op skerm as balke"</item>
-    <item msgid="1851438178120770973">"In adb-dop dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Op skerm as reëls"</item>
+    <item msgid="120512413928262547">"In adb-dop dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Af"</item>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index bc99e03..0b41b35 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Skerm AAN tyd:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Onbekend"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laai"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Laai tans op WS"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Laai tans oor USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Laai tans draadloos"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(draadloos)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Laai nie"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laai nie"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Vol"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Die poortveld moet leeg wees as die gasheerveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Die poort wat jy ingevoer het, is nie geldig nie."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Die HTTP-instaanbediener word deur die blaaier gebruik, maar kan nie deur die ander programme gebruik word nie."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC-URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC-URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ligging:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Selinligting:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Instellings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Instellingskortpad"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Vliegtuigmodus"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC en meer"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Meer…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerke"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Bestuur Wi-Fi, Bluetooth, vliegtuigmodus, mobiele netwerke en VPN\'e"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataswerwing"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eienaar se inligting"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktiveer legstukke"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Gedeaktiveer deur administrateur"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-ontsluit"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Voer teks in om op die sluitskerm te wys"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Wys gebruikerinligting op sluitskerm"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skryf na NFC-merker"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Helderheidsvlak"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Verstel die helderheid van die skerm"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliseer helderheidsvlak vir die beskikbare lig"</string>
+    <!-- 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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Verander SMS-program?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gebruik <xliff:g id="NEW_APP">%1$s</xliff:g> in plaas van <xliff:g id="CURRENT_APP">%2$s</xliff:g> as jou SMS-program?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gebruik <xliff:g id="NEW_APP">%s</xliff:g> as jou SMS-program?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Onbekende SIM-operateur"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Onbekende SIM-operateur"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s het geen bekende voorsieningwebwerf nie"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Steek asseblief SIM-kaart in en herbegin"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koppel asseblief aan die internet"</string>
@@ -1322,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="7923901846375587241">"Kortpad na foutverslag"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Wys \'n knoppie in Kitsinstellings om \'n foutverslag te doen"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Kies looptyd"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Herlaai om looptyd van <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g> te verander?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Draadlose skermsertifisering"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktiveer WiFi verbose loginskrywing"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Wys opsies vir draadlose skermsertifisering"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Verhoog Wifi-loginskrywingsvlak, wys per SSID RSSI in WiFi Kieser"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Laat USB-ontfouting toe?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sein van mobiele netwerk"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> vm."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> nm."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Toestel se wakkertyd"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi betyds"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi betyds"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Verwyder alle sertifikate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertroude eiebewyse"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wys vertroude CA-sertifikate"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Gevorderd"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Bergingtipe"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardeware-geondersteun"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Net sagteware"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" om voort te gaan met opstelling.\n\nRaak "<b>"Terug"</b>" om aan \'n ander Wi‑Fi-netwerk te koppel."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasie geaktiveer"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasie gedeaktiveer"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinkroniseer nou"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinkroniseerfout."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sinkronisasie het misluk"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sinkronisasie aktief"</string>
@@ -2062,7 +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 program op voorgrond"</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>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Neem foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Kies foto vanuit galery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-skermslot-instellings"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Saamgebinde merkers"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Geaktiveer"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Bind met \'n merker saam"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NFC-saambind-aktiwiteit"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Bind nou saam"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Sit die merker plat op \'n tafel en sit die foon bo-op"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Merker en foon suksesvol saamgebind. Jy\'s klaar!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Die merker wat voorsien is, kan nie gebruik word om jou foon te ontsluit nie"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kon nie met jou merker saambind nie, probeer asseblief weer"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC is nie geaktiveer nie en word vereis vir NFC-ontsluit. Skakel NFC asseblief aan."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-instellings"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Instellings"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Instellings"</string>
     <string name="search_menu" msgid="7053532283559077164">"Soek"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Kennisgewingvolume"</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_title_novoice" msgid="4628028304587795604">"Wanneer 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Ander klanke"</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="1340569241625989837">"Skermsluitklanke"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Dokklanke"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Raakklanke"</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="dock_audio_media_title" msgid="1346838179626123900">"Dokluidspreker speel"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Alle oudio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Net media-oudio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Stil"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alarmsein"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreer"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Af"</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/arrays.xml b/res/values-am/arrays.xml
index 034a655..a110e51 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"አንዱም"</item>
     <item msgid="8673874894887358090">"መመሪያ"</item>
-    <item msgid="168893341855953140">"የተኪ ራስ-ውቅር"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"ውጪ"</item>
+    <item msgid="3165868966179561687">"አንቃ"</item>
+    <item msgid="6038758039030476855">"አንዝር"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"አንዱም"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"ጠፍቷል"</item>
     <item msgid="2751513398307949636">"ማያ ገጽ ላይ እንደ አሞሌዎች"</item>
-    <item msgid="1851438178120770973">"በ adb shell dumpsys gfxinfo ውስጥ"</item>
+    <item msgid="8272260411216018353">"ማያ ገጽ ላይ እንደ መስመሮች"</item>
+    <item msgid="120512413928262547">"በ adb shell dumpsys gfxinfo ውስጥ"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"ጠፍቷል"</item>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index df19cbb..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"ማያ በሰዓቱ በርቷል፡"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"ያልታወቀ"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"ኃይል በመሙላት ላይ"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"በኤሲ ሃይል በመሙላት ላይ"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"በዩኤስቢ ሃይል በመሙላት ላይ"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"በገመድ አልባ ሃይል በመሙላት ላይ"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ገመድ አልባ)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"ባትሪ እየሞላ አይደለም"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ኃይል  እየሞላ አይደለም"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ሙሉነው"</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_title" msgid="7185282894936042359">"የፒኤሲ ዩአርኤል፦ "</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>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"ቅንብሮች"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"የቅንብሮች አቋራጭ"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"የአውሮፕላን ሁነታ"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC እና ተጨማሪ"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"ተጨማሪ…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ገመድ አልባ&amp; አውታረ መረቦች"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi፣ ብሉቱዝ፣ የአውሮፕላን ሁነታ፣ የተንቀሳቃሽ አውታረ መረቦች፣ እና VPNዎችን ያቀናብሩ"</string>
     <string name="roaming" msgid="3596055926335478572">"ውሂብ በእንቅስቃሴ ላይ"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"የባለቤት መረጃ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ንዑስ ፕሮግራሞችን አንቃ"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"በአስተዳዳሪ የተሰናከለ"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"የNFC መክፈት"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"በተቆለፈ ማያ ላይ ለማሳየት ፅሁፍ አስገባ"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"የተጠቃሚ መረጃ በመቆለፊያ ማያ ገጹ ላይ አሳይ"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ጡባዊ አመስጥር"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ስልክ አመስጥር"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ተመሳጥሯል"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"የእርስዎን መለያዎች፣ ቅንብሮች፣ የወረዱ መተግበሪያዎች እና ውሂቦቻቸው፣ ማህደረመረጃ እና ሌሎች ፋይሎች ማመስጠር ይችላሉ። ጡባዊዎን ካመሰጠሩት በኋላ ቁልፍ ገጽ አዋቅረዋል ብለን ከወሰድን (ማለትም የስርዓተ ጥለት ወይም የቁጥራዊ ፒን ወይም ይለፍ ቃል) ጡባዊውን በሚያበሩበት እያንዳንዱ ጊዜ ጡባዊውን ለመፍታት ማያ ገጹን መክፈት ይኖርብዎታል። ሌላ መፍታት የሚችሉበት ብቸኛው መንገድ ሁሉንም ውሂብዎ የሚያጠፋውን የፋብሪካ ዳግም ማስጀመር ማከናወን ነው።\n\nማመስጠር አንድ ሰዓት ወይም ከዚያ በላይ ይወስዳል። በሙሉ ባትሪ መጀመር እና ሂደቱ እስኪያልቅ ድረስ እንደተሰካ ማቆየት አለብዎት። ካቋረጡት አንዳንድ ወይም ሁሉም ውሂብዎን ያጣሉ።"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"የእርስዎን መለያዎች፣ ቅንብሮች፣ የወረዱ መተግበሪያዎች እና ውሂቦቻቸው፣ ማህደረመረጃ እና ሌሎች ፋይሎች ማመስጠር ይችላሉ። ስልክዎን ካመሰጠሩት በኋላ ቁልፍ ገጽ አዋቅረዋል ብለን ከወሰድን (ማለትም የስርዓተ ጥለት ወይም የቁጥራዊ ፒን ወይም ይለፍ ቃል) ስልኩን በሚያበሩበት እያንዳንዱ ጊዜ ስልኩን ለመፍታት ማያ ገጹን መክፈት ይኖርብዎታል። ሌላ መፍታት የሚችሉበት ብቸኛው መንገድ ሁሉንም ውሂብዎ የሚያጠፋውን የፋብሪካ ዳግም ማስጀመር ማከናወን ነው።\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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"ወደ NFC መለያ ጻፍ"</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>
@@ -618,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="2288214226916117159">"የአውታረ መረብ ይለፍ ቃልዎን ያስገቡ"</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>
@@ -735,10 +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="8480105032417444275">"የብሩህነት ደረጃ"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"የማያ ብሩህነት አስተካክል"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"ተለማማጅ ብሩህነት"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"ለሚገኘው ብርሃን የብሩህነት ደረጃ አመቻች"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"የኤስ ኤም ኤስ መተግበሪያ ይለወጥ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ከ<xliff:g id="CURRENT_APP">%2$s</xliff:g> ይልቅ <xliff:g id="NEW_APP">%1$s</xliff:g> እንደ እርስዎ ኤስኤምኤስ መተግበሪያ ይጠቀሙበት?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>ን እንደ እርስዎ ኤስ ኤም ኤስ መተግበሪያ ይጠቀሙበት?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"ያልታወቀ የሲም አንቀሳቃሽ"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"የማይታወቅ የSIM ከዋኝ"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s የሚታወቅ የአቅርቦት ድር ጣቢያ የለውም"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"እባክዎ SIM ካርድ ያስገቡና ዳግም ያስጀምሩ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"እባክዎ ከበይነ መረብ ጋር ያገናኙ"</string>
@@ -1322,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="7923901846375587241">"የሳንካ ሪፖርት አቋራጭ"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"አንድ የሳንካ ሪፖርት ለመውሰድ በፈጣን ቅንብሮች ውስጥ አንድ አዝራር አሳይ"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"የሚፈጀውን ጊዜ ይምረጡ"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"የሚፈጀውን ጊዜ ከ<xliff:g id="OLD">%1$s</xliff:g> ወደ <xliff:g id="NEW">%2$s</xliff:g> ለመለወጥ ዳግም ይጀምር?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"የWiFi የቃላት መለያ መግቢያን አንቃ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ አማራጮችን አሳይ"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"የWifi መለያ መግቢያ ደረጃ ጨምር፣ በWiFi መምረጫ ውስጥ በአንድ SSID RSSI አሳይ"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"የተንቀሳቃሽ ስልክ አውታረ መረብ ማመልከት"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"የመሣሪያማንቂያ ሰዓት"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi በጊዜ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi በጊዜ"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ሁሉንም ምስክሮችአስወግድ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"የሚታመን ማስረጃ"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"ታማኝ የCA  ምስክር አሳይ"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"ከፍተኛ"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"የማከማቻ አይነት"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"በሃርድዌር የተደገፈ"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ሶፍትዌር ብቻ"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"ማዋቀሩን ለመቀጠል "<b>"ቀጣይ"</b>"ን ይንኩ።\n\nከተለየ የWi-Fi አውታረ መረብ ጋር ለመገናኘት "<b>"ተመለስ"</b>"ን ይንኩ።"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"አሳምርነቅቷል"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"አስምር ቦዝኗል"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"አሁን በማመሳሰል ላይ"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"የአስምር ስህተት።"</string>
     <string name="sync_failed" msgid="1696499856374109647">"አመሳስል አልተሳካም"</string>
     <string name="sync_active" msgid="8476943765960863040">"አመሳስል የነቃ"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"ማከማቻን ለመፍታት የእርስዎን ፒን ያስገቡ"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"ማከማቻን ለመፍታት ስርዓተ ጥለትዎን ይሳሉ"</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>
@@ -2063,7 +2070,7 @@
     <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_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>
     <string name="nfc_payment_set_default" msgid="8961120988148253016">"መታ አድርገው በሚከፍሉበት ወቅት <xliff:g id="APP">%1$s</xliff:g> ሁልጊዜ ስራ ላይ ይዋል?"</string>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ፎቶ ያንሱ"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ፎቶ ከማዕከለ ስዕላት ምረጥ"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"የNFC ማያ ገጽ ቁልፍ ቅንብሮች"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"የተጣመሩ መለያዎች"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"ነቅቷል"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"ከአንድ መለያ ጋር አጣምር"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"አሁን አጣምር"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"መለያውን ጠረጴዛው ላይ ያስተኙት እና ስልኩን ከላይ ያስቀምጡት"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"መለያ እና ስልክ በተሳካ ሁኔታ ተጣምረዋል፣ በቃ ተከናውኗል!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"የቀረበው መለያ ስልክዎን ለማስከፈት ስራ ላይ መዋል አይችልም"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"ከእርስዎ መለያ ጋር የሚደረገው ማጣመር አልተሳካም፣ እባክዎ እንደገና ይሞክሩ"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC አልነቃም፣ እና በNFC ለመክፈት ያስፈልጋል። እባክዎ NFCን ያብሩ።"</string>
+    <string name="ok" msgid="3651563352754792958">"የNFC ቅንብሮች"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ቅንብሮች"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ቅንብሮች"</string>
     <string name="search_menu" msgid="7053532283559077164">"ይፈልጉ"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"የ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>
@@ -2112,43 +2132,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"የማሳወቂያ ድምጽ መጠን"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"ጥሪዎች እና ማሳወቂያዎች ሲመጡ"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"ማሳወቂያዎች ሲመጡ"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"ነባሪ የማሳወቂያ ጥሪ ቅላጼ"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"በሚደወልበት ጊዜ ንዘር"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"ማሳወቂያዎችን በማሳየት ላይ"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"የማሳወቂያ ብርሃን አሳይ"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"መሣሪያ ሲቆለፍ"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"ሌሎች ድምጾች"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"የመደወያ ሰሌዳ ድምጾች"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"የማያ ገጾ መቆለፍ ድምጾች"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"የመትከል ድምጾች"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"ድምፆችን ይንኩ"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"ሲነካ ንዘር"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"የመትከያ ድምጽ ማጉያ ያጫውታል"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ሁሉም ተሰሚ"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"የማህደረመረጃ ተሰሚ ብቻ"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ፀጥታ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ማንቂያ"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ንዘር"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"የማሳወቂያ መዳረሻ"</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>
@@ -2168,18 +2200,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">"፣"</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>
@@ -2198,6 +2236,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-ar/arrays.xml
index 29bacd6..5569661 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"لا شيء"</item>
     <item msgid="8673874894887358090">"يدويًا"</item>
-    <item msgid="168893341855953140">"تهيئة تلقائية للوكيل"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"إيقاف"</item>
+    <item msgid="3165868966179561687">"تنبيه"</item>
+    <item msgid="6038758039030476855">"اهتزاز"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"لا شيء"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"إيقاف"</item>
     <item msgid="2751513398307949636">"على الشاشة كأشرطة"</item>
-    <item msgid="1851438178120770973">"‏باستخدام adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"على الشاشة كخطوط"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"إيقاف"</item>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 5a65689..67cf3d1 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"وقت تشغيل الشاشة:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"غير معروف"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"شحن"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"جارٍ الشحن بتيار متردد"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"‏جارٍ الشحن عبر USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"جارٍ الشحن لاسلكيًا"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(الشبكات اللاسلكية)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"لا يتم الشحن"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"لا يتم الشحن"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ممتلئة"</string>
@@ -203,7 +203,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_title" msgid="7185282894936042359">"‏عنوان URL لتهيئة PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"‏عنوان URL لتهيئة PAC "</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">"معلومات الخلية:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"الإعدادات"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"اختصار الإعدادات"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"وضع الطائرة"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"‏NFC وغير ذلك الكثير"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"المزيد…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"اللاسلكي والشبكات"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"‏إدارة Wi-Fi والبلوتوث ووضع الطائرة وشبكات الجوّال والشبكات الظاهرية الخاصة (VPN)"</string>
     <string name="roaming" msgid="3596055926335478572">"تجوال البيانات"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"معلومات المالك"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"تمكين الأدوات"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"معطّلة بواسطة المشرف"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"‏إلغاء قفل NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"اكتب النص الذي سيعرض على شاشة التأمين"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"إظهار معلومات المستخدم في شاشة التأمين"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏الكتابة في علامة NFC"</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>
@@ -618,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="2288214226916117159">"أدخل كلمة مرور الشبكة"</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>
@@ -735,10 +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="8480105032417444275">"مستوى السطوع"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"ضبط سطوع الشاشة"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"السطوع المتكيف"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"تحسين مستوى السطوع بحسب الإضاءة المتاحة"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"‏هل تريد تغيير تطبيق الرسائل القصيرة SMS؟"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"‏هل تريد استخدام <xliff:g id="NEW_APP">%1$s</xliff:g> بدلاً من <xliff:g id="CURRENT_APP">%2$s</xliff:g> كتطبيق للرسائل القصيرة SMS؟"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"‏هل تريد استخدام <xliff:g id="NEW_APP">%s</xliff:g> كتطبيق للرسائل القصيرة SMS؟"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"‏مشغل SIM (مشغل شبكة الجوّال) غير معروف"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"‏مشغل SIM غير معروف"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"‏ليس لدى %1$s موقع ويب معروف لإدارة حسابات"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏الرجاء إدخال بطاقة SIM وإعادة التشغيل"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"الرجاء الاتصال بالإنترنت"</string>
@@ -1322,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="7923901846375587241">"اختصار تقرير الأخطاء"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"عرض زر في الإعدادات السريعة لإرفاق تقرير الأخطاء"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"تحديد وقت التشغيل"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"هل تريد إعادة التشغيل لتغيير وقت التشغيل من <xliff:g id="OLD">%1$s</xliff:g> إلى <xliff:g id="NEW">%2$s</xliff:g>؟"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"شهادة عرض شاشة لاسلكي"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"‏تمكين تسجيل WiFi المطوّل"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"عرض خيارات شهادة عرض شاشة لاسلكي"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"‏زيادة مستوى تسجيل Wifi، والعرض لكل SSID RSSI في منتقي WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏هل تريد السماح بتصحيح أخطاء USB؟"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"إشارة شبكة الجوال"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> ص"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> م"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"وقت الوضع النشط للجهاز"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏وقت تشغيل Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏وقت تشغيل Wi-Fi"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"إزالة جميع الشهادات"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"بيانات اعتماد موثوقة"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"‏عرض شهادات CA الموثوقة"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"إعدادات متقدمة"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"نوع وحدة التخزين"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"وحدة تخزين صلبة"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"وحدة تخزين برمجية فقط"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"‏المس "<b>"التالي"</b>" لمتابعة الإعداد.\n\nالمس "<b>"رجوع"</b>" للاتصال بشبكة Wi‑Fi مختلفة."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"تم تمكين المزامنة"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"تم تعطيل المزامنة"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"جارٍ المزامنة"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطأ في المزامنة"</string>
     <string name="sync_failed" msgid="1696499856374109647">"أخفقت المزامنة"</string>
     <string name="sync_active" msgid="8476943765960863040">"المزامنة نشطة"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"التقاط صورة"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"اختيار صورة من المعرض"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"‏إعدادات قفل الشاشة في NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"العلامات المقترنة"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"تم التمكين"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"الإقران مع علامة"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"الإقران الآن"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"ضع العلامة بشكل مستوٍ على منضدة، ثم ضع الهاتف فوقها"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"تم إقران العلامة والهاتف بنجاح، وبذلك تكون المهمة قد اكتملت!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"لا يمكن استخدام العلامة المقدمة لإلغاء قفل الهاتف"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"أخفق الإقران مع العلامة، والرجاء إعادة المحاولة"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"‏لم يتم تمكين تقنية NFC إلا أنه يجب توفرها للإلغاء تأمين NFC. الرجاء تشغيل تقنية NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"‏إعدادات NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"الإعدادات"</string>
     <string name="search_results_title" msgid="1796252422574886932">"الإعدادات"</string>
     <string name="search_menu" msgid="7053532283559077164">"بحث"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏إعداد علامة 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>
@@ -2116,10 +2128,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"مستوى صوت الوسائط"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"مستوى صوت المنبّه"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"مستوى صوت الرنين"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"مستوى صوت الإشعارات"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"الرجاء عدم الإزعاج"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"عند تلقي المكالمات والإشعارات"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"عند وصول إشعارات"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"أصوات أخرى"</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="1340569241625989837">"أصوات قفل الشاشة"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"أصوات الإرساء"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"أصوات اللمس"</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="dock_audio_media_title" msgid="1346838179626123900">"إرساء السماعة قيد التشغيل"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"كل الأصوات"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"صوت الوسائط فقط"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"صامت"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"تنبيه"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"اهتزاز"</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">
@@ -2198,6 +2201,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-bg/arrays.xml
index b50e2c3..b5f6fa3 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Няма"</item>
     <item msgid="8673874894887358090">"Ръчно"</item>
-    <item msgid="168893341855953140">"Прокси: Автоконфигуриране"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Изкл."</item>
+    <item msgid="3165868966179561687">"Сигнал"</item>
+    <item msgid="6038758039030476855">"Вибриране"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Без"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Изкл."</item>
     <item msgid="2751513398307949636">"На екрана като чертички"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"На екрана като линии"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Изключено"</item>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 3336091..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Време с включен екран:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Неизвестно"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарежда се"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Зареждане при AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Зареждане през USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Безжично зареждане"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(безжично)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Не се зарежда"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не се зарежда"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Пълна"</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_title" msgid="7185282894936042359">"URL адрес на PAC файла: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL адрес на PAC файла: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Идентификация на съседно обаждане:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Клетъчна информация:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Пряк път за настройките"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Самолетен режим"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"КБП и още много други неща"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Още…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Кабелни и безжични мрежи"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Управлява Wi‑Fi, Bluetooth, самолетен режим, мобилни и VPN мрежи"</string>
     <string name="roaming" msgid="3596055926335478572">"Роуминг на данни"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Инф. за собственика"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Приспособления: Акт."</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Деактивирано от администратора"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Отключване при КБП"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Въведете текст за показване на заключения екран"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Информация за потребителя върху заключен екран"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Шифроване на таблета"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Шифроване на телефона"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Шифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Можете да шифровате своите профили, настройки, изтеглени приложения и техните данни, мултимедия и други файлове. След това, ако сте настроили заключване на екрана (тоест фигура, цифров ПИН код или парола), ще се наложи при всяко включване на таблета си да го отключвате, за да го дешифрирате. Единственият друг начин за дешифриране е възстановяване на фабричните настройки, при което ще се изтрият всичките ви данни.\n\nШифроването отнема час или повече. Трябва да стартирате със заредена батерия и да оставите таблета си включен в захранването по време на процедурата. Ако я прекъснете, ще изгубите някои или всичките си данни."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Можете да шифровате своите профили, настройки, изтеглени приложения и техните данни, мултимедия и други файлове. След това, ако сте настроили заключване на екрана (тоест фигура, цифров ПИН код или парола), ще се наложи при всяко включване на телефона си да го отключвате, за да го дешифрирате. Единственият друг начин за дешифриране е възстановяване на фабричните настройки, при което ще се изтрият всичките ви данни.\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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Записване в маркера за КБП"</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>
@@ -618,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="2288214226916117159">"Въведете паролата за мрежата"</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>
@@ -735,10 +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="8480105032417444275">"Ниво на яркостта"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Наглася яркостта на екрана"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивна яркост"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизиране на нивото на яркостта спрямо наличната светлина"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Да се промени ли приложението за SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Да се използва ли <xliff:g id="NEW_APP">%1$s</xliff:g> вместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> като приложение за SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Да се използва ли <xliff:g id="NEW_APP">%s</xliff:g> като приложение за SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Неизвестен SIM оператор"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Неизвестен SIM оператор"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Няма известен администриращ уебсайт за %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Моля, поставете SIM карта и рестартирайте"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Моля, свържете се с интернет"</string>
@@ -1322,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="7923901846375587241">"Пряк път за подаване на сигнал за програмна грешка"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"В „Бързи настройки“ се показва бутон за подаване на сигнал за програмна грешка"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Избор на изпълним модул"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Да се рестартира ли за промяна на изпълнимия модул от „<xliff:g id="OLD">%1$s</xliff:g>“ на „<xliff:g id="NEW">%2$s</xliff:g>“?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифициране на безжичния дисплей"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"„Многословно“ регистр. на WiFi: Активир."</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показване на опциите за сертифициране на безжичния дисплей"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"По-подробно регистр. на WiFi – данни за RSSI на SSID в инстр. за избор на WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешаване на отстраняването на грешки през USB?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Сигнал на мобилна мрежа"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>.<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Активно време на устройство"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Време на включен Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Време на включен Wi‑Fi"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Премахване на всички сертификати"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надеждни идент. данни"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показване на надеждни сертификати от сертифициращи органи"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Разширени"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Тип на хранилището"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"С хардуерна поддръжка"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтуерно"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Докоснете "<b>"Напред"</b>", за да продължите с настройката.\n\nДокоснете "<b>"Назад"</b>", за да се свържете с друга Wi‑Fi мрежа."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизирането е активирано"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизирането е деактивирано"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Синхронизира се сега"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизирането."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Синхронизирането не бе успешно"</string>
     <string name="sync_active" msgid="8476943765960863040">"Синхронизирането е активно"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Въведете ПИН кода си, за да дешифрирате хранилището"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Начертайте фигурата си, за да дешифрирате хранилището"</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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Правене на снимка"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Избор на снимка от галерията"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Настройки за заключване на екрана при КБП"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Сдвоени маркери за КБП"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Активиранo"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Сдвояване с маркер"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Сдвояване сега"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Сложете маркера за КБП хоризонтално върху маса и поставете отгоре телефона"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Маркерът за КБП и телефонът са сдвоени успешно. Готови сте!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Предоставеният маркер за КБП не може да се използва за отключване на телефона ви"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Сдвояването с маркера ви за КБП не бе успешно. Моля, опитайте отново"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"КБП не е активирана, а това се изисква за отключването й. Моля, включете я."</string>
+    <string name="ok" msgid="3651563352754792958">"Настройки за КБП"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Настройки"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
     <string name="search_menu" msgid="7053532283559077164">"Търсене"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Маркер за КБП за 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>
@@ -2112,43 +2132,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"Сила на звука при известие"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"При получаване на обаждания и известия"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"При получаване на известия"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Стандартна мелодия за известията"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Да вибрира при звънене"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Показване на известията"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Пулсиране на светлината за известия"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Когато устройството е заключено"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Други звуци"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Тонове на клавиатурата за набиране"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Звуци за заключване на екрана"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Звуци за докинг станция"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Звуци при докосване"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Вибриране при докосване"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Док. станц.: Пуск. на високог."</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Цялото аудио"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Само мултимедийното аудио"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Тих режим"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Сигнал"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибриране"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Достъп до известията"</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>
@@ -2168,18 +2200,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-ca/arrays.xml
index 2ada81e..c921d1b 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Cap"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Conf. autom. serv. inter."</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Desactivat"</item>
+    <item msgid="3165868966179561687">"Alerta"</item>
+    <item msgid="6038758039030476855">"Vibració"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Cap"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Desactivat"</item>
     <item msgid="2751513398307949636">"A la pantalla com a barres"</item>
-    <item msgid="1851438178120770973">"A adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"A la pantalla com a línies"</item>
+    <item msgid="120512413928262547">"A adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Desactiva"</item>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index b438a6b..45daae7 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Hora d\'activació de la pantalla:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconegut"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"S\'està carregant"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Càrrega: corr. alt."</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Càrrega per USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Càrrega sense fils"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sense fil)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"No s\'està carregant"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No s\'està carregant"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plena"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El camp del port ha de ser buit si el camp de l\'amfitrió és buit."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El port que has escrit no és vàlid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utilitza un servidor intermediari HTTP, però pot ser que la resta d\'aplicacions no."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL de PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicació:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID veí:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informació mòbil:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuració"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Drecera de configuració"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode d\'avió"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC i més"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Més..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Connexions sense fil i xarxes"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Gestiona la Wi-Fi, el Bluetooth, el mode d\'avió, les xarxes mòbils i les VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerància de dades"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informació de propietari"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activa els widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Opció desactivada per l\'administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueig de NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Escriu el text que vulguis mostrar a la pantalla de bloqueig"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostra info. de l\'usuari a la pantalla de bloqueig"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escriu a l\'etiqueta de NFC"</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>
@@ -618,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="2288214226916117159">"Introdueix 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>
@@ -735,10 +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="8480105032417444275">"Nivell de brillantor"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajusta la brillantor de la pantalla"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Brillantor adaptable"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimitza el nivell de brillantor per adaptar-lo a la llum disponible."</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vols canviar l\'aplicació per a SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vols fer servir <xliff:g id="NEW_APP">%1$s</xliff:g> en lloc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> com a aplicació per als SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vols fer servir <xliff:g id="NEW_APP">%s</xliff:g> com a aplicació per als SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operador de SIM desconegut"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconegut"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no té cap lloc web d\'administració conegut"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insereix la targeta SIM i reinicia"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connecta a Internet"</string>
@@ -1322,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="7923901846375587241">"Drecera per als informes d\'errors"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Mostra un botó a la configuració ràpida per crear un informe d\'errors."</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecciona temps d\'execució"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vols tornar a iniciar per canviar el temps d\'execució de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificació de pantalla sense fil"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Activa el registre detallat de la Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra les opcions de certificació de pantalla sense fil"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Augmenta nivell de registre de Wi-Fi; mostra l\'RSSI per SSID al selector Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicacions simulades"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Senyal de xarxa mòbil"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a.m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p.m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Temps d\'activació del dispositiu"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a temps"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Esborra tots els certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiança"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avançada"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipus d\'emmagatzematge"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Emmagatzemat en maquinari"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Només programari"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Següent"</b>" per continuar amb la configuració.\n\nToca "<b>"Enrere"</b>" per connectar a una altra xarxa Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronització activada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronització desactivada"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"S\'està sincronitzant ara."</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronització"</string>
     <string name="sync_failed" msgid="1696499856374109647">"La sincronització ha fallat"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sincronització activa"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Fes una foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Selecciona una foto de la galeria"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Configuració de bloqueig de pantalla de NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetes emparellades"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Activat"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Emparella amb una etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Emparella ara"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Posa l\'etiqueta plana en una taula i col·loca el telèfon a sobre."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"L\'etiqueta i el telèfon s\'han emparellat correctament. Llestos."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"L\'etiqueta que has proporcionat no es pot utilitzar per desbloquejar el telèfon."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"S\'ha produït un error en emparellar l\'etiqueta. Torna-ho a provar."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"L\'NFC no està activada i és necessària per desbloquejar la pantalla mitjançant NFC. Activa-la."</string>
+    <string name="ok" msgid="3651563352754792958">"Configuració de NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuració"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuració"</string>
     <string name="search_menu" msgid="7053532283559077164">"Cerca"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura l\'etiqueta de 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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Volum de notificació"</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_title_novoice" msgid="4628028304587795604">"Quan arribin les notificacions"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Altres sons"</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="1340569241625989837">"Sons de bloqueig de pantalla"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sons de la base"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Sons en tocar"</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="dock_audio_media_title" msgid="1346838179626123900">"Sons de la base d\'altaveu"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tot l\'àudio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Només àudio fitxers multimèdia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silenci"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibració"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Desactivat"</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/arrays.xml b/res/values-cs/arrays.xml
index b089f82..2f5377d 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Žádné"</item>
     <item msgid="8673874894887358090">"Ručně"</item>
-    <item msgid="168893341855953140">"Autom. konfigurace proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Vypnuto"</item>
+    <item msgid="3165868966179561687">"Výstraha"</item>
+    <item msgid="6038758039030476855">"Vibrace"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Žádné"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Vypnuto"</item>
     <item msgid="2751513398307949636">"Na obrazovce ve formě sloupců"</item>
-    <item msgid="1851438178120770973">"adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Na obrazovce ve formě řádků"</item>
+    <item msgid="120512413928262547">"V adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Vypnuto"</item>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index ea3b39e..4a6f1d3 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Doba zapnutí obrazovky:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Neznámé"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Nabíjí se"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Nabíjení z adaptéru"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Nabíjení přes USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Bezdrátové nabíjení"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezdrátové připojení)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenabíjí se"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíjí se"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plná"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pokud je pole hostitel prázdné, musí být prázdné i pole port."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Zadaný port není platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Server proxy protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"Adresa URL PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Adresa URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Místo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sousední identifikátor CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavení"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Zástupce nastavení"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Režim V letadle"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC a další"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Další..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrátová připojení a sítě"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Spravovat Wi-Fi, Bluetooth, režim V letadle, mobilní sítě a sítě VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Datový roaming"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informace o vlastníkovi"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktivovat widgety"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Zakázáno administrátorem"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Odemknutí NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Zadejte text, který se zobrazí na zamčené obrazovce"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Zobrazovat uživatele na uzamčené obrazovce"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zápis na štítek NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Úroveň jasu"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Nastavení jasu displeje"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptivní jas"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalizovat úroveň jasu podle okolního světla"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Chcete změnit aplikaci SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%1$s</xliff:g> místo aplikace <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Chcete pro zprávy SMS používat aplikaci <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operátor SIM karty není znám"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznámý operátor SIM karty"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nemá žádný známý web pro správu účtů."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte SIM kartu a restartujte zařízení."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Připojte se prosím k internetu."</string>
@@ -1322,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="7923901846375587241">"Zástupce hlášení chyb"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Umožňuje zobrazit v Rychlém nastavení tlačítko k nahlášení chyby."</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výběr modulu runtime"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Chcete provést restart a změnit modul runtime z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikace bezdrátového displeje"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Zapnout podrobné protokolování Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Zobrazit možnosti certifikace bezdrátového displeje"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Zvýšit úroveň protokolování Wi-Fi, zobrazit ve výběru Wi-Fi RSSI pro SSID"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povolit ladění USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signál mobilní sítě"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Doba provozu zařízení"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Doba provozu Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Doba provozu modulu Wi-Fi"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstranit všechny certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Důvěryhodná pověření"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobrazit důvěryhodné certifikáty CA"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Pokročilé"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Typ úložiště"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarové"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Pouze software"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Chcete-li pokračovat v nastavení, klepněte na "<b>"Další"</b>".\n\nChcete-li se připojit k jiné síti Wi-Fi, klepněte na "<b>"Zpět"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizace zapnuta"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizace deaktivována"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Probíhá synchronizace..."</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizace."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Synchronizace se nezdařila"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synchronizace je aktivní"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Vyfotit"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrat fotografii z Galerie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Nastavení zámku obrazovky NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Spárované štítky"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Zapnuto"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Spárovat se štítkem"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Spárovat"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Položte štítek na stůl a navrch umístěte telefon."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Štítek a telefon byly úspěšně spárovány. Hotovo!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Pomocí poskytnutého štítku telefon nelze odemknout."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Spárování štítku se nezdařilo, zkuste to prosím znovu."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Funkce NFC není zapnutá a odemknutí pomocí NFC ji vyžaduje. Zapněte prosím funkci NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Nastavení NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavení"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavení"</string>
     <string name="search_menu" msgid="7053532283559077164">"Vyhledávání"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavení štítku NFC pro 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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Hlasitost oznámení"</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_title_novoice" msgid="4628028304587795604">"Při příchozím 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Ostatní zvuky"</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="1340569241625989837">"Zvuky zámku obrazovky"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Zvuky při vložení do doku"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Zvuky při dotyku"</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="dock_audio_media_title" msgid="1346838179626123900">"Zvuk reproduktoru doku"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Veškerý zvuk"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Pouze mediální soubory"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tichý režim"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozornění"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrace"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Zapnuto"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Vypnuto"</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/arrays.xml b/res/values-da/arrays.xml
index 9f70e6e..27ed10f 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ingen"</item>
     <item msgid="8673874894887358090">"Manuel"</item>
-    <item msgid="168893341855953140">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Fra"</item>
+    <item msgid="3165868966179561687">"Underretning"</item>
+    <item msgid="6038758039030476855">"Vibration"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ingen"</item>
@@ -239,7 +243,7 @@
     <item msgid="5387405117297558954">"vibrer"</item>
     <item msgid="3434165993711230924">"læs kontaktpersoner"</item>
     <item msgid="616161687718081936">"rediger kontaktpersoner"</item>
-    <item msgid="7638002295329050091">"læse opkaldsliste"</item>
+    <item msgid="7638002295329050091">"læs opkaldsliste"</item>
     <item msgid="6546959730920410907">"rediger opkaldslisten"</item>
     <item msgid="446877710771379667">"læs kalenderen"</item>
     <item msgid="7674458294386319722">"rediger kalenderen"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Fra"</item>
     <item msgid="2751513398307949636">"På skærmen som søjler"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"På skærmen som linier"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Fra"</item>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index fc92ae6..cc57070 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Tid for skærm TIL:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Ukendt"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Oplader"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Opladning med AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Opladning via USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Trådløs opladning"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådløs)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Oplader ikke"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Oplader ikke"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Fuld"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Den indtastede port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"Webadresse til PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Webadresse til PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Placering:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mobiloplysninger:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Indstillinger"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Genvej til Indstillinger"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flytilstand"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC m.m."</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mere..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådløs og netværk"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Administrer Wi-Fi, Bluetooth, flytilstand, mobilnetværk og VPN-netværk"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Tekst fra ejer"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktivér widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Deaktiveret af administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Lås NFC op"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Indtast den tekst, der skal vises på låseskærmen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Vis brugeroplysninger ved låst skærm"</string>
@@ -332,8 +333,8 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Krypteret"</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 har krypteret din tablet, skal du låse skærmen op for at dekryptere den, hver gang du tænder for den, forudsat at du har oprettet en skærmlås (dvs. et mønster eller en numerisk pinkode eller adgangskode). Den eneste anden måde at dekryptere på er ved at udføre en gendannelse af fabriksdata, som sletter alle dine data.\n\nKrypteringen 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 har krypteret din telefon, skal du låse skærmen op for at dekryptere den, hver gang du tænder for den, forudsat at du har oprettet en skærmlås (dvs. et mønster eller en numerisk pinkode eller adgangskode). Den eneste anden måde at dekryptere på er ved at udføre en gendannelse af fabriksdata, som sletter alle dine data.\n\nKrypteringen 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_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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skriv til NFC-tag"</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>
@@ -618,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="2288214226916117159">"Indtast adgangskoden til dit netværk"</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>
@@ -735,10 +738,13 @@
     <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="8480105032417444275">"Lysstyrkeniveau"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Juster skærmens lysstyrke"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Tilpasset lysstyrke"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimer lysstyrkeniveau for tilgængeligt lys"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vil du skifte sms-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vil du bruge <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> som din standardapp til sms?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vil du bruge <xliff:g id="NEW_APP">%s</xliff:g> som din sms-app?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"SIM fra ukendt mobilselskab"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM-kortudbyderen er ukendt"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har intet kendt website til provisionering"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Indsæt SIM-kort, og genstart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Opret forbindelse til internettet"</string>
@@ -1322,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="7923901846375587241">"Genvej til fejlrapporting"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Vis en knap i Hurtige indstillinger til fejlrapportering"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Vælg kørsel"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Genstart for at skifte kørsel fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering af trådløs skærm"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktivér detaljeret logføring via Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis valgmuligheder for certificering af trådløs skærm"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Øg logføringsniveau via Wi-Fi, vis pr. SSID RSSI i Wi-Fi Picker"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vil du tillade USB-fejlretning?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilnetværkets signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Enhedens opvågningstid"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi til tiden"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi til tiden"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle certifikater"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Betroede loginoplysninger"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis betroede CA-certifikater"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avanceret"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Lagertype"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarebaseret"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Kun software"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryk på "<b>"Næste"</b>" for at fortsætte med konfigurationen.\n\n Tryk på "<b>"Tilbage"</b>" for at oprette forbindelse til et andet Wi-Fi-netværk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiveret"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync deaktiveret"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkroniserer nu"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfejl."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Synkroniseringen mislykkedes"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synkronisering er aktiveret"</string>
@@ -1808,8 +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 gemte data"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Tegn dit mønster for at dekryptere gemte data"</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>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Tag billede"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Vælg billede fra Galleri"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Låseindstillinger for NFC-skærm"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Parrede tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktiveret"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Par med et tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Par nu"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Sæt tagget fladt på et bord, og placer telefonen ovenpå"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tagget og telefonen blev parret. Du er færdig."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Det angivne tag kan ikke bruges til at låse telefonen op med"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Det lykkedes ikke at parre med dit tag. Prøv igen."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC er ikke aktiveret og er nødvendig for NFC-oplåsning. Slå NFC til."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-indstillinger"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Indstillinger"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Indstillinger"</string>
     <string name="search_menu" msgid="7053532283559077164">"Søgning"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Lydstyrke for underretninger"</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_title_novoice" msgid="4628028304587795604">"Når underretninger modtages"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Andre lyde"</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="1340569241625989837">"Lyde for skærmlås"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Lyde for dockingstation"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Lyd ved berøring"</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="dock_audio_media_title" msgid="1346838179626123900">"Dockhøjttaler afspiller"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Al lyd"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Kun medielyd"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Lydløs"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Advarsel"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Til"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Fra"</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/arrays.xml b/res/values-de/arrays.xml
index 1863ab4..518f525 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Keiner"</item>
     <item msgid="8673874894887358090">"Manuell"</item>
-    <item msgid="168893341855953140">"Autom. Proxy-Konfig."</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Aus"</item>
+    <item msgid="3165868966179561687">"Benachrichtigung"</item>
+    <item msgid="6038758039030476855">"Vibration"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Keine"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Aus"</item>
     <item msgid="2751513398307949636">"Auf Bildschirm als Balken"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Auf Bildschirm als Linien"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Aus"</item>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 78f1366..883a81e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Display eingeschaltet:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Unbekannt"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Wird aufgeladen"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Laden über Netzteil"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Laden über USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Kabelloses Laden"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(drahtlos)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Wird nicht geladen"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wird nicht geladen"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Voll"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Der eingegebene Port ist ungültig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, möglicherweise aber nicht von anderen Apps."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC-URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC-URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Standort:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Benachbarte CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Netz-Info:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Einstellungen"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Einstellungsverknüpfung"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flugmodus"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC &amp; mehr"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mehr..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Drahtlos &amp; Netzwerke"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"WLAN, Bluetooth, Flugmodus, Mobilfunknetze und VPNs verwalten"</string>
     <string name="roaming" msgid="3596055926335478572">"Daten-Roaming"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info zum Eigentümer"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Widgets aktivieren"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Vom Administrator deaktiviert"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-Entsperrung"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Text für Sperrbildschirm eingeben"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Nutzerinformationen bei Bildschirmsperre anzeigen"</string>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"In NFC-Tag schreiben"</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>
@@ -619,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="2288214226916117159">"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>
@@ -736,10 +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="8480105032417444275">"Helligkeitsstufe"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Helligkeit des Bildschirms anpassen"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive Helligkeit"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Helligkeitsstufe an Lichtverhältnisse 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>
@@ -991,7 +997,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS-App wechseln?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g> statt <xliff:g id="CURRENT_APP">%2$s</xliff:g> als SMS-App verwenden?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g> als SMS-App verwenden?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Unbekannter SIM-Anbieter"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Unbekannter SIM-Anbieter"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Keine Bereitstellungs-Website für %1$s bekannt"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Legen Sie die SIM ein und starten das Gerät neu."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Bitte stellen Sie eine Verbindung zum Internet her."</string>
@@ -1323,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="7923901846375587241">"Verknüpfung zu Fehlerbericht"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Schaltfläche für die Erstellung eines Fehlerberichts in den Schnelleinstellungen anzeigen"</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>
@@ -1333,9 +1341,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Laufzeit festlegen"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Neu starten, um Laufzeit von <xliff:g id="OLD">%1$s</xliff:g> zu <xliff:g id="NEW">%2$s</xliff:g> zu ändern?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kabellose Übertragung"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Ausführliche WLAN-Protokolle aktivieren"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Optionen zur Zertifizierung für kabellose Übertragung anzeigen"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Level für WLAN-Protokollierung erhöhen, in WiFi Picker pro SSID-RSSI anzeigen"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Simulierte Standorte"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Simulierte Standorte zulassen"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
@@ -1493,11 +1499,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilfunknetzsignal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Aktivzeit des Geräts"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WLAN-Aktivzeit"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN-Aktivzeit"</string>
@@ -1678,7 +1679,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle Zertifikate entfernen"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertrauenswürdige Anmeldedaten"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrauenswürdige CA-Zertifikate ansehen"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Erweitert"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Speichertyp"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-gestützt"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Nur Software"</string>
@@ -1762,7 +1762,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Berühren Sie "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren.\n\nTippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisierung aktiviert"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisierung deaktiviert"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronisierung läuft"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisierungsfehler"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Fehler bei der Synchronisierung"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synchronisierung aktiv"</string>
@@ -2098,6 +2097,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Foto aufnehmen"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Foto aus Galerie auswählen"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Einstellungen für NFC-Displaysperre"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Pairing-Tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktiviert"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Pairing mit einem Tag durchführen"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Pairing jetzt durchführen"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Legen Sie das Tag flach auf einen Tisch und platzieren Sie das Telefon darüber."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Pairing von Tag und Telefon abgeschlossen"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Mit dem bereitgestellten Tag kann Ihr Telefon nicht entsperrt werden."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Das Pairing mit Ihrem Tag konnte nicht durchgeführt werden. Bitte versuchen Sie es erneut."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC ist nicht aktiviert, aber für die NFC-Entsperrung erforderlich. Bitte aktivieren Sie NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-Einstellungen"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Einstellungen"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Einstellungen"</string>
     <string name="search_menu" msgid="7053532283559077164">"Suchen"</string>
@@ -2105,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2117,10 +2129,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Benachrichtigungslautstä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_title_novoice" msgid="4628028304587795604">"Bei Benachrichtigungseingang"</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>
@@ -2137,18 +2147,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Andere Töne"</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="1340569241625989837">"Töne für die Displaysperre"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Docking-Sounds"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Töne bei Berührung"</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="dock_audio_media_title" msgid="1346838179626123900">"Dock-Lautsprecherwiedergabe"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Alle Audioquellen"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Nur Audiosysteme von Medien"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Lautlos"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Warnung"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</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">
@@ -2199,6 +2202,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"An"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Aus"</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/arrays.xml b/res/values-el/arrays.xml
index 16d2f21..32ed686 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Κανένας"</item>
     <item msgid="8673874894887358090">"Μη αυτόματες"</item>
-    <item msgid="168893341855953140">"Αυτ. διαμ.διακομ.μεσολ."</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Απενεργοποιημένο"</item>
+    <item msgid="3165868966179561687">"Προειδοποίηση"</item>
+    <item msgid="6038758039030476855">"Δόνηση"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Κανένας"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Απενεργοποιημένο"</item>
     <item msgid="2751513398307949636">"Στην οθόνη ως ράβδοι"</item>
-    <item msgid="1851438178120770973">"Σε adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Στην οθόνη ως γραμμές"</item>
+    <item msgid="120512413928262547">"Σε adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Ανενεργές"</item>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 7038862..d98f940 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Χρόνος οθόνης ενεργοποιημένος:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Άγνωστο"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Φόρτιση"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Φόρτιση με AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Φόρτιση μέσω USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Ασύρματη φόρτιση"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ασύρματο)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Δεν φορτίζει"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Δεν φορτίζει"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Πλήρης"</string>
@@ -203,7 +203,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">"Ο διακομιστής μεσολάβησης ΗΤΤΡ χρησιμοποιείται απο το πρόγραμμα περιήγησης, αλλά δεν πρέπει να χρησιμοποιείται από άλλες εφαρμογές."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"Διεύθυνση URL PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Διεύθυνση URL PAC: "</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">"Πληροφορίες κελιού:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ρυθμίσεις"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Συντόμευση ρυθμίσεων"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Λειτουργία πτήσης"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"ΕΚΠ και ακόμα περισσότερα"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Περισσότερα ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Ασύρματο και δίκτυα"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Διαχείριση Wi-Fi, Bluetooth, λειτουργίας πτήσης, δίκτυα κινητής τηλεφωνίας και VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Περιαγωγή δεδομένων"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Στοιχεία κατόχου"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ενεργ.γραφ.στοιχείων"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Απενεργοποιήθηκε από το διαχειριστή"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Ξεκλείδωμα ΕΚΠ"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Εισάγετε κείμενο για εμφάνιση σε οθόνη κλειδώματος"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Εμφάνιση πληροφοριών χρήστη στην οθόνη κλειδώματος"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Εγγραφή στην ετικέτα ΕΚΠ"</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>
@@ -618,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="2288214226916117159">"Εισαγάγετε κωδικό πρόσβασης δικτύου"</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>
@@ -735,10 +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="8480105032417444275">"Επίπεδο φωτεινότητας"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ρύθμιση της φωτεινότητας της οθόνης"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Προσαρμοστική φωτεινότητα"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Βελτιστοποίηση του επιπέδου φωτεινότητας για το διαθέσιμο φως"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Αλλαγή εφαρμογής SMS;"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Χρήση του <xliff:g id="NEW_APP">%1$s</xliff:g> αντί του <xliff:g id="CURRENT_APP">%2$s</xliff:g> ως εφαρμογή SMS;"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Χρήση του <xliff:g id="NEW_APP">%s</xliff:g> ως εφαρμογή SMS;"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Κάρτα SIM άγνωστης εταιρείας κινητής τηλεφωνίας"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Άγνωστος τελεστής SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s δεν διαθέτει γνωστό ιστότοπο παροχής"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Εισαγάγετε την κάρτα SIM και κάντε επανεκκίνηση"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Συνδεθείτε στο διαδίκτυο"</string>
@@ -1322,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="7923901846375587241">"Συντόμευση αναφοράς σφαλμάτων"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Εμφάνιση κουμπιού \"Γρήγορες ρυθμίσεις\" για τη λήψη αναφοράς σφαλμάτων"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Επιλογή χρόνου εκτέλεσης"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Να γίνει επανεκκίνηση για την αλλαγή του χρόνου εκτέλεσης από <xliff:g id="OLD">%1$s</xliff:g> σε <xliff:g id="NEW">%2$s</xliff:g>;"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Πιστοποίηση ασύρματης οθόνης"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Ενεργοπ. λεπτομερούς καταγραφής Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Εμφάνιση επιλογών για πιστοποίηση ασύρματης οθόνης"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Αυξήστε το επίπεδο καταγραφής Wi-Fi, ως SSID RSSI στο εργαλείο επιλογής Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Να επιτρέπεται ο εντοπισμός σφαλμάτων USB;"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Σήμα δικτύου κιν. τηλεφ."</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> π.μ."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> μ.μ."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Χρόνος ενεργοποίησης της συσκευής"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi στην ώρα του"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi στην ώρα του"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Κατάργηση όλων των πιστοποιητικών"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Αξιόπιστα διαπιστευτήρια"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Προβολή αξιόπιστων πιστοποιητικών CA"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Για προχωρημένους"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Τύπος αποθήκευσης"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Με υποστήριξη εξοπλισμού"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Μόνο λογισμικό"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Αγγίξτε το στοιχείο "<b>"Επόμενο"</b>" για να συνεχίσετε την εγκατάσταση.\n\nΑγγίξτε το στοιχείο "<b>"Πίσω"</b>"για να συνδεθείτε σε διαφορετικό δίκτυο Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Ενεργοποιημένος συγχρονισμός"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Συγχρονισμός είναι απενεργοποιημένος"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Συγχρονισμός τώρα"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Σφάλμα συγχρονισμού."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Ο συγχρονισμός απέτυχε"</string>
     <string name="sync_active" msgid="8476943765960863040">"Ενεργοποίηση συγχρονισμού"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Λήψη φωτογραφίας"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Επιλογή φωτογραφιών από τη Συλλογή"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Ρυθμίσεις κλειδώματος οθόνης ΕΚΠ"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Συζευγμένα τσιπ"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Ενεργοποιημένο"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Συζευγμένο με ετικέτα"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Σύζευξη τώρα"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Τοποθετήστε το τσιπ επίπεδα στο τραπέζι και τοποθετήστε το τηλέφωνο από πάνω"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Έγινε επιτυχής σύζευξη τσιπ και τηλεφώνου. Είστε έτοιμοι!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Το τσιπ που παρέχεται δεν μπορεί να χρησιμοποιηθεί για το ξεκλείδωμα του τηλεφώνου σας"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Η σύζευξη με το τσιπ σας απέτυχε. Δοκιμάστε ξανά"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Το ΕΚΠ δεν είναι ενεργοποιημένο και απαιτείται για το ξεκλείδωμα του ΕΚΠ. Ενεργοποιήστε το ΕΚΠ."</string>
+    <string name="ok" msgid="3651563352754792958">"Ρυθμίσεις ΕΚΠ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ρυθμίσεις"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ρυθμίσεις"</string>
     <string name="search_menu" msgid="7053532283559077164">"Αναζήτηση"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ρύθμιση ετικέτας ΕΚΠ 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>
@@ -2116,10 +2128,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"Ένταση ήχου πολυμέσων"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Ένταση ήχου ξυπνητηριού"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Ένταση ήχου κλήσης"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Ένταση ήχου ειδοποίησης"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"Μην ενοχλείτε"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"Κατά τη λήψη κλήσεων και ειδοποιήσεων"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Κατά την άφιξη ειδοποιήσεων"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Άλλοι ήχοι"</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="1340569241625989837">"Ήχοι κλειδώματος οθόνης"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Ήχοι σύνδεσης"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Ήχοι αφής"</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="dock_audio_media_title" msgid="1346838179626123900">"Αναπαραγωγή σύνδεσης ηχείου"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Όλοι οι ήχοι"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Μόνο ο ήχος μέσων"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Σίγαση"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Προειδοποίηση"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Δόνηση"</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">
@@ -2198,6 +2201,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-en-rGB/arrays.xml
index e2a9dc1..4359622 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"None"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Off"</item>
+    <item msgid="3165868966179561687">"Alert"</item>
+    <item msgid="6038758039030476855">"Vibrate"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"None"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Off"</item>
     <item msgid="2751513398307949636">"On screen as bars"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"On screen as lines"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Off"</item>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c4b7c3b..adf0cca 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Screen ON time:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Unknown"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Charging on AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Charging over USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Charging wirelessly"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Not charging"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC &amp; more"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"More…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; networks"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Owner info"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Disabled by administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC unlock"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Type text to display on the lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Show user info on lock screen"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Write to NFC tag"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Brightness level"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise brightness level for available light"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your SMS app?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Unknown SIM operator"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Unknown SIM operator"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s has no known provisioning website"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
@@ -1322,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="7923901846375587241">"Bug report shortcut"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Show a button in Quick Settings 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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select runtime"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reboot to change runtime from <xliff:g id="OLD">%1$s</xliff:g> to <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Enable Wi-Fi Verbose Logging"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Increase Wi-Fi logging level, show per SSID RSSI in Wi-Fi Picker"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobile network signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a.m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p.m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA certificates"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Advanced"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Storage type"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Software only"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Touch "<b>"Next"</b>" to continue with setup.\n\nTouch "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Syncing now"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sync failed"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sync active"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Take photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Choose photo from Gallery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC Screen Lock Settings"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Paired Tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Enabled"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Pair with a tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Pair now"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Put the tag flat on a table and place the phone on top"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tag and phone successfully paired, you\'ve finished!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"The tag provided cannot be used to unlock your phone"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"The pairing with your tag failed, please try again"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC is not enabled and is required for NFC Unlock. Please turn on NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC Settings"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Settings"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
     <string name="search_menu" msgid="7053532283559077164">"Search"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Notification 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_title_novoice" msgid="4628028304587795604">"When 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Other sounds"</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="1340569241625989837">"Screen locking sounds"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Docking sounds"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Touch sounds"</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="dock_audio_media_title" msgid="1346838179626123900">"Dock speaker plays"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Media audio only"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silent"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Off"</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/arrays.xml b/res/values-en-rIN/arrays.xml
index e2a9dc1..4359622 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"None"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Proxy Auto-Config"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Off"</item>
+    <item msgid="3165868966179561687">"Alert"</item>
+    <item msgid="6038758039030476855">"Vibrate"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"None"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Off"</item>
     <item msgid="2751513398307949636">"On screen as bars"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"On screen as lines"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Off"</item>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c4b7c3b..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Screen ON time:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Unknown"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Charging"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Charging on AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Charging over USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Charging wirelessly"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Not charging"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Not charging"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"The port that you typed is not valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Settings"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Settings shortcut"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Aeroplane mode"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC &amp; more"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"More…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; networks"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Manage Wi‑Fi, Bluetooth, aeroplane mode, mobile networks, &amp; VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Data roaming"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Owner info"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Enable widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Disabled by administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC unlock"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Type text to display on the lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Show user info on lock screen"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Encrypted"</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>
+    <!-- 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Write to NFC tag"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Brightness level"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Adjust the brightness of the screen"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise brightness level for available light"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Change SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Use <xliff:g id="NEW_APP">%1$s</xliff:g> instead of <xliff:g id="CURRENT_APP">%2$s</xliff:g> as your SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Use <xliff:g id="NEW_APP">%s</xliff:g> as your SMS app?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Unknown SIM operator"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Unknown SIM operator"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s has no known provisioning website"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Please insert SIM card and restart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Please connect to the internet"</string>
@@ -1322,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="7923901846375587241">"Bug report shortcut"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Show a button in Quick Settings 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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select runtime"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reboot to change runtime from <xliff:g id="OLD">%1$s</xliff:g> to <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Enable Wi-Fi Verbose Logging"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Increase Wi-Fi logging level, show per SSID RSSI in Wi-Fi Picker"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobile network signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a.m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p.m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Device awake time"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi on time"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi on time"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA certificates"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Advanced"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Storage type"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Software only"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Touch "<b>"Next"</b>" to continue with setup.\n\nTouch "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Syncing now"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sync failed"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sync active"</string>
@@ -1808,8 +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>
-    <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>
+    <!-- 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>
@@ -2062,7 +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>
-    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Favour foreground app"</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>
@@ -2097,6 +2105,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Take photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Choose photo from Gallery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC Screen Lock Settings"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Paired Tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Enabled"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Pair with a tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Pair now"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Put the tag flat on a table and place the phone on top"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tag and phone successfully paired, you\'ve finished!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"The tag provided cannot be used to unlock your phone"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"The pairing with your tag failed, please try again"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC is not enabled and is required for NFC Unlock. Please turn on NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC Settings"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Settings"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Settings"</string>
     <string name="search_menu" msgid="7053532283559077164">"Search"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2112,43 +2133,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"Notification volume"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"When calls and notifications arrive"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"When 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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Default notification ringtone"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrate when ringing"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Showing notifications"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse notification light"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"When device is locked"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Screen locking sounds"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Docking sounds"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Touch sounds"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrate on touch"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Dock speaker plays"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Media audio only"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silent"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrate"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Notification access"</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>
@@ -2168,18 +2201,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2237,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"On"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Off"</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/arrays.xml b/res/values-es-rUS/arrays.xml
index 4ca0597..b316145 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ninguno"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Config. automática proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Desactivado"</item>
+    <item msgid="3165868966179561687">"Alerta"</item>
+    <item msgid="6038758039030476855">"Vibrar"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ninguno"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Desactivado"</item>
     <item msgid="2751513398307949636">"En pantalla como barras"</item>
-    <item msgid="1851438178120770973">"En adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"En pantalla como líneas"</item>
+    <item msgid="120512413928262547">"En adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Desactivado"</item>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3a1001d..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Hora de Activado de la pantalla:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconocido"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Carga en CA"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Carga con USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Carga inalámbrica"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(conexiones inalámbricas)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando."</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se realiza la carga"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Cargado"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo del puerto debe estar vacío si el campo de servidor está vacío."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El puerto que has escrito no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador usa el proxy HTTP pero tal vez las demás aplicaciones no lo usen."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL config. autom. proxy: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de configuración automática de proxy: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID cercano:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configuración"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Configuración"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"Más..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Conexiones inalámbricas y redes"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Administrar Wi-Fi, Bluetooth, modo avión, redes móviles y VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de datos"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Datos de propietario"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Habilitar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Inhabilitada por el administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueo de NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ingresa el texto para la pantalla bloqueada."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar datos de usuario en pantalla bloqueada"</string>
@@ -333,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Encriptado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Puedes encriptar las cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de encriptar la tablet, si configuraste un bloqueo de pantalla (es decir, un patrón, un PIN numérico o una contraseña), tendrás que desbloquear la pantalla para desencriptar la tablet cada vez que la enciendas. La única otra forma de desencriptar es restablecer la configuración de fábrica, de manera que se borren todos los datos.\n\nLa encriptación tarda una hora o más. Para comenzar, la batería tiene que estar cargada y debes mantener la tablet conectada hasta que finalice el proceso. Si lo interrumpes, es posible que pierdas toda la información o parte de ella."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Puedes encriptar las cuentas, configuración, aplicaciones descargadas y sus datos, archivos multimedia y otros archivos. Después de encriptar el teléfono, si configuraste un bloqueo de pantalla (es decir, un patrón o un PIN numérico o una contraseña), tendrás que desbloquear la pantalla para desencriptar el teléfono cada vez que lo enciendas. La única otra forma de desencriptar es restablecer la configuración de fábrica, de manera que se borren todos los datos.\n\nLa encriptación tarda una hora o más. Para comenzar, la batería tiene que estar cargada y debes mantener el teléfono conectado hasta que finalice el proceso. Si lo interrumpes, es posible que pierdas toda la información o parte de ella."</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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escribir en etiqueta NFC"</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>
@@ -619,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="2288214226916117159">"Ingresa 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, 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>
@@ -736,10 +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="8480105032417444275">"Nivel de brillo"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
+    <!-- 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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Quieres cambiar la aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"¿Quieres usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como la aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"¿Quieres usar <xliff:g id="NEW_APP">%s</xliff:g> como la aplicación de SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operador SIM desconocido"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconocido"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no tiene ningún sitio de aprovisionamiento."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conéctate a Internet."</string>
@@ -1323,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="7923901846375587241">"Acceso directo para informes de errores"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Mostrar botón de informes de errores en Configuración rápida"</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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Tiempo de ejecución"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"¿Reiniciar para cambiar el tiempo de ejecución de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Habilitar acceso Wi-Fi detallado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opciones de certificación de pantalla inalámbrica"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumentar nivel de acceso Wi-Fi, mostrar por SSID RSSI en selector Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones de prueba"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones de prueba"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración por USB?"</string>
@@ -1493,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Señal de la red de celulares"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>.00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a. m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p. m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Hora de activación del dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi a tiempo"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi a tiempo"</string>
@@ -1678,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciales de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Configuración avanzada"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de almacenamiento"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Copia de seguridad en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
@@ -1762,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con la configuración.\n\nToca "<b>"Volver"</b>" para conectarte a otra red Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sincronizando ahora"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Error de sincronización"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sincronización activada"</string>
@@ -1809,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Ingresa tu PIN para desencriptar el almacenamiento."</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Crea el patrón 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>
@@ -2063,7 +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>
-    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Favorecer aplicación en primer plano"</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>
@@ -2098,6 +2105,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Tomar una foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Elegir una foto de la galería"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Configuración de bloqueo de pantalla por NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetas sincronizadas"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Habilitada"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sincronizar con una etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sincronizar ahora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Coloca la etiqueta en una mesa y luego coloca el teléfono sobre la etiqueta."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Listo. La etiqueta y el teléfono se sincronizaron correctamente."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"La etiqueta proporcionada no puede utilizarse para desbloquear el teléfono."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Se produjo un error al sincronizar la etiqueta. Vuelve a intentarlo."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Para desbloquear el dispositivo por NFC, se necesita tecnología NFC, que no está habilitada. Actívala."</string>
+    <string name="ok" msgid="3651563352754792958">"Configuración de NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configuración"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configuración"</string>
     <string name="search_menu" msgid="7053532283559077164">"Búsqueda"</string>
@@ -2105,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2113,43 +2133,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Sonidos y notificac."</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 de tono"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificación"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Al recibir llamadas o notificaciones"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Al recibir notificaciones"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Hacer sonar"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrar en lugar de hacer sonar"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"No hacer sonar ni vibrar"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Tono de notificación predeterminado"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar al sonar"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Mostrando notificaciones"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Con dispositivo bloqueado"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"No mostrar notificaciones"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Cuando 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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Otros sonidos"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonos del teclado"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sonidos al bloquear pantalla"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sonidos al conectar"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Tonos táctiles"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrar al tacto"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Reprod. parlantes conector"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo el audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Solo audio multimedia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencio"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Acceso a notificaciones"</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>
@@ -2169,18 +2201,24 @@
     <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="3025242591043646494">"Mostrar en el inicio de la lista"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ocultar contenido personal cuando el dispositivo está bloqueado."</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Inicio de la lista"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Personal"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2199,6 +2237,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Activar"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Desactivar"</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/arrays.xml b/res/values-es/arrays.xml
index d662c58..3fa2ef3 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ninguno"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Ajustes automáticos proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"No"</item>
+    <item msgid="3165868966179561687">"Alerta"</item>
+    <item msgid="6038758039030476855">"Vibración"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ninguno"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"No"</item>
     <item msgid="2751513398307949636">"En pantalla como barras"</item>
-    <item msgid="1851438178120770973">"En adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"En pantalla como líneas"</item>
+    <item msgid="120512413928262547">"En adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"No"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 026601b..b3fd842 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Pantalla de duración de encendido"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconocido"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Cargando"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Cargando en CA"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Cargando por USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Cargando de forma inalámbrica"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(conexiones inalámbricas)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"No se está cargando"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"No se está cargando"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completa"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de puerto debe estar vacío si el campo de host también lo está."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"El puerto que has introducido no es válido."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo otras aplicaciones."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de configuración automática de proxy: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID anexo"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ajustes"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Acceso a Ajustes"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avión"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC y otras opciones"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Más…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Conexiones inalámbricas y redes"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Administrar Wi‑Fi, Bluetooth, modo avión, redes móviles y redes VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinerancia de datos"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Información del propietario"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Habilitar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Inhabilitado por administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueo de NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduce el texto que se mostrará en la pantalla de bloqueo."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar información de usuario en la pantalla de bloqueo"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escribir en etiqueta NFC"</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>
@@ -618,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="2288214226916117159">"Introduce la contraseña de tu 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>
@@ -735,10 +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="8480105032417444275">"Nivel de brillo"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Brillo automático"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizar el nivel de brillo según la luz disponible"</string>
+    <!-- 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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"¿Cambiar aplicación de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"¿Usar <xliff:g id="NEW_APP">%1$s</xliff:g> en lugar de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como aplicación de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"¿Usar <xliff:g id="NEW_APP">%s</xliff:g> como aplicación de SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operador de SIM desconocido"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de SIM desconocido"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s no tiene ningún sitio web de aprovisionamiento"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserta la tarjeta SIM y reinicia el dispositivo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Debes conectarte a Internet"</string>
@@ -1322,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="7923901846375587241">"Acceso directo a informe de errores"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Muestra un botón en Ajustes rápidos para crear un informe de errores"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Elegir tiempo de ejecución"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"¿Reiniciar para cambiar el tiempo de ejecución de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Habilitar registro Wi-Fi detallado"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opciones de certificación de pantalla inalámbrica"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumentar nivel registro sesión Wi-Fi, mostrar por SSID RSSI en selector Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Señal de red móvil"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a.m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p.m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Tiempo de actividad del dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tiempo de conexión Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tiempo de conexión Wi-Fi"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificados de confianza"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avanzados"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de almacenamiento"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Almacenado en hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con el proceso de configuración.\n\nToca "<b>"Atrás"</b>" para conectarte a otra red Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sincronizando"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Error de sincronización"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sincronización activa"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Hacer foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Seleccionar foto de la galería"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Ajustes de bloqueo de pantalla por NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetas vinculadas"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Habilitado"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Vincular con una etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Vincular ahora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Coloca la etiqueta sobre una mesa y el teléfono sobre ella"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"La etiqueta y el teléfono se han vinculado correctamente. Ya has terminado."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"La etiqueta proporcionada no se puede utilizar para desbloquear el teléfono"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Se ha producido un error al vincular la etiqueta. Inténtalo de nuevo"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"La tecnología NFC no está habilitada y se necesita para desbloquear el dispositivo por NFC. Activa la tecnología NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Ajustes de NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ajustes"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ajustes"</string>
     <string name="search_menu" msgid="7053532283559077164">"Buscar"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Volumen de notificaciones"</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_title_novoice" msgid="4628028304587795604">"Al recibir 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Otros sonidos"</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="1340569241625989837">"Sonidos al bloquear pantalla"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sonidos al conectar"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Sonidos táctiles"</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="dock_audio_media_title" msgid="1346838179626123900">"Reproducciones altavoz base"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo el audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Solo audio multimedia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencio"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Sí"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"No"</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/arrays.xml b/res/values-et-rEE/arrays.xml
index 4fa1aa9..5465cc6 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et-rEE/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Puudub"</item>
     <item msgid="8673874894887358090">"Käsitsi"</item>
-    <item msgid="168893341855953140">"Puhvers. autom. seadistus"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Väljas"</item>
+    <item msgid="3165868966179561687">"Märguanne"</item>
+    <item msgid="6038758039030476855">"Vibreeri"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Puudub"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Väljas"</item>
     <item msgid="2751513398307949636">"Ekraanil ribadena"</item>
-    <item msgid="1851438178120770973">"Adb-kestas dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Ekraanil joontena"</item>
+    <item msgid="120512413928262547">"Adb-kestas dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Väljas"</item>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index ec931c6..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="7617195369015536614">"Traadita ühendus ja võrgud"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Seade"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Isiklik"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Ekraani sisselülitusaeg:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Tundmatu"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laadimine"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Laad. vahelduvv.-v."</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Laadimine USB kaudu"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Juhtmevaba laadimine"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(VV)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(traadita võrk)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Ei lae"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ei lae"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Täis"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pordi väli peab olema tühi, kui hosti väli on tühi."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Sisestatud port on kehtetu."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Asukoht:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Külgnev CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Kärjeinfo:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Seaded"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Seadete otsetee"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Lennurežiim"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC ja muudki"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Rohkem ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Traadita ühendus ja võrgud"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"WiFi, Bluetoothi, lennukirežiimi ja mobiilsidevõrkude ning VPN-ide haldamine"</string>
     <string name="roaming" msgid="3596055926335478572">"Andmerändlus"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Teave omaniku kohta"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Luba vidinad"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Administraator on keelanud"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC avamine"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Sisestage lukustusekraanil kuvatav tekst"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Kuva lukustusekraanil teave kasutaja kohta"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Krüpteeritud"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Saate krüptida konto, seaded, allalaaditud rakendused ja nende andmed, meedia ja muud failid. Kui olete tahvelarvuti krüptinud ja ekraaniluku (mustri või PIN-koodi või parooli) seadistanud, peate avama ekraani, et dekrüptida tahvelarvuti iga kord, kui lülitate selle sisse. Ainus muu võimalus dekrüptimiseks on lähtestada tahvelarvuti tehaseandmetele, mille tulemusel kõik andmed kustuvad.\n\nKrüptimiseks kulub vähemalt tund. Enne krüptimise alustamist veenduge, et aku oleks laetud. Tahvelarvuti peab olema vooluvõrguga kogu protsessi jooksul ühendatud. Kui protsess katkeb, kaotate osa andmeid või kõik andmed."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Saate krüptida konto, seaded, allalaaditud rakendused ja nende andmed, meedia ja muud failid. Kui olete telefoni krüptinud ja ekraaniluku (mustri või PIN-koodi või parooli) seadistanud, peate avama ekraani, et dekrüptida telefon iga kord, kui lülitate selle sisse. Ainus muu võimalus dekrüptimiseks on lähtestada telefon tehaseandmetele, mille tulemusel kõik andmed kustuvad.\n\nKrüptimiseks kulub vähemalt tund. Enne krüptimise alustamist veenduge, et aku oleks laetud. Telefon peab olema vooluvõrguga kogu protsessi jooksul ühendatud. Kui protsess katkeb, 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC-kiibile kirjutamine"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Heleduse tase"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Reguleeri ekraani heledust"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Kohanduv heledus"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Heleduse optimeerimine valgustingimuste järgi"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Kas muuta SMS-i rakendust?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Kas kasutada SMS-i rakendusena rakenduse <xliff:g id="NEW_APP">%1$s</xliff:g> asemel rakendust <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Kas kasutada SMS-i rakendusena rakendust <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Tundmatu SIM-kaardi operaator"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM-kaardi tundmatu operaator"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Operaatoril %1$s pole teenusepakkumise veebisaite"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sisestage SIM-kaart ja taaskäivitage"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Looge Interneti-ühendus"</string>
@@ -1322,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="7923901846375587241">"Veaaruande otsetee"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Kuva kiirseadetes nupp veaaruande loomiseks"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Käitusaja valimine"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Taaskäivitage, et käitusaeg oleks <xliff:g id="OLD">%1$s</xliff:g>, mitte <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Juhtmeta ekraaniühenduse sertifitseerimine"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Luba WiFi paljusõnaline logimine"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Juhtmeta ekraaniühenduse sertifitseerimisvalikute kuvamine"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Suurenda Wifi logimise taset, kuva iga SSID RSSI kohta WiFi valijas"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Luban USB silumise?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobiilsidevõrgu signaal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Seadme ärkveloleku aeg"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WiFi õigel ajal"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WiFi õigel ajal"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Kõikide sertifikaatide eemaldamine"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Usaldusväärsed mandaadid"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Usaldusväärsete CA-sertifikaatide kuvamine"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Täpsemad"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Salvestusruumi tüüp"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Riistvaratoega"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Ainult tarkvara"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Seadistamise jätkamiseks puudutage nuppu "<b>"Edasi"</b>".\n\nTeise WiFi-võrguga ühenduse loomiseks puudutage valikut "<b>"Tagasi"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sünkroonimine lubatud"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sünkroonimine keelatud"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Kohe sünkroonimine"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sünkroonimise viga"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sünkroonimine ebaõnnestus"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sünkroonimine on aktiivne"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Talletusruumi dekrüptimiseks sisestage PIN-kood"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Talletusruumi dekrüptimiseks joonistage muster"</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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Jäädvusta foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Vali foto galeriist"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC ekraaniluku seaded"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Seotud kiibid"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Lubatud"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sidumine kiibiga"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Seo nüüd"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Asetage kiip lauale ja pange telefon selle peale"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Valmis! Kiibi ja telefoni sidumine õnnestus."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Seda kiipi ei saa kasutada telefoni avamiseks"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kiibiga sidumine ebaõnnestus, proovige uuesti"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC pole lubatud ja see on vajalik NFC avamiseks. Lülitage NFC sisse."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC seaded"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Seaded"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Seaded"</string>
     <string name="search_menu" msgid="7053532283559077164">"Otsing"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2112,43 +2132,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Helid ja märguanded"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Meedia helitugevus"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmi helitugevus"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Helina helitugevus"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Märguande helitugevus"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Kõnede ja märguannete saabumisel"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Märguannete saabumisel"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Helin"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibreerimine helisemise asemel"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Ei helise ega vibreeri"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Märguande vaikehelin"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibreerimine helina ajal"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Märguannete kuvamine"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuv teatise tuli"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Juhul kui seade on lukus"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ära kuva märguandeid üldse"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Juhul kui valik „Mitte segada” on sisse lülitatud"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Peida loendis uued märguanded"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Kuva loendis kõik märguanded"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Muud helid"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Valimisklahvistiku toonid"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekraani lukustamise helid"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Dokkimise helid"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Puutehelid"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibreerimine puudutusel"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Kõlari dokkimise heli"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Kogu heli"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Ainult meedia heli"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Hääletu"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Märguanne"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibratsioon"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Juurdepääs märguannetele"</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>
@@ -2168,18 +2200,24 @@
     <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="3025242591043646494">"Kuva loendi ülaosas"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Peida tundlik sisu, kui seade on lukus"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokeeritud"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Loendi ülaosas"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Tundlik"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Sees"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Väljas"</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/arrays.xml b/res/values-fa/arrays.xml
index f00c1dd..73e8610 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"هیچکدام"</item>
     <item msgid="8673874894887358090">"دستی"</item>
-    <item msgid="168893341855953140">"پیکربندی خودکار پروکسی"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"خاموش"</item>
+    <item msgid="3165868966179561687">"هشدار"</item>
+    <item msgid="6038758039030476855">"لرزش"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"هیچکدام"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"خاموش"</item>
     <item msgid="2751513398307949636">"بر روی صفحه نمایش بصورت نوار"</item>
-    <item msgid="1851438178120770973">"‏در adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"بر روی صفحه نمایش بصورت خط"</item>
+    <item msgid="120512413928262547">"‏در adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"غیرفعال"</item>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d9d9280..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"زمان روشن بودن صفحه:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"ناشناس"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"شارژ کردن"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"شارژ با جریان متناوب"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"‏شارژ از طریق USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"شارژ به صورت بی‌سیم"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(بی‌سیم)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"شارژ نمی‌شود"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"شارژ نمی‌شود"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"پر"</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_title" msgid="7185282894936042359">"‏نشانی اینترنتی PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"‏نشانی اینترنتی PAC: "</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>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"تنظیمات"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"میانبر تنظیمات"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"حالت هواپیما"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"‏NFC و موارد بیشتر"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"بیشتر..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"بی‌سیم و شبکه‌ها"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"‏مدیریت Wi-Fi، بلوتوث، حالت هواپیما، شبکه‌های تلفن همراه، و VPNها"</string>
     <string name="roaming" msgid="3596055926335478572">"رومینگ داده"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"اطلاعات مالک"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"فعال کردن ابزارک‌ها"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"توسط سرپرست غیرفعال شد"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"‏باز کردن قفل NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"متنی را وارد کنید تا در صفحه قفل شده نشان داده شود"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"نمایش اطلاعات کاربر بر روی صفحه قفل"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"رمزگذاری رایانهٔ لوحی"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"رمزگذاری تلفن"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"رمز گذاری شده"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و اطلاعات آنها، رسانه و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری رایانه لوحی‌تان، با فرض اینکه صفحه قفل تنظیم کرده‌اید (این صفه یک الگو، پین عددی یا گذرواژه است)، باید برای رمزگشایی از رایانه لوحی هر بار که آن را روشن می‌کنید، قفل صفحه را باز کنید. تنها راه دیگر برای رمزگشایی از آن انجام بازنشانی به داده کارخانه و پاک کردن همه اطلاعات شما می‌باشد.\n\nرمزگذاری یک ساعت یا بیشتر طول می‌کشد. باید این روند را با باتری شارژ شده شروع کنید و در طول آن رایانه لوحی شما به برق وصل بماند. اگر وقفه‌ای در فرآیند به وجود آید، برخی از اطلاعاتتان یا همه آنها را از دست خواهید داد."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"می‌توانید حساب‌ها، تنظیمات، برنامه‌های دانلود شده و اطلاعات آنها، رسانه و سایر فایل‌هایتان را رمزگذاری کنید. بعد از رمزگذاری تلفنتان، با فرض اینکه صفحه قفل تنظیم کرده‌اید (این صفه یک الگو، پین عددی یا گذرواژه است)، باید برای رمزگشایی از تلفن هر بار که آن را روشن می‌کنید، قفل صفحه را باز کنید. تنها راه دیگر برای رمزگشایی از آن انجام بازنشانی به داده کارخانه و پاک کردن همه اطلاعات شما می‌باشد.\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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏نوشتن در برچسب NFC"</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>
@@ -618,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="2288214226916117159">"گذرواژه شبکه‌تان را وارد کنید"</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>
@@ -735,10 +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="8480105032417444275">"سطح روشنایی"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"تنظیم روشنایی صفحه"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"روشنایی تطبیقی"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"بهینه‌سازی سطح روشنایی برای نور در دسترس"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"برنامه پیامک تغییر داده شود؟"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"از <xliff:g id="NEW_APP">%1$s</xliff:g> به‌جای <xliff:g id="CURRENT_APP">%2$s</xliff:g> به‌عنوان برنامه پیامک‌تان استفاده می‌کنید؟"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"از <xliff:g id="NEW_APP">%s</xliff:g> به‌جای برنامه پبامک‌تان استفاده می‌کنید؟"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"اپراتور سیم‌کارت ناشناخته"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"شرکت مخابراتی ارائه دهنده سیم کارت ناشناس است"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"‏%1$s وب‌سایت شناخته‌شده‌ای برای آماده‌سازی ندارد."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"لطفاً سیم کارت را وارد کنید و دوباره راه‌اندازی کنید"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"لطفاً به اینترنت وصل شوید"</string>
@@ -1322,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="7923901846375587241">"میانبر گزارش مشکل"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"نمایش دکمه‌ای در تنظیمات سریع برای گزارش‌دهی مشکل"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"انتخاب زمان اجرا"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"برای تغییر زمان اجرا از <xliff:g id="OLD">%1$s</xliff:g> به <xliff:g id="NEW">%2$s</xliff:g> دوباره راه‌اندازی شود؟"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"گواهینامه نمایش بدون سیم"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"‏فعال کردن گزارش‌گیری طولانی WiFi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"نمایش گزینه‌ها برای گواهینامه نمایش بدون سیم"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"‏افزایش سطح گزارش‌گیری Wifi، نمایش به ازای SSID RSSI در انتخابگر WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"مکان‌های کاذب مجاز هستند"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"مکان‌های کاذب مجاز هستند"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏رفع عیب USB انجام شود؟"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"سیگنال شبکهٔ تلفن همراه"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"۰۰:‏<xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> ق.ظ"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> ب.ظ"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/‏<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/‏<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"زمان بیداری دستگاه"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi به موقع"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi به موقع"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"حذف تمام گواهی‌ها"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"اطلاعات کاربری قابل اطمینان"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"‏نمایش گواهی‌های CA قابل اطمینان"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"پیشرفته"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"نوع ذخیره‌سازی"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"سخت‌افزاری"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"فقط نرم‌افزاری"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"‏برای ادامه تنظیم "<b>"بعدی"</b>" را لمس نمایید.\n\nبرای اتصال به یک شبکه Wi-Fi دیگر "<b>"بازگشت"</b>" را لمس کنید."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"همگام‌سازی فعال شد"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"همگام‌سازی غیر فعال شد"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"در حال همگام‌سازی"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"خطای همگام‌سازی."</string>
     <string name="sync_failed" msgid="1696499856374109647">"همگام‌سازی انجام نشد"</string>
     <string name="sync_active" msgid="8476943765960863040">"همگام‌سازی فعال"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"برای رمزگشایی از فضای ذخیره، پین خود را وارد کنید"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"برای رمزگشایی از فضای ذخیره، الگویتان را رسم کنید"</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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"عکس گرفتن"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"انتخاب عکس از گالری"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"‏تنظیمات قفل صفحه نمایش NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"برچسب‌های مرتبط"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"فعال شد"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"مرتبط کردن با یک نشان"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"اکنون مرتبط شود"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"برچسب را صاف روی میز بگذارید و تلفن را در بالای آن قرار دهید"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"برچسب و تلفن با موفقیت مرتبط شدند، شما آماده‌اید!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"برچسب ارائه شده نمی‌تواند برای باز کردن قفل تلفن شما استفاده شود"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"مرتبط کردن با برچسب شما ناموفق بود، لطفاً دوباره امتحان کنید"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"‏NFC فعال نیست و برای بازکردن قفل NFC مورد نیاز است. لطفاً NFC را روشن کنید."</string>
+    <string name="ok" msgid="3651563352754792958">"‏تنظیمات NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"تنظیمات"</string>
     <string name="search_results_title" msgid="1796252422574886932">"تنظیمات"</string>
     <string name="search_menu" msgid="7053532283559077164">"جستجو"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏تنظیم برچسب 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>
@@ -2112,43 +2132,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"میزان صدای اعلان"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"هنگام ورود تماس‌ها و اعلان‌ها"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"هنگام ورود اعلان‌ها"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"آهنگ زنگ پیش‌فرض اعلان"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"لرزش هنگام زنگ زدن"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"نمایش اعلان‌ها"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"چراغ اعلان چشمک بزند"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"وقتی دستگاه قفل است"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"سایر صداها"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"آهنگ‌های صفحه شماره‌گیری"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"صداهای قفل شدن صفحه"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"صداهای اتصال به پایه"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"صداهای لمس"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"لرزش هنگام لمس"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"پخش بلندگوی پایه"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"فقط صوت"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"فقط رسانه صوتی"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"بی‌صدا"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"هشدار"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"لرزش"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"دسترسی به اعلان"</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>
@@ -2168,18 +2200,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">"،"</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>
@@ -2198,6 +2236,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-fi/arrays.xml
index 73255a0..00b3621 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ei mitään"</item>
     <item msgid="8673874894887358090">"Manuaalinen"</item>
-    <item msgid="168893341855953140">"Välitysp. autom. määritys"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Pois käytöstä"</item>
+    <item msgid="3165868966179561687">"Ilmoitus"</item>
+    <item msgid="6038758039030476855">"Värinä"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ei mitään"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Pois käytöstä"</item>
     <item msgid="2751513398307949636">"Ruudulla palkkeina"</item>
-    <item msgid="1851438178120770973">"Adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Ruudulla viivoina"</item>
+    <item msgid="120512413928262547">"Adb shell dumpsys gfxinfossa"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Ei käytössä"</item>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index ffebe81..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="7617195369015536614">"Langaton verkko ja verkot"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Laite"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Henkilökohtainen"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Näytön PÄÄLLÄolemisaika:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Tuntematon"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Ladataan"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Laturilataus"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB-lataus"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Langaton lataus"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(langaton)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Ei laturissa"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ei laturissa"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Täynnä"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portti-kentän täytyy olla tyhjä, jos isäntä-kenttä on tyhjä."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Antamasi portti on virheellinen."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"Välitysp. aut. määr. URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Välityspalvelimen automaattisen määrityksen URL-osoite: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Sijainti:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naapuri-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Asetukset"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Asetukset-pikakuvake"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Lentokonetila"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"Lisää..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Langaton verkko ja verkot"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Hallinnoi wifi- ja Bluetooth-yhteyksiä, lentokonetilaa ja mobiili- ja VPN-verkkoja"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming-tiedonsiirto"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Omistajan tiedot"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Käytä widgetejä"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Järjestelmänvalvojan käytöstä poistama"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-lukituksen avaus"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kirjoita tekstiä näytettäväksi lukitusruudulla."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Näytä käyttäjän tiedot lukitusruudulla"</string>
@@ -333,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Salattu"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Voit salata tilisi, asetuksesi, ladatut sovellukset ja niiden tiedot, median ja muut tiedostot. Kun tablet-laitteesi on salattu ja olet määrittänyt ruudun lukituksen (kuvio, PIN-numerokoodi tai salasana), sinun täytyy avata ruudun lukitus tablet-laitteen salauksen purkamiseksi aina, kun kytket virran. Ainoa toinen tapa purkaa salaus on tehdasasetusten palauttaminen, jolloin kaikki tietosi tyhjennetään.\n\nSalaus kestää vähintään tunnin. Se on käynnistettävä ladatulla akulla ja tablet-laitteen täytyy olla kytkettynä verkkovirtaan koko prosessin ajan. Jos keskeytät salauksen, menetät tietosi osittain tai kokonaan."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Voit salata tilisi, asetuksesi, ladatut sovellukset ja niiden tiedot, median ja muut tiedostot. Kun puhelimesi on salattu ja olet määrittänyt ruudun lukituksen (kuvio, PIN-numerokoodi tai salasana), sinun täytyy avata ruudun lukitus puhelimen salauksen purkamiseksi aina, kun kytket virran. Ainoa toinen tapa purkaa salaus on tehdasasetusten palauttaminen, jolloin kaikki tietosi tyhjennetään.\n\nSalaus kestää vähintään tunnin. Se on käynnistettävä ladatulla akulla ja puhelimen täytyy olla kytkettynä verkkovirtaan koko prosessin ajan. Jos keskeytät salauksen, menetät tietosi osittain tai kokonaan."</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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Kirjoita uusi NFC-tunniste"</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>
@@ -619,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="2288214226916117159">"Anna verkkosalasana"</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>
@@ -736,10 +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="8480105032417444275">"Kirkkaustaso"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Säädä näytön kirkkautta"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Kirkkauden säätö"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimoi kirkkaustaso valotilanteen mukaan"</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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vaihdetaanko tekstiviestisovellus?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Valitaanko tekstiviestisovellukseksi <xliff:g id="NEW_APP">%1$s</xliff:g> sovelluksen <xliff:g id="CURRENT_APP">%2$s</xliff:g> sijaan?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Käytetäänkö tekstiviestisovellusta <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Tuntematon SIM-operaattori"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Tuntematon SIM-kortin operaattori"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Ei tunnettua käyttäjien hallintasivustoa: %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Aseta SIM-kortti ja käynnistä uudelleen"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Muodosta yhteys internetiin"</string>
@@ -1323,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="7923901846375587241">"Virheraportin pikakuvake"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Näytä virheraporttipainike pika-asetuksissa"</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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Valitse suoritusympäristö"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Käynnistetäänkö uudelleen niin, että suoritusympäristö on <xliff:g id="OLD">%1$s</xliff:g> eikä <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Langattoman näytön sertifiointi"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Käytä Wi-Fin laajennettua lokikirjausta"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Näytä langattoman näytön sertifiointiin liittyvät asetukset"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Nosta Wi-Fi-lokitasoa, näytä kunkin SSID:n signaalin vahvuus Wi-Fi-valitsimessa"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Sallitaanko USB-vianetsintä?"</string>
@@ -1501,11 +1512,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobiiliverkon signaali"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>.00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> ap."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> ip."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Laitteen käytössäoloaika"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi-yhteyden käytössäoloaika"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi-yhteyden käytössäoloaika"</string>
@@ -1686,7 +1692,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Poista kaikki varmenteet"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Luotetut todennustiedot"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Näytä luotetut CA-varmenteet"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Lisäasetukset"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tallennustilan tyyppi"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Laitteiston tukema"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Vain ohjelmisto"</string>
@@ -1770,7 +1775,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>".\n\nMuodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronointi käytössä"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronointi pois käytöstä"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkronoidaan nyt"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkronointivirhe."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Synkronointi epäonnistui"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synkronointi käytössä"</string>
@@ -1817,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Pura tallennustilan salaus antamalla PIN-koodisi"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Pura tallennustilan salaus piirtämällä kuviosi"</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>
@@ -2106,6 +2112,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ota kuva"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Valitse kuva galleriasta"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-ruudunlukitusasetukset"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Tunnistinparit"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Käytössä"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Muodosta pari tunnistimen kanssa"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Muodosta pari"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Aseta tunnistin makaamaan pöydälle ja aseta puhelin sen päälle."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tunnistimen ja puhelimen pari on muodostettu. Valmista tuli!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Puhelimen lukitusta ei voi avata tällä tunnistimella."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Parin muodostus tunnistimen kanssa epäonnistui. Yritä uudelleen."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC ei ole käytössä, mutta lukituksen avaaminen edellyttää sitä. Ota NFC käyttöön."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-asetukset"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Asetukset"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Asetukset"</string>
     <string name="search_menu" msgid="7053532283559077164">"Haku"</string>
@@ -2113,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Määritä Wi-Fi ja NFC-tunniste"</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>
@@ -2121,43 +2140,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Äänet ja ilmoitukset"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Median äänenvoimakkuus"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hälytyksen voimakkuus"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Soittoäänen voimakkuus"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Ilmoituksen äänenvoimakkuus"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Kun puheluja ja ilmoituksia saapuu"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Kun ilmoituksia saapuu"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Soittoääni"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Värise soittoäänen sijaan"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Ei soittoääntä eikä värinää"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Ilmoitusten oletussoittoää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>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Näytetään ilmoitukset"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Vilkuta ilmoitusvaloa"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Kun laite on lukittu"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Älä näytä ilmoituksia lainkaan"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kun älä häiritse -tila on käytössä"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Piilota uudet ilmoitukset luettelosta"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Näytä kaikki ilmoitukset luettelossa"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Muut äänet"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Näppäimistön näppäinäänet"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ruudun lukitusäänet"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Telakointiäänet"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Kosketusäänet"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Käytä värinää kosketettaessa"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Telineen kaiutin"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Kaikki äänet"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Vain median ääni"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Äänetön"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Ilmoitus"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Värinä"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Pääsy ilmoituksiin"</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>
@@ -2177,18 +2208,24 @@
     <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="3025242591043646494">"Näytä luettelon alussa"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Piilota arkaluonteinen sisältö, kun laite on lukittu"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Estetty"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Luettelon alku"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Herkkä"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2207,6 +2244,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Käytössä"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Ei käytössä"</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/arrays.xml b/res/values-fr-rCA/arrays.xml
index 0e82df2..ac688f5 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Aucun"</item>
     <item msgid="8673874894887358090">"Manuel"</item>
-    <item msgid="168893341855953140">"Config. auto du mandataire"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Désactivées"</item>
+    <item msgid="3165868966179561687">"Alerte"</item>
+    <item msgid="6038758039030476855">"Vibreur"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Aucun"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Désactivé"</item>
     <item msgid="2751513398307949636">"À l\'écran sous forme de barres"</item>
-    <item msgid="1851438178120770973">"Dans adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"À l\'écran sous forme de lignes"</item>
+    <item msgid="120512413928262547">"Dans adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Désactivé"</item>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 2a0645b..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="7617195369015536614">"Sans fil et réseaux"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Appareil"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Personnel"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Écran activé :"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Inconnu"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Batterie en charge"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"En charge (c.a.)"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"En charge par USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"En charge sans fil"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sans fil)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"N\'est pas en charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"N\'est pas en charge"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Pleine"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Le port indiqué n\'est pas valide."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le serveur mandataire HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL de configuration automatique de mandataire : "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de configuration automatique de mandataire : "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode avion"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"More…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sans fil et réseaux"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Infos propriétaire"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activer les widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Désactivé par l\'administrateur"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Déverrouillage CCP"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Saisir texte à afficher sur écran de verrouillage"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Afficher infos utilisateur sur écran verrouillage"</string>
@@ -333,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Vous pouvez chiffrer vos comptes et vos paramètres, les applications téléchargées et les données associées, les médias et d\'autres fichiers. Après avoir chiffré votre tablette, en supposant que vous avez défini un écran de verrouillage (au moyen d\'un motif, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à réinitialiser les paramètres d\'usine, ce qui supprimera toutes vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile de la tablette doit être chargée au départ, et celle-ci doit être connectée pendant tout le processus. Toute interruption entraînera la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Vous pouvez chiffrer vos comptes et vos paramètres, les applications téléchargées et les données associées, les médias et d\'autres fichiers. Après avoir chiffré votre téléphone, en supposant que vous avez défini un écran de verrouillage (au moyen d\'un motif, d\'un NIP ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à effectuer une réinitialisation des paramètres d\'usine, ce qui supprimera toutes vos données.\n\nLa procédure de chiffrement dure au moins une heure. La pile du téléphone doit être chargée au départ, et celui-ci doit être connecté pendant tout le processus. Toute interruption entraînera la perte d\'une partie ou de la totalité des données."</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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Écrire sur la balise NFC"</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>
@@ -619,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="2288214226916117159">"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>
@@ -736,10 +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="8480105032417444275">"Niveau de luminosité"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosité adaptative"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise le niveau de luminosité en fonction de l\'éclairage ambiant"</string>
+    <!-- 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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Modifier l\'application de messagerie texte?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application de messagerie texte?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application de messagerie texte?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Fournisseur de la carte SIM inconnu"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Opérateur SIM inconnu"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Aucun site Web de configuration connu pour %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connectez-vous à Internet."</string>
@@ -1323,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="7923901846375587241">"Raccourci de rapport de bogue"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Afficher un bouton dans le menu Réglages rapides permettant de créer un rapport de bogue"</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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Sélect. moteur d\'exécution"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Redémarrer pour remplacer le moteur d\'exécution <xliff:g id="OLD">%1$s</xliff:g> par <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Autoriser descr. détaillés journaux Wi-fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afficher les options pour la certification d\'affichage sans fil"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Augmenter détails dans journaux Wi-fi, afficher par SSID RSSI dans sélecteur Wi-fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Autoriser les positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB?"</string>
@@ -1493,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal du réseau mobile"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a.m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p.m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
@@ -1678,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiance"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avancés"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Type de stockage"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
@@ -1762,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration.\n\nAppuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisation activée"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisation désactivée"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronisation en cours…"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erreur de synchronisation."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Échec de la synchronisation"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synchronisation activée"</string>
@@ -1809,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Entrez votre NIP pour déchiffrer le stockage"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Dessinez votre motif pour déchiffrer le 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>
@@ -2100,6 +2106,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Prendre une photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Sélectionner une photo dans la galerie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Paramètres CCP de verrouillage de l\'écran"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Balises associées"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Activée"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Associer à une étiquette"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Activité d\'association par CCP"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Associer"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Placez la balise à plat sur une table, puis placez le téléphone dessus"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"La balise et le téléphone sont associés. Vous avez terminé."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Impossible d\'utiliser la balise fournie pour déverrouiller votre téléphone"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Échec de l\'association avec la balise. Veuillez réessayer."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"La CCP n\'est pas activée, mais elle est nécessaire pour le déverrouillage CCP. Veuillez l\'activer."</string>
+    <string name="ok" msgid="3651563352754792958">"Paramètres CCP"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Paramètres"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
     <string name="search_menu" msgid="7053532283559077164">"Rechercher"</string>
@@ -2107,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer une balise NFC par 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>
@@ -2115,43 +2134,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Sons et notifications"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume des médias"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume de la sonnerie"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"À la réception d\'appels et de notifications"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"À la réception de notifications"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Faire sonner"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrer au lieu de sonner"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Ne pas faire sonner ni vibrer"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Sonnerie de notification par défaut"</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>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Affichage des notifications"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Faire clignoter le voyant de notification"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Si l\'appareil est verrouillé"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"N\'afficher aucune notification"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quand la fonction « Ne pas déranger » est activée"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Masquer les nouvelles notifications de la liste"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Afficher toutes les notifications de la liste"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du clavier"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons du verrouillage d\'écran"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sons de la station d\'accueil"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Sons des touches"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrer au toucher"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Lecture : station d\'accueil"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tout l\'audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio des médias seulement"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Mode silencieux"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerte"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux 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">"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>
@@ -2171,18 +2202,24 @@
     <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="3025242591043646494">"Afficher en haut de la liste"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Masquer le contenu confidentiel lorsque l\'appareil est verrouillé"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqué"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Haut de la liste"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2201,6 +2238,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Désactivé"</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/arrays.xml b/res/values-fr/arrays.xml
index 4e53952..530b42f 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Aucun"</item>
     <item msgid="8673874894887358090">"Manuel"</item>
-    <item msgid="168893341855953140">"Configuration auto du proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Désactivé"</item>
+    <item msgid="3165868966179561687">"Alerte"</item>
+    <item msgid="6038758039030476855">"Vibreur"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Aucune"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Désactivé"</item>
     <item msgid="2751513398307949636">"À l\'écran sous forme de barres"</item>
-    <item msgid="1851438178120770973">"Dans adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"À l\'écran sous forme de lignes"</item>
+    <item msgid="120512413928262547">"Dans adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Désactivé"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 2981fb7..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="7617195369015536614">"Sans fil et réseaux"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Appareil"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Personnel"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Écran activé :"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Inconnu"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Batterie en charge"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"En charge sur secteur"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"En charge via USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"En charge sans fil"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(secteur)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sans fil)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"N\'est pas en charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Débranchée"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Chargée"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Le port indiqué n\'est pas valide."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le proxy HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL config. auto proxy : "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de configuration automatique de proxy : "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Paramètres"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Raccourci vers les paramètres"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode Avion"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC et autres"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Plus..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sans fil et réseaux"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Gérer le Wi-Fi, le Bluetooth, le mode Avion, les réseaux mobiles et les VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Itinérance des données"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Infos propriétaire"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activer les widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Désactivé par l\'administrateur"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Déverrouillage NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Saisir texte à afficher sur écran de verrouillage"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Afficher infos utilisateur sur écran verrouillage"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Chiffré"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre tablette en définissant un verrouillage d\'écran (au moyen d\'un motif, d\'un code d\'accès numérique ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer la tablette à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer cette dernière consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La batterie de la tablette doit être chargée au départ, et la tablette doit rester branchée pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Vous pouvez chiffrer vos comptes, vos paramètres, les applications téléchargées et les données associées, les contenus multimédias et d\'autres fichiers. Si vous avez chiffré votre téléphone en définissant un verrouillage d\'écran (au moyen d\'un motif, d\'un code d\'accès numérique ou d\'un mot de passe), vous devez déverrouiller l\'écran pour déchiffrer le téléphone à chaque fois que vous l\'allumez. La seule autre manière de déchiffrer ce dernier consiste à rétablir la configuration d\'usine, ce qui entraîne la suppression de l\'ensemble de vos données.\n\nLa procédure de chiffrement dure au moins une heure. La batterie du téléphone doit être chargée au départ, et le téléphone doit rester branché pendant tout le processus. Toute interruption entraîne la perte d\'une partie ou de la totalité des données."</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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Modifier le tag NFC"</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>
@@ -618,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="2288214226916117159">"Saisissez 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>
@@ -735,10 +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="8480105032417444275">"Niveau de luminosité"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Régler la luminosité de l\'écran"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptation de la luminosité"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimise le niveau de luminosité en fonction de l\'éclairage ambiant"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Modifier l\'application SMS ?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utiliser <xliff:g id="NEW_APP">%1$s</xliff:g> au lieu de <xliff:g id="CURRENT_APP">%2$s</xliff:g> comme application SMS ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utiliser <xliff:g id="NEW_APP">%s</xliff:g> comme application SMS ?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Opérateur de carte SIM inconnu"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Opérateur SIM inconnu"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Aucun site Web de configuration connu pour %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insérez la carte SIM, puis redémarrez."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connectez-vous à Internet."</string>
@@ -1322,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="7923901846375587241">"Raccourci vers le rapport d\'erreur"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Afficher un bouton dans la fenêtre de configuration rapide permettant de créer un rapport d\'erreur"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Sélect. moteur d\'exécution"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Redémarrer pour remplacer le moteur d\'exécution <xliff:g id="OLD">%1$s</xliff:g> par <xliff:g id="NEW">%2$s</xliff:g> ?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Autoriser enreg. infos Wi-Fi détaillées"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afficher les options de la certification de l\'affichage sans fil"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Détailler davantage les infos Wi-Fi, afficher par SSID RSSI dans sélecteur Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB ?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal du réseau mobile"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a.m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p.m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Durée de fonctionnement de l\'appareil"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi/temps"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi/temps"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiance"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Paramètres avancés"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Type de stockage"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration.\n\nAppuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisation activée"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisation désactivée"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronisation en cours"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erreur de synchronisation."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Échec de la synchronisation"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synchronisation activée"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Saisissez le code d\'accès pour déchiffrer l\'espace de stockage."</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Dessinez le motif pour déchiffrer l\'espace 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>
@@ -2099,6 +2106,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Prendre une photo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Sélectionner une photo dans la galerie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Paramètres NFC de verrouillage de l\'écran"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Puces associées"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Activé"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Associer à un tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Associer"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Placez la puce à plat sur une table, puis positionnez votre téléphone au-dessus de celle-ci."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"La puce et le téléphone sont bien associés. Vous avez terminé."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Impossible d\'utiliser la puce fournie pour le déverrouillage de votre téléphone."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Échec de l\'association avec la puce. Veuillez réessayer."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"La technologie NFC n\'est pas activée alors qu\'elle est nécessaire pour le déverrouillage NFC. Veuillez l\'activer."</string>
+    <string name="ok" msgid="3651563352754792958">"Paramètres NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Paramètres"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Paramètres"</string>
     <string name="search_menu" msgid="7053532283559077164">"Rechercher"</string>
@@ -2106,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Créer un tag NFC pour 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>
@@ -2114,43 +2134,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Sons et notifications"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume des contenus multimédias"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume de l\'alarme"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume de la sonnerie"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume des notifications"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"À la réception d\'appels et de notifications"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"À la réception de notifications"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Faire sonner"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrer au lieu de sonner"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Ne pas faire sonner ni vibrer"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Sonnerie de notification par défaut"</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>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Affichage des notifications"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Voyant de notification"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Si l\'appareil est verrouillé"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"N\'afficher aucune notification"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Lorsque le mode Ne pas déranger est activé"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Masquer les nouvelles notifications dans la liste"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Afficher toutes les notifications dans la liste"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du clavier"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons du verrouillage de l\'écran"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sons de la station d\'accueil"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Sons des touches"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrer au toucher"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Sons haut-parleurs sta. accueil"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tout l\'audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio des contenus multimédias seulement"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Mode silencieux"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerte"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibreur"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Accès aux 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">"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>
@@ -2170,18 +2202,24 @@
     <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="3025242591043646494">"Afficher en haut de la liste"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Masquer le contenu confidentiel lorsque l\'appareil est verrouillé"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqué"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Haut de la liste"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensible"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2200,6 +2238,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Activé"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Désactivé"</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/arrays.xml b/res/values-hi/arrays.xml
index 5d07685..ed63f76 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"कोई नहीं"</item>
     <item msgid="8673874894887358090">"मैन्युअल"</item>
-    <item msgid="168893341855953140">"प्रॉक्सी स्वत: कॉन्फ़िग"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"बंद"</item>
+    <item msgid="3165868966179561687">"अलर्ट"</item>
+    <item msgid="6038758039030476855">"कंपन"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"कोई नहीं"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"बंद"</item>
     <item msgid="2751513398307949636">"बार के रूप में स्‍क्रीन पर"</item>
-    <item msgid="1851438178120770973">"adb shell dumpsys gfxinfo में"</item>
+    <item msgid="8272260411216018353">"रेखाओं के रूप में स्‍क्रीन पर"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo में"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"बंद"</item>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 227f544..d6ab002 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"स्‍क्रीन चालू रहने का समय:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"अज्ञात"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"चार्ज हो रही है"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"AC से चार्ज हो रही"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB पर चार्ज हो रही"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"वायरलेस रूप से चार्ज हो रही"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(वायरलेस)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"चार्ज नहीं हो रही है"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"चार्ज नहीं हो रही है"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"भरी"</string>
@@ -203,7 +203,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_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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">"सेल जानकारी:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"सेटिंग"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"सेटिंग शॉर्टकट"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"हवाई जहाज मोड"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC तथा और भी बहुत कुछ"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"अधिक…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"वायरलेस और नेटवर्क"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, हवाई जहाज़ मोड, मोबाइल नेटवर्क और VPN प्रबंधित करें"</string>
     <string name="roaming" msgid="3596055926335478572">"डेटा रोमिंग"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"अपनी जानकारी"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"विजेट सक्षम करें"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"व्यवस्थापक के द्वारा अक्षम किया गया"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC अनलॉक"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"लॉक स्‍क्रीन पर दिखाई देने के लिए पाठ लिखें"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"लॉक स्क्रीन पर उपयोगकर्ता जानकारी दिखाएं"</string>
@@ -332,8 +333,8 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"टेबलेट एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"फ़ोन एन्‍क्रिप्‍ट करें"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"एन्‍िक्रप्ट किया गया"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप्स और उनका डेटा, मीडिया, और अन्य फ़ाइलें एन्क्रिप्ट कर सकते हैं. अपना टेबलेट एन्क्रिप्ट करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (अर्थात् कोई पैटर्न या संख्यात्मक पिन या पासवर्ड) सेट कर लिया है, हर बार टेबलेट को चालू करते समय आपको उसे डीक्रिप्ट करने के लिए स्क्रीन को अनलॉक करना होगा. डीक्रिप्ट करने का एकमात्र अन्य तरीका, अपना सभी डेटा मिटाते हुए फ़ैक्टरी डेटा रीसेट की कार्रवाई करना है.\n\nएन्क्रिप्शन में एक घंटा या इससे अधिक समय लग सकता है. आपको चार्ज की हुई बैटरी से प्रारंभ करना चाहिए और पूरी प्रक्रिया के दौरान अपने टेबलेट को प्लग इन करके रखना चाहिए. यदि आप इसमें बाधा डालते हैं, तो आप अपना कुछ या सभी डेटा खो देंगे."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"आप अपने खाते, सेटिंग, डाउनलोड किए गए ऐप्स और उनका डेटा, मीडिया तथा अन्य फ़ाइलें एन्क्रिप्ट कर सकते हैं. अपना फ़ोन एन्क्रिप्ट करने के बाद, यह मानते हुए कि आपने स्क्रीन लॉक (अर्थात् कोई पैटर्न या संख्यात्मक पिन या पासवर्ड) सेट कर लिया है, हर बार फ़ोन को चालू करते समय आपको उसे डीक्रिप्ट करने के लिए स्क्रीन को अनलॉक करना होगा. डीक्रिप्ट करने का एकमात्र अन्य तरीका, अपना सभी डेटा मिटाते हुए फ़ैक्टरी डेटा रीसेट की कार्रवाई करना है.\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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC टैग पर लिखें"</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>
@@ -618,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="2288214226916117159">"अपना नेटवर्क पासवर्ड डालें"</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>
@@ -735,10 +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="8480105032417444275">"चमक का स्तर"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"स्‍क्रीन की रोशनी एडजस्ट करें"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"अनुकूलक चमक"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"उपलब्ध प्रकाश के लिए चमक का स्तर ऑप्टिमाइज़ करें"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS एप्लिकेशन बदलें?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"आपके SMS ऐप्स के रूप में <xliff:g id="CURRENT_APP">%2$s</xliff:g> के बजाय <xliff:g id="NEW_APP">%1$s</xliff:g> का उपयोग करें?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"आपके SMS ऐप्स के रूप में <xliff:g id="NEW_APP">%s</xliff:g> का उपयोग करें?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"अज्ञात SIM ऑपरेटर"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"अज्ञात SIM ऑपरेट"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s की कोई भी ज्ञात प्रावधान वेबसाइट नहीं है"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"कृपया SIM कार्ड डालें और पुन: प्रारंभ करें"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"कृपया इंटरनेट से कनेक्ट करें"</string>
@@ -1322,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="7923901846375587241">"बग रिपोर्ट शॉर्टकट"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"बग रिपोर्ट लेने के लिए त्वरित सेटिंग में कोई बटन दिखाएं"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"रनटाइम चुनें"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"रनटाइम को <xliff:g id="OLD">%1$s</xliff:g> से <xliff:g id="NEW">%2$s</xliff:g> में बदलने के लिए रीबूट करें?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस दिखाई देने के लिए प्रमाणन"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"WiFi वर्बोस लॉगिंग सक्षम करें"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"वायरलेस दिखाई देने के लिए प्रमाणन विकल्प दिखाएं"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wifi लॉगिंग का स्तर बढ़ाएं, WiFi पिकर में प्रति SSID RSSI दिखाएं"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्‍थानों को अनुमति दें"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करने की अनुमति दें?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"मोबाइल नेटवर्क सिग्‍नल"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> पू."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> अप."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"उपकरण सक्रियण समय"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi चालू होने से अब तक का समय"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi चालू होने से अब तक का समय"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"सभी प्रमाणपत्र निकालें"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"विश्वस्त क्रेडेंशियल"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र दिखाएं"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"अतिरिक्त सेटिंग"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"संग्रहण का प्रकार"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"केवल सॉफ़्टवेयर"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" स्पर्श करें.\n\nकिसी भिन्न Wi‑Fi नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" स्पर्श करें."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"अब समन्वयित हो रहा है"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
     <string name="sync_failed" msgid="1696499856374109647">"समन्‍वयन विफल"</string>
     <string name="sync_active" msgid="8476943765960863040">"समन्‍वयन सक्रिय"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"फ़ोटो लें"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"गैलरी से फ़ोटो चुनें"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC स्क्रीन लॉक सेटिंग"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"युग्मित टैग"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"सक्षम किया गया"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"टैग के साथ युग्मित करें"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"अब युग्मित करें"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"टैग को किसी टेबल पर सीधा रखें और फ़ोन को सबसे ऊपर रखें"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"टैग और फ़ोन सफलतापूर्वक युग्मित किए गए, आपका काम हो गया!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"प्रदान किए गए टैग का उपयोग आपके फ़ोन को अनलॉक करने के लिए नहीं किया जा सकता"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"आपके टैग के साथ युग्मन विफल हो गया, कृपया पुन: प्रयास करें"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC सक्षम नहीं है और यह NFC अनलॉक के लिए आवश्यक है. कृपया NFC चालू करें."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC सेटिंग"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"सेटिंग"</string>
     <string name="search_results_title" msgid="1796252422574886932">"सेटिंग"</string>
     <string name="search_menu" msgid="7053532283559077164">"खोजें"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2116,10 +2128,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"मीडिया वॉल्‍यूम"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"अलार्म का वॉल्यूम"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"रिंग का वॉल्यूम"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"सूचना वॉल्‍यूम"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"परेशान न करें"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"कॉल और सूचनाएं आने पर"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"सूचनाएं आने पर"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनियां"</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="1340569241625989837">"स्क्रीन लॉक करने की ध्वनियां"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"डॉक करने की ध्वनियां"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"स्‍पर्श ध्‍वनियां"</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="dock_audio_media_title" msgid="1346838179626123900">"डॉक स्पीकर चलेगा"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"सभी ऑडियो"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"केवल मीडिया ऑडियो"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"मौन"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"सूचना"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"कंपन"</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">
@@ -2198,6 +2201,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-hr/arrays.xml
index c94d144..8818491 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ništa"</item>
     <item msgid="8673874894887358090">"Ručno"</item>
-    <item msgid="168893341855953140">"Automatska konf. proxyja"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Isključeno"</item>
+    <item msgid="3165868966179561687">"Upozorenje"</item>
+    <item msgid="6038758039030476855">"Vibracija"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ništa"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Isključeno"</item>
     <item msgid="2751513398307949636">"Na zaslonu u obliku traka"</item>
-    <item msgid="1851438178120770973">"U naredbi adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Na zaslonu u obliku crta"</item>
+    <item msgid="120512413928262547">"U naredbi adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Isključeno"</item>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8e6e430..d10226c 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Zaslonsko vrijeme uključenosti:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Nepoznato"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Punjenje"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Punjenje punjačem"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Punjenje putem USB-a"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Bežično punjenje"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bežično povezivanje)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Ne puni se"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ne puni se"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Puna"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Polje priključka mora biti prazno ako je i polje hosta prazno."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Upisani priključak nije valjan."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL za PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL za PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedski CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacije o ćeliji:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Postavke"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Prečac postavki"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Način rada u zrakoplovu"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC i ostalo"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Više..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bežično povezivanje i mreže"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Upravljanje značajkama Wi-Fi, Bluetooth, način rada u zrakoplovu, mobilne mreže i VPN-ovi"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming podataka"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlasniku"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogući widgete"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Onemogućio administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Otključavanje NFC-a"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Unesite tekst za prikaz na zaključanom zaslonu"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Prikaži podatke o korisniku na zaključanom zaslonu"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Piši na oznaku NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Razina svjetline"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Podesite svjetlinu zaslona"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svjetlina"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje razine svjetline za postojeće svjetlo"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Želite li promijeniti aplikaciju za SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Želite li upotrijebiti aplikaciju <xliff:g id="NEW_APP">%1$s</xliff:g> umjesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> kao svoju aplikaciju za SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Želite li upotrijebiti aplikaciju <xliff:g id="NEW_APP">%s</xliff:g> kao svoju aplikaciju za SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Nepoznati operater SIM kartice"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nepoznati SIM operater"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nema poznatu web-lokaciju za niz usluga"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Umetnite SIM karticu i pokrenite ponovo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Povežite se s internetom"</string>
@@ -1322,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="7923901846375587241">"Prečac izvješća o programskim pogreškama"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Prikazivanje gumba u Brzim postavkama za izradu izvješća o programskim pogreškama"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Odabir vremena izvođenja"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Želite li pokrenuti ponovo da biste promijenili vrijeme izvođenja s <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Omogući opsežne zapisnike Wi-Fi-ja"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Prikaži opcije za certifikaciju bežičnog prikaza"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Povećaj razinu zapisnika Wi-Fi-ja, prikaži po RSSI-ju SSID-a u biraču Wi-Fi-ja"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti rješavanje programske pogreške na USB-u?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal mobilne mreže"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>.00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> A.M."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> P.M."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Vrijeme budnosti uređaja"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na vrijeme"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na vrijeme"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Uklanjanje svih certifikata"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pouzdane vjerodajnice"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaz pouzdanih CA certifikata"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Napredno"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Vrsta pohrane"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardverska"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo softverska"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja.\n\nDodirnite "<b>"Natrag"</b>" za povezivanje s nekom drugom Wi-Fi mrežom."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronizacija je omogućena"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Onemogućena je sinkronizacija"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinkronizacija u tijeku"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Pogreška sinkronizacije"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sinkronizacija nije uspjela"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sinkronizacija aktivna"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Snimite fotografiju"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Odaberite fotografiju iz Galerije"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Postavke zaključavanja zaslona za NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Uparene oznake"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Omogućeno"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Upari s oznakom"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Aktivnost NFC uparivanja"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Upari sad"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Položite oznaku na stol i stavite telefon na nju"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Oznaka i telefon uspješno su upareni, gotovi ste!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Vaš se telefon ne može otključati pomoću pružene oznake"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Uparivanje s oznakom nije uspjelo, pokušajte ponovo"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC nije omogućen, a potreban je za NFC otključavanje. Uključite NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Postavke NFC-a"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Postavke"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Postavke"</string>
     <string name="search_menu" msgid="7053532283559077164">"Pretražite"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Postavite oznaku NFC za Wi-Fi"</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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Glasnoća obavijesti"</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_title_novoice" msgid="4628028304587795604">"Kad stignu 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Ostali zvukovi"</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="1340569241625989837">"Zvukovi zaključavanja zaslona"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Zvukovi priključivanja"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Zvukovi dodirivanja"</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="dock_audio_media_title" msgid="1346838179626123900">"Priključna stanica reproducira"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Sve zvukove"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Samo medijske zvukove"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Bešumno"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozorenje"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Uključeno"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Isključeno"</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/arrays.xml b/res/values-hu/arrays.xml
index 2fd5f07..c59a3a7 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nincs"</item>
     <item msgid="8673874894887358090">"Kézi"</item>
-    <item msgid="168893341855953140">"Proxy auto. beállítása"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Ki"</item>
+    <item msgid="3165868966179561687">"Riasztás"</item>
+    <item msgid="6038758039030476855">"Rezgés"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Nincs"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Ki"</item>
     <item msgid="2751513398307949636">"A képernyőn sávként"</item>
-    <item msgid="1851438178120770973">"adb shell dumpsys gfxinfo elemben"</item>
+    <item msgid="8272260411216018353">"A képernyőn sorként"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo elemben"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Ki"</item>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 4b22d44..0c57a19 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Képernyő bekapcsolási ideje:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Ismeretlen"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Töltés"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Hálózati töltés"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB-s töltés"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Nem vezetékes töltés"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(Hálózat)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(vezeték nélküli)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Nem tölt"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nem töltődik"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Tele"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"A port mezőnek is üresnek kell maradnia, ha a gazdagép mező üres."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A megadott port nem érvényes."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"A HTTP proxyt a böngésző használja, ám más alkalmazások nem használhatják."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Hely:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Környező CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellainformáció:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Beállítások"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Beállítások parancsikon"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Repülőgép üzemmód"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC és egyéb beállítások"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Továbbiak..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Vezeték nélküli és egyéb hálózatok"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"A Wi-Fi, a Bluetooth, a repülős üzemmód, a mobilhálózatok és a VPN-ek kezelése"</string>
     <string name="roaming" msgid="3596055926335478572">"Adatbarangolás"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Tulajdonosi adatok"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Modulengedélyezés"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Letiltva a rendszergazda által"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-feloldás"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Írja be a lezárt képernyőn megjelenítendő szöveget"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Felhasználói adatok megjelenítése zárolt képernyőn"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC-címke írá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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Fényerőszint"</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>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Alkalmazkodó fényerő"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Fényerőszint optimalizálása a környezeti fény alapján"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Módosítja az SMS-alkalmazást?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"A(z) <xliff:g id="NEW_APP">%1$s</xliff:g> alkalmazást szeretné használni a(z) <xliff:g id="CURRENT_APP">%2$s</xliff:g> helyett az SMS-ekhez?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"A(z) <xliff:g id="NEW_APP">%s</xliff:g> alkalmazást szeretné használni az SMS-ekhez?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Ismeretlen szolgáltató"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ismeretlen SIM kártya szolgáltató"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s – nincs ismert hozzáférés-kezelő webhely"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Helyezze be a SIM kártyát és indítsa újra"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Csatlakozzon az internethez"</string>
@@ -1322,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="7923901846375587241">"Hibajelentés gyorsparancs"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Gomb mutatása a Gyorsbeállításokban hibajelentés készítéséhez"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Futtatási környezet kiválasztása"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Újraindítja, hogy a futtatási környezet módosuljon <xliff:g id="OLD">%1$s</xliff:g> beállításról <xliff:g id="NEW">%2$s</xliff:g> beállításra?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Vezeték nélküli kijelző tanúsítványa"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Wi-Fi Verbose-naplózás engedélyezése"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Beállítások megjelenítése a vezeték nélküli kijelző tanúsítványával kapcsolatban"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Nő a Wi-Fi-naplózási szint, SSID RSSI szerinti megjelenítés a Wi-Fi-választóban"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Engedélyezi az USB hibakeresést?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobil hálózat jele"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> DE"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> DU"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>. <xliff:g id="MONTH">%2$d</xliff:g>."</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>. <xliff:g id="DAY">%1$d</xliff:g>."</string>
     <string name="awake" msgid="387122265874485088">"Eszköz készenléti ideje"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi időben"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi időben"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Összes tanúsítvány eltávolítása"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Megbízható hitelesítő adatok"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Megbízható CA tanúsítványok megjelenítése"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Speciális"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tárhelytípus"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"hardveresen támogatott"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"kizárólag szoftveres"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Érintse meg a "<b>"Tovább"</b>" lehetőséget a telepítés folytatásához.\n\nÉrintse meg a "<b>"Vissza"</b>" lehetőséget egy másik Wi-Fi-hálózathoz való csatlakozáshoz."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Szinkronizálás engedélyezve"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Szinkronizálás letiltva"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Szinkronizálás folyamatban"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Szinkronizálási hiba"</string>
     <string name="sync_failed" msgid="1696499856374109647">"A szinkronizálás nem sikerült"</string>
     <string name="sync_active" msgid="8476943765960863040">"Szinkronizálás aktív"</string>
@@ -2099,6 +2098,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Fotó készítése"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Fotó kiválasztása a Galériából"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-képernyőzár beállításai"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Párosított címkék"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Engedélyezve"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Párosítás címkével"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Párosítás most"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Fektesse a címkét az asztalra, majd helyezze rá a telefont."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Címke és telefon sikeresen párosítva, elkészültünk."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"A megadott címkét nem lehet használni a telefon feloldásához"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"A címkével való párosítás sikertelen, próbálja újra."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Az NFC nincs engedélyezve, és szükséges az NFC-alapú feloldás használatához. Kérjük, engedélyezze az NFC-t."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-beállítások"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Beállítások"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Beállítások"</string>
     <string name="search_menu" msgid="7053532283559077164">"Keresés"</string>
@@ -2106,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wi-Fi 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>
@@ -2118,10 +2130,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Értesíté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_title_novoice" msgid="4628028304587795604">"Értesítés é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>
@@ -2138,18 +2148,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Egyéb hangok"</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="1340569241625989837">"Képernyő-zárolási hangok"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Dokkolási hangok"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Érintési hangok"</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="dock_audio_media_title" msgid="1346838179626123900">"Dokkoláskor hangszórón szól"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Minden hang"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Kizárólag médiahang"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Néma"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Figyelmeztetés"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rezgés"</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">
@@ -2200,6 +2203,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Be"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Ki"</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/arrays.xml b/res/values-hy-rAM/arrays.xml
index b8391ca..18d03ac 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ոչ մեկը"</item>
     <item msgid="8673874894887358090">"Ձեռքով"</item>
-    <item msgid="168893341855953140">"Պրոքսիի ինքնակարգավորում"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Անջատել"</item>
+    <item msgid="3165868966179561687">"Ահազանգ"</item>
+    <item msgid="6038758039030476855">"Թրթռալ"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ոչ մեկը"</item>
@@ -432,7 +436,12 @@
     <item msgid="675719912558941285">"Ներկել ոչ ուղղանկյունային կտրվածքի տարածքը կապույտով"</item>
     <item msgid="1064373276095698656">"Փորձարկված թեստի գունանշումը կանաչով"</item>
   </string-array>
-    <!-- no translation found for track_frame_time_entries:2 (1851438178120770973) -->
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"Անջատել"</item>
+    <item msgid="2751513398307949636">"Էկրանի վրա որպես գոտիներ"</item>
+    <item msgid="8272260411216018353">"Էկրանի վրա որպես գծեր"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo-ում"</item>
+  </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Անջատված է"</item>
     <item msgid="7688197031296835369">"Ցույց տալ գերազանցված հատվածները"</item>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 296eaa6..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Էկրանի միացման ժամանակը`"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Անհայտ"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Լիցքավորում"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Լիցքավորում AC-ով"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Լիցքավորում USB-ով"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Անլար լիցքավորում"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(անլար)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Չի լիցքավորվում"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Չի լիցքավորվում"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Լիցքավորված"</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_title" msgid="7185282894936042359">"PAC URL` "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL` "</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">"Բջջայինի տեղեկություններ`"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Կարգավորումներ"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Կարգավորումների դյուրանցում"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Ինքնաթիռային ռեժիմ"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"Ավելին..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Անլար կապ և ցանցեր"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Կառավարել WiFi-ը, Bluetooth-ը, թռիչքային ռեժիմը, շարժական ցանցերը, &amp; VPN-ները"</string>
     <string name="roaming" msgid="3596055926335478572">"Տվյալների ռոումինգ"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Սեփականատիրոջ տվյալներ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Միացնել վիջեթները"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Կասեցված է վարիչի կողմից"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-ով ապակողպում"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Մուտքագրեք տեքստը՝ կողպէկրանին ցուցադրելու համար"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Ցույց տալ օգտվողի մասին տեղեկությունները կողպէկրանին"</string>
@@ -333,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Կոդավորել գրասալիկը"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Կոդավորել հեռախոսը"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Կոդավորված է"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Դուք կարող եք կոդավորել ձեր հաշիվները, կարգավորումները, ներբեռնած ծրագրերը և դրանց տվյալները, մեդիա և այլ ֆայլերը: Եթե ենթադրենք, որ դուք միացրել եք էկրանի կողպումը (այն է՝ սահմանել եք թվային PIN կամ գաղտնաբառ), ապա գրասալիկը կոդավորելուց հետո դուք պետք է ամեն անգամ այն միացնելիս ապակողպեք էկրանը՝ ապակոդավորելու համար: Միակ այլընտրանքը գործարանային տվյալների վերականգնումն է, որը կջնջի ձեր բոլոր տվյալները:\n\nԿոդավորումը տևում է մեկ ժամ կամ ավելի: Դուք պետք է սկսեք լիցքավորված մարտկոցով՝ ողջ ընթացքում հեռախոսին միացրած պահելով լիցքավորիչը: Եթե ընդհատեք, կարող եք կորցնել ձեր ինֆորմացիան մասնակի կամ ամբողջովին"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Դուք կարող եք կոդավորել ձեր հաշիվները, կարգավորումները, ներբեռնած ծրագրերը և դրանց տվյալները, մեդիա և այլ ֆայլերը: Եթե ենթադրենք, որ դուք միացրել եք էկրանի կողպումը (այն է՝ սահմանել եք թվային 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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Գրել NFC պիտակում"</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>
@@ -619,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="2288214226916117159">"Մուտքագրեք ձեր ցանցի գաղտնաբառը"</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>
@@ -736,10 +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="8480105032417444275">"Պայծառության մակարդակ"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Կարգաբերել էկրանի պայծառությունը"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Հարմարողական պայծառություն"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Լույսի պայծառության մակարդակի լավարկում"</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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Փոխե՞լ SMS ծրագիրը:"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Որպես SMS ծրագիր` <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ի փոխարեն օգտագործե՞լ <xliff:g id="NEW_APP">%1$s</xliff:g>-ը:"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Որպես SMS ծրագիր` օգտագործե՞լ <xliff:g id="NEW_APP">%s</xliff:g>-ը:"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Անհայտ SIM օպերատոր"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM օպերատորն անհայտ է"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s-ը չունի ոչ մի ծանոթ նախակարգման վեբկայք"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Խնդրում ենք տեղադրել SIM քարտ և վերագործարկել"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Խնդրում ենք միանալ ինտերնետին"</string>
@@ -1323,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="7923901846375587241">"Սխալի հաղորդման դյուրանցում"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Արագ կարգավորումներում ցուցադրել սխալի հաղորդման կոճակը"</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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Ընտրել աշխատաժամանակը"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Վերաբեռնե՞լ՝ աշխատաժամանակը <xliff:g id="OLD">%1$s</xliff:g>-ից <xliff:g id="NEW">%2$s</xliff:g>-ին փոխելու համար:"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Անլար էկրանի վկայագրում"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Միացնել WiFi-ի մանրամասն գրանցամատյանը"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Ցույց տալ անլար էկրանի վկայագրման ընտրանքները"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Բարձրացնել Wifi-ի գրանցման մակարդակը, WiFi-ի ընտրիչում ցուցադրել RSSI ըստ SSID-ի"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Թույատրել կեղծ տեղադրությունները"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Թույլ տալ կեղծ տեղադրություններ"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Թույլատրե՞լ USB-ի վրիպազերծումը:"</string>
@@ -1493,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Շարժական ցանցի ազդանշանը"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Սարքի արթնանալու ժամանակը"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi‑Fi ժամանակին"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi-ը ժամանակին"</string>
@@ -1678,8 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Հեռացնել բոլոր վկայագրերը"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Վստահելի վկայագրեր"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Ցույց տալ վստահելի CA վկայագրերը"</string>
-    <!-- no translation found for advanced_security_title (2434776238010578865) -->
-    <skip />
     <string name="credential_storage_type" msgid="8629968543494001364">"Պահոցի տեսակը"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Պահուստավորված սարք"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Միայն ծրագրային"</string>
@@ -1763,8 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Հպեք "<b>"Հաջորդը"</b>"` կարգավորումը շարունակելու համար: \n\nՀպեք "<b>"Հետ"</b>"` մեկ այլ Wi‑Fi ցանցի միանալու համար:"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Համաժամեցումն ակտիվացված է"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Համաժամեցումը անջատված է"</string>
-    <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
-    <skip />
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Համաժամեցման սխալ:"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Համաժամեցումը ձախողվեց"</string>
     <string name="sync_active" msgid="8476943765960863040">"Համաժամեցումն ակտիվ է"</string>
@@ -1811,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Մուտքագրեք ձեր PIN-ը՝ հիշողության պահեստն ապակոդավորելու համար"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Նկարեք ձեր նախշը՝ հիշողության պահեստն ապակոդավորելու համար"</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>
@@ -2100,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Լուսանկարել"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Ընտրել լուսանկար Պատկերասրահից"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC-ով Էկրանի կողպման կարգավորումներ"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Զուգավորված պիտակներ"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Միացված է"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Զուգավորել պիտակով"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Զուգավորել հիմա"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Պիտակը ուղիղ դրեք սեղանին և վերևից՝ հեռախոսը"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Պիտակը և հեռախոսը հաջողությամբ զուգավորվեցին:"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Տվյալ պիտակը չի կարող օգտագործվել ձեր հեռախոսն ապակողպելու համար"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Ձեր պիտակի հետ զուգավորումը ձախողվեց, փորձեք նորից"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC-ն միացված չէ, իսկ NFC ապակողպման համար այն անհրաժեշտ է: Միացրեք NFC-ն:"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC կարգավորումներ"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Կարգավորումներ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Կարգավորումներ"</string>
     <string name="search_menu" msgid="7053532283559077164">"Որոնել"</string>
@@ -2107,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Կարգավորել 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>
@@ -2115,43 +2132,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"Ծանուցման ձայնի բարձրություն"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Զանգեր և ծանուցումներ ստանալիս"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Երբ ծանուցումները ժամանեն"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Ծանուցումների կանխադրված զանգերանգը"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Թրթռալ զանգելիս"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Ծանուցումների ցուցադրում"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Ծանուցման լույսի թարթում"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Երբ սարքը կողպված է"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Այլ ձայներ"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Թվաշարի հնչերանգները"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Էկրանի կողպման ձայներ"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Միակցման ձայներ"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Հպման ձայներ"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Թրթրռալ հպումից"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Նվագարկել միակցիչի բարձրախոսով"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Բոլոր աուդիոֆայլերը"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Միայն մեդիակրիչի աուդիոֆայլերը"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Լուռ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Զգուշացում"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Թրթռալ"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Մուտք ծանուցումներին"</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>
@@ -2171,18 +2200,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2201,6 +2236,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-in/arrays.xml
index 8fa16c4..a7fa186 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Tidak Ada"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Auto Konfigurasi Proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Mati"</item>
+    <item msgid="3165868966179561687">"Lansiran"</item>
+    <item msgid="6038758039030476855">"Getar"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Tak Satu Pun"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Nonaktif"</item>
     <item msgid="2751513398307949636">"Di layar dalam bentuk batang"</item>
-    <item msgid="1851438178120770973">"Di adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Di layar dalam bentuk garis"</item>
+    <item msgid="120512413928262547">"Di adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Nonaktif"</item>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5765c18..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="7617195369015536614">"Nirkabel &amp; Jaringan"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Perangkat"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Pribadi"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Waktu AKTIF layar:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Tidak diketahui"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengisi daya"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Mengisi daya pada AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Isi daya lewat USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Isi daya nirkabel"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(nirkabel)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Tidak mengisi daya"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengisi daya"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Bidang port harus kosong jika bidang host kosong."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang Anda ketik tidak valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh browser, namun tidak boleh digunakan oleh apl lain."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID bersebelahan:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Setelan"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan setelan"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mode pesawat"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC &amp; lainnya"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Selengkapnya..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Jaringan &amp; nirkabel"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Kelola Wi-Fi, Bluetooth, mode pesawat, jaringan seluler, &amp; VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming data"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info pemilik"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktifkan widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Dinonaktifkan oleh administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Buka kunci NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ketikkan teks untuk ditampilkan pada layar kunci"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tampilkan info pengguna pada layar pengunci"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Dienkripsi"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Anda dapat mengenkripsi akun, setelan, aplikasi yang diunduh serta datanya, media, dan file Anda lainnya. Setelah mengenkripsi tablet, asumsikan Anda telah menyiapkan kunci layar (berupa pola, PIN numerik, atau sandi), Anda perlu membuka layar untuk mendekripsi tablet setiap kali menyalakannya. Satu-satunya cara lain untuk dekripsi adalah mengembalikan ke setelan pabrik yang akan menghapus semua data Anda.\n\nProses enkripsi membutuhkan waktu satu jam atau lebih. Anda perlu memulainya dengan baterai yang terisi dan mencolokkan tablet ke sumber listrik selama proses berlangsung. Jika Anda menginterupsi, semua atau beberapa data akan hilang."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Anda dapat mengenkripsi akun, setelan, aplikasi yang diunduh serta datanya, media, dan file Anda lainnya. Setelah mengenkripsi ponsel, asumsikan Anda telah menyiapkan kunci layar (berupa pola, PIN numerik, atau sandi), Anda perlu membuka layar untuk mendekripsi ponsel setiap kali menyalakannya. Satu-satunya cara lain untuk dekripsi adalah mengembalikannya ke setelan pabrik yang akan menghapus semua data Anda.\n\nProses enkripsi membutuhkan waktu satu jam atau lebih. Anda perlu memulainya dengan baterai yang terisi dan mencolokkan ponsel ke sumber listrik selama proses berlangsung. Jika Anda menginterupsi, semua atau beberapa data akan hilang."</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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Tulis ke tag NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Tingkat kecerahan"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Sesuaikan kecerahan layar"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan adaptif"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalkan tingkat kecerahan untuk cahaya yang tersedia"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ubah aplikasi SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> dan bukan <xliff:g id="CURRENT_APP">%2$s</xliff:g> sebagai aplikasi SMS Anda?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> sebagai aplikasi SMS Anda?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operator SIM tidak dikenal"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operator SIM tidak dikenal"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s tak punya situs web penyediaan yang dikenal"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Masukkan kartu SIM dan mulai ulang"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sambungkan ke internet"</string>
@@ -1322,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="7923901846375587241">"Pintasan laporan bug"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Tampilkan tombol di Setelan Cepat 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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pilih waktu operasi"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Nyalakan ulang untuk mengubah waktu operasi dari <xliff:g id="OLD">%1$s</xliff:g> ke <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Sertifikasi layar nirkabel"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktifkan Pencatatan Log Panjang Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Tampilkan opsi untuk sertifikasi layar nirkabel"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Tinggikan level pengelogan Wi-Fi, tampilkan per SSID RSSI di Alat Pilih Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Izinkan melakukan debug USB?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sinyal jaringan seluler"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>.00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Waktu bangun perangkat"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi berdasarkan waktu"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi berdasarkan waktu"</string>
@@ -1614,7 +1621,8 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Tinggi nada"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Mempengaruhi nada teks yang disampaikan"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Bahasa"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Gunakan bahasa sistem"</string>
+    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
+    <skip />
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Bahasa tidak dipilih"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Menyetel suara spesifik bahasa untuk teks lisan"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Dengarkan contoh"</string>
@@ -1677,7 +1685,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Hapus semua sertifikat"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Kredensial tepercaya"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Tampilkan sertifikat CA tepercaya"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Lanjutan"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Jenis penyimpanan"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Menggunakan perangkat keras"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Khusus perangkat lunak"</string>
@@ -1761,7 +1768,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan.\n\nSentuh "<b>"Kembali"</b>" untuk menyambung ke jaringan Wi-Fi lain."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasi diaktifkan"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasi dinonaktifkan"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sedang menyinkronkan"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Kesalahan sinkronisasi."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sinkronisasi gagal"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sinkronisasi aktif"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Masukkan PIN untuk mendekripsi penyimpanan"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Gambar pola 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>
@@ -2062,7 +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>
-    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Pilih aplikasi latar depan"</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>
@@ -2097,6 +2106,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ambil foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Pilih foto dari Galeri"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Setelan Kunci Layar NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Tag Tersanding"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktif"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sandingkan dengan tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sandingkan sekarang"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Atur tag rata di atas meja dan taruh telepon di atasnya"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tag dan telepon berhasil disandingkan, selesai!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Tag yang diberikan tidak dapat digunakan untuk membuka kunci telepon Anda"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Gagal menyandingkan dengan tag Anda, harap coba lagi"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC tidak diaktifkan dan dibutuhkan untuk Membuka Kunci NFC. Harap aktifkan NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Setelan NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Setelan"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setelan"</string>
     <string name="search_menu" msgid="7053532283559077164">"Telusuri"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2112,43 +2134,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Suara &amp; Pemberitahuan"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume media"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume alarm"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume dering"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume pemberitahuan"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Saat ada panggilan telepon dan pemberitahuan"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Saat pemberitahuan datang"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Deringkan"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Bergetar, jangan berdering"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Jangan berdering atau bergetar"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Nada dering pemberitahuan default"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Bergetar saat berdering"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Menampilkan pemberitahuan"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Kedipkan lampu pemberitahuan"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Saat perangkat terkunci"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Jangan tampilkan pemberitahuan sama sekali"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Saat jangan ganggu diaktifkan"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Sembunyikan pemberitahuan baru dari daftar"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Tampilkan semua pemberitahuan di daftar"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Suara lainnya"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Nada tombol nomor"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Suara kunci layar"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Memasang suara di dok"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Suara sentuhan"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Bergetar saat disentuh"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Dok pemutaran speaker"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Semua audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Hanya audio media"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Senyap"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Lansiran"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Getar"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Akses pemberitahuan"</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>
@@ -2168,18 +2202,24 @@
     <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="3025242591043646494">"Tampilkan di bagian atas daftar"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Sembunyikan konten sensitif saat perangkat terkunci"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Diblokir"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Bagian atas daftar"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2238,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Aktif"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Nonaktif"</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/arrays.xml b/res/values-it/arrays.xml
index 3629fe6..5d802b6 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nessuno"</item>
     <item msgid="8673874894887358090">"Manuale"</item>
-    <item msgid="168893341855953140">"Config. automatica proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"OFF"</item>
+    <item msgid="3165868966179561687">"Avviso"</item>
+    <item msgid="6038758039030476855">"Vibrazione"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Nessuno"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"OFF"</item>
     <item msgid="2751513398307949636">"Su schermo sotto forma di barre"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Su schermo sotto forma di linee"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"OFF"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 4705561..02065d6 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Tempo accensione schermo:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Sconosciuta"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"In carica"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"In carica tramite CA"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"In carica tramite USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"In carica, wireless"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Non in carica"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Non in carica"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Carica"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Il campo Porta deve essere vuoto se il campo Host è vuoto."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"La porta specificata non è valida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Il proxy HTTP viene utilizzato dal browser ma potrebbe non essere utilizzato da altre applicazioni."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posizione:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID adiacente:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Impostazioni"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Scorciatoia Impostazioni"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modalità aereo"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC e altre"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Altro..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless e reti"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Gestisci Wi‑Fi, Bluetooth, modalità aereo, reti mobili e VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming dati"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info proprietario"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Abilita widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Disattivati dall\'amministratore"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Sblocco NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digita testo da visualizzare su blocco schermo"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostra info utente in schermata blocco"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Scrivi su tag NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Livello di luminosità"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Regola la luminosità dello schermo"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosità adattiva"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Ottimizza il livello di luminosità per la luce disponibile"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Cambiare app per gli SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizzare <xliff:g id="NEW_APP">%1$s</xliff:g> anziché <xliff:g id="CURRENT_APP">%2$s</xliff:g> come app per gli SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizzare <xliff:g id="NEW_APP">%s</xliff:g> come app per gli SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operatore SIM sconosciuto"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operatore SIM sconosciuto"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Nessun sito web di provisioning per %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Inserisci la scheda SIM e riavvia"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Connettiti a Internet"</string>
@@ -1322,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="7923901846375587241">"Scorciatoria segnalazione bug"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Mostra un pulsante per segnalare i bug in Impostazioni rapide"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Seleziona runtime"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Riavviare per modificare runtime da <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificazione display wireless"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Abilita registrazione WiFi dettagliata"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra opzioni per la certificazione display wireless"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumenta livello di registrazione WiFi, mostra in base a SSID RSSI in WiFi Picker"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Consentire debug USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Segnale rete mobile"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Tempo di attività dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo accensione Wi‑Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo accensione Wi‑Fi"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Rimuovi tutti i certificati"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenziali attendibili"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visualizza certificati CA attendibili"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avanzate"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipo di archivio"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Basato sull\'hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione.\n\nTocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizzazione abilitata"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizzazione disabilata"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sincronizzazione in corso"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Errore di sincronizzazione."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sincronizzazione non riuscita"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sincronizzazione attiva"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Scatta foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Scegli la foto dalla Galleria"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Impostazioni di blocco dello schermo NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Dispositivi tag accoppiati"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Attivo"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Accoppia con un tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Accoppia ora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Posiziona il dispositivo tag in orizzontale su un piano e poggia sopra il telefono"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Dispositivo tag e telefono accoppiati correttamente. Operazione completata."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Il dispositivo tag indicato non può essere utilizzato per sbloccare il telefono"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Accoppiamento con il dispositivo tag non riuscito, riprova"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"La comunicazione NFC non è attiva ed è necessaria per la funzione Sblocco NFC. Attiva NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Impostazioni NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Impostazioni"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Impostazioni"</string>
     <string name="search_menu" msgid="7053532283559077164">"Cerca"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configura tag NFC Wi-Fi"</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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Volume notifiche"</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_title_novoice" msgid="4628028304587795604">"Quando ricevo le 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Altri suoni"</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="1340569241625989837">"Toni di blocco schermo"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Suoni dock"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Suoni alla pressione"</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="dock_audio_media_title" msgid="1346838179626123900">"Riproduzioni con altoparlanti dock"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tutti i dispositivi audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Dispositivi di solo audio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silenzioso"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Avviso acustico"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrazione"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Attiva"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Non attiva"</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/arrays.xml b/res/values-iw/arrays.xml
index e77a0b5..f5373de 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"ללא"</item>
     <item msgid="8673874894887358090">"ידני"</item>
-    <item msgid="168893341855953140">"‏הגדרה אוטומטית לשרת proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"כבוי"</item>
+    <item msgid="3165868966179561687">"התראה"</item>
+    <item msgid="6038758039030476855">"רטט"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"ללא"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"כבוי"</item>
     <item msgid="2751513398307949636">"במסך כעמודות"</item>
-    <item msgid="1851438178120770973">"‏ב-adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"במסך כקווים"</item>
+    <item msgid="120512413928262547">"‏ב-adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"כבוי"</item>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index f6f3514..7a8717d 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"זמן פעולת המסך:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"לא ידוע"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"טוען"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"טוען בזרם חילופין"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"‏טוען ב-USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"טוען באופן אלחוטי"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(אלחוטי)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"לא בטעינה"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"לא טוען"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"מלא"</string>
@@ -203,7 +203,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">"‏שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך אפליקציות אחרות לא יכולים להשתמש בו."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"‏כתובת אתר של PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"‏כתובת אתר של PAC: "</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">"נתונים:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"הגדרות"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"קיצור דרך של הגדרות"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"מצב טיסה"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"‏NFC ועוד"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"עוד..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"אלחוטי ורשתות"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"‏ניהול Wi-Fi, ‏Bluetooth, מצב טיסה, רשתות סלולריות ורשתות VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"נדידת נתונים"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"פרטי בעלים"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"הפעל יישומי ווידג\'ט"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"הושבת על ידי מנהל המערכת"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"‏ביטול נעילת NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"הקלד טקסט להצגה בנעילת המסך"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"הצג פרטי משתמש במסך הנעילה"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"‏כתוב בתג NFC"</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>
@@ -618,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="2288214226916117159">"הזן את סיסמת הרשת שלך"</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>
@@ -735,10 +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="8480105032417444275">"רמת בהירות"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"התאם את בהירות המסך"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"בהירות מותאמת"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"התאם את רמת הבהירות ביחס לתאורה הזמינה"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"‏לשנות את אפליקציית ה-SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"‏האם להשתמש ב-<xliff:g id="NEW_APP">%1$s</xliff:g> במקום ב-<xliff:g id="CURRENT_APP">%2$s</xliff:g> כאפליקציית ה-SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"‏האם להשתמש ב-<xliff:g id="NEW_APP">%s</xliff:g> כאפליקציית ה-SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"‏מפעיל SIM לא ידוע"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"‏ספק SIM לא מוכר"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"‏ל-%1$s אין אתר מוכר לניהול תצורה"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"‏הכנס כרטיס SIM ואתחל"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"התחבר לאינטרנט"</string>
@@ -1322,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="7923901846375587241">"קיצור של דוח באגים"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"הצג לחצן ב\'הגדרות מהירות\' לדיווח על באג"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"בחירת זמן ריצה"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"האם לאתחל על מנת לשנות את זמן הריצה מ-<xliff:g id="OLD">%1$s</xliff:g> ל-<xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"‏אישור של תצוגת WiFi"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"‏הפעל רישום מפורט של WiFi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"‏הצג אפשרויות עבור אישור של תצוגת WiFi"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"‏העלה את רמת הרישום של WiFi, הצג לכל SSID RSSI ב-Wi-Fi Picker"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"‏לאפשר ניקוי באגים של USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"אות רשת לנייד"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>‏/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>‏/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"זמן פעולה של מכשיר"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi בזמן"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi בזמן"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"הסר את כל האישורים"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"אישורים מהימנים"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"‏הצג אישורי CA מהימנים"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"מתקדם"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"סוג אחסון"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"מגובה באמצעות חומרה"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"תוכנה בלבד"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"‏גע ב"<b>"הבא"</b>" כדי להמשיך בהגדרה.\n\nגע ב"<b>"הקודם"</b>" כדי להתחבר לרשת Wi-Fi אחרת."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"הסינכרון מופעל"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"הסינכרון מושבת"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"מסנכרן כעת"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"שגיאת סינכרון"</string>
     <string name="sync_failed" msgid="1696499856374109647">"הסנכרון נכשל"</string>
     <string name="sync_active" msgid="8476943765960863040">"סנכרון פעיל"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"צלם תמונה"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"בחר תמונה מתוך \'גלריה\'"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"‏הגדרות נעילת המסך של NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"תגים מותאמים"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"מופעל"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"התאם באמצעות תג"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"התאם עכשיו"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"הנח את התג באופן שטוח על שולחן ומקם את הטלפון מעליו"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"התג והטלפון הותאמו בהצלחה. סיימת!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"לא ניתן להשתמש בתג שסופק על מנת לבטל את נעילת הטלפון"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"ההתאמה לתג שלך נכשלה. נסה שוב."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"‏NFC לא הופעל ויש בו צורך עבור ביטול נעילת NFC. הפעל את ה-NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"‏הגדרות NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"הגדרות"</string>
     <string name="search_results_title" msgid="1796252422574886932">"הגדרות"</string>
     <string name="search_menu" msgid="7053532283559077164">"חפש"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"‏הגדר תג 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>
@@ -2116,10 +2128,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"עוצמת קול של מדיה"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"עוצמת קול של התראה"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"עוצמת צלצול"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"עוצמת קול של הודעות"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"נא לא להפריע"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"כשנכנסות שיחות והודעות"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"כשנכנסות הודעות"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"צלילים אחרים"</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="1340569241625989837">"צלילי נעילת מסך"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"צלילים בעגינה"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"צלילי מגע"</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="dock_audio_media_title" msgid="1346838179626123900">"רמקול בעגינה מופעל"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"כל האודיו"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"רק אודיו של מדיה"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"מצב שקט"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"התראה"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"רטט"</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">
@@ -2198,6 +2201,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-ja/arrays.xml
index 9cea88c..622efff 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"なし"</item>
     <item msgid="8673874894887358090">"手動"</item>
-    <item msgid="168893341855953140">"プロキシの自動設定"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"OFF"</item>
+    <item msgid="3165868966179561687">"アラート"</item>
+    <item msgid="6038758039030476855">"バイブレーション"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"なし"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"OFF"</item>
     <item msgid="2751513398307949636">"バーとして画面に表示"</item>
-    <item msgid="1851438178120770973">"adb shell dumpsys gfxinfoを使用"</item>
+    <item msgid="8272260411216018353">"行として画面に表示"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfoを使用"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"OFF"</item>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 86576d3..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"画面の点灯時間"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"不明"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"ACで充電しています"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USBで充電しています"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"無線で充電しています"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"（無線）"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"充電していません"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"充電していません"</string>
     <!-- String.format failed for translation -->
@@ -205,7 +209,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_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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">"セル情報:"</string>
@@ -278,7 +282,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"設定をショートカットとする"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"機内モード"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFCなど"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"その他..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線とネットワーク"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi、Bluetooth、機内モード、モバイルネットワーク、VPNの設定"</string>
     <string name="roaming" msgid="3596055926335478572">"データローミング"</string>
@@ -319,6 +323,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"所有者情報"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ウィジェットの有効化"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"管理者によって無効にされています"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFCロック解除"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"ロック画面に表示するテキストを入力します"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"ロック画面にユーザー情報を表示"</string>
@@ -334,8 +339,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"タブレットの暗号化"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"端末の暗号化"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"暗号化されています"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。タブレットを暗号化すると、画面ロック（パターン、数値PIN、パスワード）を設定済みの場合は、電源を入れるたびに画面のロックを解除してタブレットを復号化する必要があります。暗号化を解除するには、データの初期化を行ってすべてのデータを消去しなければなりません。\n\n暗号化には1時間以上かかります。開始する前に完全に充電し、暗号化が完了するまでタブレットと電源を接続しておく必要があります。中断すると、一部またはすべてのデータが失われます。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"アカウント、設定、ダウンロードしたアプリとそのデータ、メディアなどのファイルを暗号化できます。携帯電話を暗号化すると、画面ロック（パターン、数値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>
@@ -571,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFCタグに書き込む"</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>
@@ -620,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="2288214226916117159">"ネットワークパスワードを入力してください"</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>
@@ -737,10 +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="8480105032417444275">"明るさのレベル"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"画面の明るさを調整する"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"明るさの自動調節"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"周囲に合わせて明るさを最適化する"</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>
@@ -992,7 +1004,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMSアプリを変更しますか？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMSアプリとして<xliff:g id="CURRENT_APP">%2$s</xliff:g>の代わりに<xliff:g id="NEW_APP">%1$s</xliff:g>を使用しますか？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMSアプリとして<xliff:g id="NEW_APP">%s</xliff:g>を使用しますか？"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"不明なSIM事業者"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"不明なSIM事業者"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$sには既知のプロビジョニングウェブサイトがありません"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIMカードを挿入して再起動してください"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"インターネットに接続してください"</string>
@@ -1324,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="7923901846375587241">"バグレポートのショートカット"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"バグレポートにアクセスするボタンをクイック設定に表示する"</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>
@@ -1334,9 +1348,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"ランタイムを選択"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"再起動して、ランタイムを<xliff:g id="OLD">%1$s</xliff:g>から<xliff:g id="NEW">%2$s</xliff:g>に変更しますか？"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ワイヤレスディスプレイ認証"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Wi-Fi詳細ログの有効化"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ワイヤレスディスプレイ認証のオプションを表示"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wi-Fiログレベルを上げて、Wi-Fi選択ツールでSSID RSSIごとに表示"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USBデバッグを許可しますか？"</string>
@@ -1494,11 +1506,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"モバイルネットワークの電波"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"午前<xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"午後<xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"端末使用時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-FiをONにしている時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-FiをONにしている時間"</string>
@@ -1683,7 +1690,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"証明書をすべて削除する"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信頼できる認証情報"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"信頼できるCA証明書を表示する"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"詳細設定"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"ストレージのタイプ"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ハードウェア式"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ソフトウェアのみ"</string>
@@ -1767,7 +1773,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"セットアップを続けるには["<b>"次へ"</b>"]をタップします。\n\n別のWi-Fiネットワークに接続するには["<b>"戻る"</b>"]をタップします。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同期が有効です"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同期は無効になっています"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"同期しています"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同期エラー。"</string>
     <string name="sync_failed" msgid="1696499856374109647">"同期失敗"</string>
     <string name="sync_active" msgid="8476943765960863040">"同期有効"</string>
@@ -1814,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"ストレージを復号化するにはPINを入力してください"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"ストレージを復号化するにはパターンを入力してください"</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>
@@ -2103,6 +2110,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"写真を撮影"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ギャラリーから画像を選ぶ"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC画面ロック設定"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ペア設定したタグ"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"有効"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"タグをペアに設定"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"今すぐペア設定を行う"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"タグをテーブルの上に水平に配置し、端末を上部に置いてください"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"タグと端末のペア設定が完了しました。"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"このタグは端末のロック解除には使用できません"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"タグをペアに設定できませんでした。もう一度お試しください。"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFCは無効になっていますが、NFCロック解除に必要です。NFCをONにしてください。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC設定"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="7053532283559077164">"検索"</string>
@@ -2110,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2118,43 +2138,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"通知の音量"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"通話と通知が着信したとき"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"通知を受信したとき"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"着信音"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"バイブレーション（着信音なし）"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"着信音とバイブレーションをOFF"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"デフォルトの通知音"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"着信時のバイブレーション"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"通知の表示"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"光を点滅させて通知"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"端末がロックされているとき"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"すべての通知を表示しない"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"[通知を非表示]がONのとき"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"リストから新しい通知を隠す"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"リストにすべての通知を表示する"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"その他の音"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"ダイヤルパッドの操作音"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"画面ロック音"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"装着音"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"タッチ操作音"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"タッチ操作バイブ"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"ホルダースピーカーでの再生"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"すべて音声"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"メディアの音声のみ"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"マナーモード"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"アラート"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"バイブレーション"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"通知へのアクセス"</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>
@@ -2174,18 +2206,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">"、"</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>
@@ -2204,6 +2242,8 @@
     <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">"ON"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"OFF"</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/arrays.xml b/res/values-ka-rGE/arrays.xml
index e4df8e4..0e406e5 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"არცერთი"</item>
     <item msgid="8673874894887358090">"მექანიკურად"</item>
-    <item msgid="168893341855953140">"პროქსის ავტოკონფიგურაცია"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"გამორთული"</item>
+    <item msgid="3165868966179561687">"გაფრთხილება"</item>
+    <item msgid="6038758039030476855">"ვიბრაცია"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"არც ერთი"</item>
@@ -432,7 +436,12 @@
     <item msgid="675719912558941285">"დახატე არა მართკუთხა მოჭრის რეგიონი ლურჯად"</item>
     <item msgid="1064373276095698656">"ხატვის ტესტირებული ბრძანების მწვანე ფერით მონიშვნა"</item>
   </string-array>
-    <!-- no translation found for track_frame_time_entries:2 (1851438178120770973) -->
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"გამორთვა"</item>
+    <item msgid="2751513398307949636">"ეკრანზე ზოლების სახით"</item>
+    <item msgid="8272260411216018353">"ეკრანზე ხაზების სახით"</item>
+    <item msgid="120512413928262547">"„adb shell dumpsys gfxinfo“-ში"</item>
+  </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"გამორთვა"</item>
     <item msgid="7688197031296835369">"overdraw არეების ჩვენება"</item>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index e87700e..89a4256 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"ეკრანის ჩართვის დრო"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"უცნობი"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"იტენება"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"დატენვა ელკვებაზე"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"დატენვა USB-ზე"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"დატენვა უსადენოდ"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(უსადენო)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"არ იტენება"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"არ იტენება"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ბატარეა დატენილია"</string>
@@ -203,7 +203,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_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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">"ქსელის ინფო:"</string>
@@ -276,8 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"პარამეტრები"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"პარამეტრების მალსახმობი"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"თვითმფრინავის რეჟიმი"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"სხვა…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"უსადენო კავშირი და ქსელები"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, თვითმფრინავის რეჟიმის, მობილურ ქსელებთან კავშირის და VPN-ების მართვა"</string>
     <string name="roaming" msgid="3596055926335478572">"ინტერნეტის როუმინგი"</string>
@@ -318,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"მფლობელის ინფორმაცია"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ვიჯეტების ჩართვა"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"გამორთულია ადმინისტრატორის მიერ"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC განბლოკვა"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"აკრიფეთ ტექსტი დაბლოკვის ეკრანზე საჩვენებლად"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"მომხმარებლის ინფორმაციის დაბლოკილ ეკრანზე ჩვენება"</string>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC თეგზე ჩაწერა"</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>
@@ -619,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="2288214226916117159">"შეიყვანეთ თქვენი ქსელის პაროლი"</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>
@@ -736,10 +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="8480105032417444275">"სიკაშკაშის დონე"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"ეკრანის სინათლის შესწორება"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"მორგებადი სიკაშკაშე"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"სიკაშკაშის არსებულ სინათლეზე მორგება"</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>
@@ -991,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"შეიცვალოს SMS-ის აპი?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"გსურთ, <xliff:g id="CURRENT_APP">%2$s</xliff:g>-ის ნაცვლად გამოიყენოთ <xliff:g id="NEW_APP">%1$s</xliff:g> თქვენს SMS აპად?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"გსურთ, გამოიყენოთ <xliff:g id="NEW_APP">%s</xliff:g> თქვენს SMS აპად?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"უცნობი SIM-ოპერატორი"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"SIM-ის ოპერატორი უცნობია"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s-ს განთავსების ნაცნობი საიტი არ გააჩნია"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"გთხოვთ, ჩადოთ SIM ბარათი და გადატვირთოთ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"გთხოვთ, დააკავშიროთ ინტერნეტთან"</string>
@@ -1323,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="7923901846375587241">"ხარვეზის შეტყობინების მალსახმობი"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"სწრაფ პარამეტრებსი ხარვეზის შეტყობინების ღილაკის ჩვენება"</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>
@@ -1333,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"აირჩიეთ runtime"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"გსურთ გადატვირთოთ, რათა შეიცვალოს runtime <xliff:g id="OLD">%1$s</xliff:g>-დან <xliff:g id="NEW">%2$s</xliff:g>-ზე?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"უსადენო ეკრანის სერტიფიცირება"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"WiFi დაწვრილებითი ჟურნალიზაციის ჩართვა"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"უსადენო ეკრანის სერტიფიცირების ვარიანტების ჩვენება"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wifi ჟურნალიზაციის დონის ამაღლება, WiFi ამომრჩევში ყოველ SSID RSSI-ზე ჩვენება"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ფიქტიური მდებარეობების დაშვება"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ფიქტიური მდებარეობების დაშვება"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"ჩავრთო USB გამართვა?"</string>
@@ -1493,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"მობილური ქსელის სიგნალი"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"მოწყობილობის ღვიძილის დრო"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi-ს მუშაობის დრო"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi‑Fi მუშაობის დრო"</string>
@@ -1678,8 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"წაშალეთ ყველა სერტიფიკატი"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"საიმედო სერტიფიკატები"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"სანდო CA სერტიფიკატის ჩვენება"</string>
-    <!-- no translation found for advanced_security_title (2434776238010578865) -->
-    <skip />
     <string name="credential_storage_type" msgid="8629968543494001364">"საცავის ტიპი"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"აპარატურული"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"მხოლოდ პროგრამული"</string>
@@ -1763,8 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"შეეხეთ "<b>"შემდეგს"</b>" პარამეტრების დაყენების გასაგრძელებლად.\n\nშეეხეთ ღილაკს "<b>"უკან"</b>" სხვა Wi‑Fi ქსელთან დასაკავშირებლად."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"სინქრონიზაცია ჩართულია"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"სინქრონიზაცია გამორთულია"</string>
-    <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
-    <skip />
     <string name="accessibility_sync_error" msgid="8703299118794272041">"სინქრონიზაციის შეცდომა."</string>
     <string name="sync_failed" msgid="1696499856374109647">"სინქრონიზაცია ვერ შესრულდა"</string>
     <string name="sync_active" msgid="8476943765960863040">"სინქრონიზაცია გააქტივირებულია"</string>
@@ -2100,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ფოტოს გადაღება"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"გალერეიდან სურათის არჩევა"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC ეკრანის ჩაკეტვის პარამეტრები"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"დაწყვილებული თეგები"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"ჩართული"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"თეგთან დაწყვილება"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"ახლა დაწყვილება"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"დააყენეთ თეგი ბრტყლად მაგიდაზე და მოათავსეთ ტელეფონი მასზე"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"თეგი და ტელეფონი წარმატებით დაწყვილდა. პროცესი დასრულებულია!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"მოწოდებული თეგით თქვენი ტელეფონის განბლოკვა ვერ ხერხდება"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"თქვენი თეგით დაწყვილება ვერ განხორციელდა. გთხოვთ, სცადოთ ისევ"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC არ არის ჩართული, თუმცა აუცილებელია NFC განბლოკისთვის. გთხოვთ, ჩართოთ NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC პარამეტრები"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"პარამეტრები"</string>
     <string name="search_results_title" msgid="1796252422574886932">"პარამეტრები"</string>
     <string name="search_menu" msgid="7053532283559077164">"ძიება"</string>
@@ -2107,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2119,10 +2128,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"მედიის ხმა"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"მაღვიძარას ხმა"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"ზარის სიმძლავრე"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"შეტყობინების ხმა"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"არ შემაწუხოთ"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"ზარების და შეტყობინებების შემოსვლისას"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"შეტყობინებების შემოსვლისას"</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>
@@ -2139,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"სხვა ხმები"</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="1340569241625989837">"ეკრანის ჩაკეტვის ხმები"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Docking ხმები"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"შეხების ხმები"</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="dock_audio_media_title" msgid="1346838179626123900">"Dock სპიკერები უკრავს"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ყველა აუდიო"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"მხოლოდ მედიას აუდიო"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"დადუმებული"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"გაფრთხილება"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ვიბრაცია"</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">
@@ -2201,6 +2201,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-km-rKH/arrays.xml
index 66972c2..cd4dc2d 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"គ្មាន"</item>
     <item msgid="8673874894887358090">"ដោយដៃ"</item>
-    <item msgid="168893341855953140">"រចនាសម្ព័ន្ធប្រូកស៊ីស្វ័យប្រវត្តិ"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"បិទ"</item>
+    <item msgid="3165868966179561687">"ជូនដំណឹង"</item>
+    <item msgid="6038758039030476855">"ញ័រ"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"គ្មាន"</item>
@@ -432,7 +436,12 @@
     <item msgid="675719912558941285">"គូរតំបន់កាត់មិនមែនរាងចតុកោណជាពណ៌ខៀវ"</item>
     <item msgid="1064373276095698656">"រំលេចពាក្យបញ្ជាគូរបានសាកល្បងជាពណ៌បៃតង"</item>
   </string-array>
-    <!-- no translation found for track_frame_time_entries:2 (1851438178120770973) -->
+  <string-array name="track_frame_time_entries">
+    <item msgid="2193584639058893150">"បិទ"</item>
+    <item msgid="2751513398307949636">"លើអេក្រង់ជារបារ"</item>
+    <item msgid="8272260411216018353">"លើអេក្រង់ជាបន្ទាត់"</item>
+    <item msgid="120512413928262547">"ក្នុង adb shell dumpsys gfxinfo"</item>
+  </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"បិទ"</item>
     <item msgid="7688197031296835369">"បង្ហាញតំបន់ដែលលើស"</item>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 00a2b1c..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"ពេលវេលាបើកអេក្រង់៖"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"មិនស្គាល់"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"កំពុងបញ្ចូលថ្ម"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"បញ្ចូលថ្មតាម AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"បញ្ចូលថ្មតាមយូអេសប៊ី"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"បញ្ចូលថ្មដោយឥតខ្សែ"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(ចរន្តឆ្លាស់)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(យូអេសប៊ី)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ឥតខ្សែ)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"មិនកំពុងបញ្ចូលថ្ម"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"មិនបញ្ចូលថ្ម"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ពេញ"</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_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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">"ព័ត៌មានចល័ត៖"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"ការកំណត់"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"កំណត់ផ្លូវកាត់"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"ពេលជិះយន្តហោះ"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"ច្រើនទៀត..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ឥតខ្សែ &amp; បណ្ដាញ"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"គ្រប់គ្រងវ៉ាយហ្វាយ, ប៊្លូធូស, របៀបពេលជិះយន្តហោះ, បណ្ដាញចល័ត &amp; VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"រ៉ូមីងទិន្នន័យ"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"ព័ត៌មានអំពីម្ចាស់"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"បើកធាតុក្រាហ្វិក"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"បានបិទដោយអ្នកគ្រប់គ្រង"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"ដោះសោ NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"បញ្ចូលអត្ថបទ ដើម្បីបង្ហាញលើអេក្រង់ចាក់សោ"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"បង្ហាញព័ត៌មានអ្នកប្រើលើអេក្រង់ចាក់សោ"</string>
@@ -333,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"ដាក់លេខកូដកុំព្យូទ័របន្ទះ"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"ដាក់លេខកូដទូរស័ព្ទ"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"បានដាក់លេខកូដ"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"អ្នកអាចដាក់លេខកូដគណនីរបស់អ្នក, ការកំណត់, កម្មវិធីដែលបានទាញយក និងទិន្នន័យរបស់វា, មេឌៀ, និងឯកសារផ្សេងទៀត។ បន្ទាប់ពីអ្នកបានដាក់លេខកូដកុំព្យូទ័របន្ទះរបស់អ្នក, សន្មតថាអ្នកបានកំណត់ការចាក់សោអេក្រង់ (គឺអាចជាលំនាំ, លេខកូដ PIN ឬជាពាក្យសម្ងាត់) អ្នកត្រូវដោះសោអេក្រង់ ដើម្បីដោះលេខកូដកុំព្យូទ័របន្ទះរៀងរាល់ពេលដែលអ្នកបើក។ វិធីផ្សេងទៀតតែមួយគត់ដើម្បីដោះលេខកូដ គឺត្រូវកំណត់ឡើងវិញទៅទិន្នន័យពីរោងចក្រ ឬលុបទិន្នន័យរបស់អ្នកទាំងអស់ចោល។\n\nការដាក់លេខកូដត្រូវប្រើពេលមួយម៉ោង ឬច្រើនជាងនេះ។ អ្នកត្រូវតែចាប់ផ្តើមធ្វើវាដោយការបញ្ចូលថ្ម ហើយរក្សាកុំព្យូទ័របន្ទះរបស់អ្នកឲ្យនៅដោតជាប់រហូតដល់ចប់ដំណើរការ។ បើអ្នកផ្អាក ទិន្នន័យមួយចំនួន ឬទិន្នន័យទាំងអស់របស់អ្នកបាត់បង់។"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"អ្នកអាចដាក់លេខកូដគណនីរបស់អ្នក, ការកំណត់, កម្មវិធីដែលបានទាញយក និងទិន្នន័យរបស់វា, មេឌៀ, និងឯកសារផ្សេងទៀត។ បន្ទាប់ពីអ្នកបានដាក់លេខកូដទូរស័ព្ទរបស់អ្នក, សន្មតថាអ្នកបានកំណត់ការចាក់សោអេក្រង់ (គឺអាចជាលំនាំ, លេខកូដ 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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"សរសេរទៅស្លាកអិនអេហ្វស៊ី"</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>
@@ -619,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="2288214226916117159">"បញ្ចូលពាក្យសម្ងាត់បណ្ដាញរបស់អ្នក"</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>
@@ -736,10 +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="8480105032417444275">"កម្រិតពន្លឺ"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"កែពន្លឺអេក្រង់"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"ពន្លឺអាចកែតម្រូវបាន"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"ធ្វើឲ្យកម្រិតពន្លឺច្បាប់សម្រាប់ពន្លឺដែលមាន"</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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"ប្ដូរកម្មវិធីសារ SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ប្រើ <xliff:g id="NEW_APP">%1$s</xliff:g> ជំនួសឲ្យ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ជាកម្មវិធីសារ SMS របស់អ្នក?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ប្រើ <xliff:g id="NEW_APP">%s</xliff:g> ជាកម្មវិធីសារ SMS របស់អ្នក?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"មិនស្គាល់ប្រតិបត្តិករស៊ីមកាត"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"មិនស្គាល់ប្រតិបត្តិករស៊ីមកាត"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s គ្មានតំបន់បណ្ដាញដែលផ្ដល់បានស្គាល់"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"សូមបញ្ចូលស៊ីមកាត និងចាប់ផ្ដើមឡើងវិញ"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"សូមភ្ជាប់អ៊ីនធឺណិត"</string>
@@ -1323,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="7923901846375587241">"ផ្លូវការរាយការណ៍កំហុស"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"បង្ហាញប៊ូតុងក្នុងការចាប់ផ្ដើមរហ័ស ដើម្បីយករបាយការណ៍កំហុស"</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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"ជ្រើសពេលវេលាដំណើរការ"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"ចាប់ផ្ដើមឡើងវិញ ដើម្បីប្ដូរពេលវេលាដំណើរការពី <xliff:g id="OLD">%1$s</xliff:g> ទៅ <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"បង្ហាញការកំណត់រចនាសម្ព័ន្ធឥតខ្សែ"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"បើកការចុះកំណត់ហេតុបរិយាយវ៉ាយហ្វាយ"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"បង្ហាញជម្រើសសម្រាប់វិញ្ញាបនបត្របង្ហាញឥតខ្សែ"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"បង្កើនកម្រិតកំណត់ហេតុវ៉ាយហ្វាយ បង្ហាញ SSID RSSI ក្នុងកម្មវិធីជ្រើសវ៉ាយហ្វាយ"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ឲ្យក្លែងទីតាំង"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"អនុញ្ញាតទីតាំងក្លែងក្លាយ"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"អនុញ្ញាតការកែកំហុសយូអេសប៊ី?"</string>
@@ -1493,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"សញ្ញាបណ្ដាញចល័ត"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> ព្រឹក"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> ល្ងាច"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"ពេលវេលាភ្ញាក់របស់ឧបករណ៍"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"ពេលវេលាបើកវ៉ាយហ្វាយ"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ពេលវេលាបើកវ៉ាយហ្វាយ"</string>
@@ -1678,8 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"លុបវិញ្ញាបនបត្រទាំងអស់"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"អត្តសញ្ញាណដែលទុកចិត្ត"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"បង្ហាញវិញ្ញាបនបត្រ CA ដែលទុកចិត្ត"</string>
-    <!-- no translation found for advanced_security_title (2434776238010578865) -->
-    <skip />
     <string name="credential_storage_type" msgid="8629968543494001364">"ប្រភេទឧបករណ៍ផ្ទុក"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"កន្លែងផ្ទុករបស់ផ្នែករឹង"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"កន្លែងផ្ទុករបស់កម្មវិធី"</string>
@@ -1763,8 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"ប៉ះ "<b>"បន្ទាប់"</b>" ដើម្បីបន្តការរៀបចំ។\n\nប៉ះ "<b>"ថយក្រោយ"</b>" ដើម្បីតភ្ជាប់បណ្ដាញវ៉ាយហ្វាយផ្សេង។"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"បានបើកការធ្វើសមកាលកម្ម"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"បានបិទការធ្វើសមកាលកម្ម"</string>
-    <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
-    <skip />
     <string name="accessibility_sync_error" msgid="8703299118794272041">"កំហុសការធ្វើសមកាលកម្ម។"</string>
     <string name="sync_failed" msgid="1696499856374109647">"ការធ្វើសមកាលកម្មបានបរាជ័យ"</string>
     <string name="sync_active" msgid="8476943765960863040">"ការធ្វើសមកាលកម្ម សកម្ម"</string>
@@ -1811,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"បញ្ចូលលេខកូដ PIN របស់អ្នក ដើម្បីដោះលេខកូដឧបករណ៍ផ្ទុក"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"គូរលំនាំរបស់អ្នកដើម្បីដោះលេខកូដឧបករណ៍ផ្ទុក"</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>
@@ -2100,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ថតរូប"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ជ្រើសរូបថតពីវិចិត្រសាល"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"កំណត់ការចាក់សោអេក្រង់ NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ស្លាកបានផ្គូផ្គង"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"បានបើក"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"ផ្គូជាមួយស្លាក"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"ផ្គូឥឡូវ"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"កំណត់ស្លាកផ្ដេកលើតារាង និងដាក់ទូរស័ព្ទនៅផ្នែកខាងលើ"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"បានផ្គូផ្គងស្លាក និងទូរស័ព្ទដោយជោគជ័យ អ្នកបានធ្វើរួចរាល់ហើយ!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"ស្លាកបានផ្ដល់មិនអាចត្រូវបានប្រើ ដើម្បីដោះសោទូរស័ព្ទរបស់អ្នកបានទេ"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"បានបរាជ័យក្នុងការផ្គូផ្គងជាមួយស្លាករបស់អ្នក សូមព្យាយាមម្ដងទៀត"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"មិនបានបើក NFC ហើយត្រូវបានទាមទារសម្រាប់ដោះសោ NFC ។ សូមបើក NFC ។"</string>
+    <string name="ok" msgid="3651563352754792958">"ការកំណត់ NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ការកំណត់"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ការកំណត់"</string>
     <string name="search_menu" msgid="7053532283559077164">"ស្វែងរក"</string>
@@ -2107,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"រៀបចំស្លាកអិនអេហ្វស៊ីវ៉ាយហ្វាយ"</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>
@@ -2115,43 +2132,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"កម្រិតសំឡេងការជូនដំណឹង"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"ពេលមានការហៅ និងការជូនដំណឹង"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"ពេលការជូនដំណឹងមកដល់"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"សំឡេងរោទ៍ការជូនដំណឹងលំនាំដើម"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"ញ័រពេលរោទ៍"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"បង្ហាញការជូនដំណឹង"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"ពន្លឺជូនដំណឹងភ្លឺបភ្លែត"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"នៅពេលបានចាក់សោឧបករណ៍"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"សំឡេងផ្សេងទៀត"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"សំឡេងបន្ទះលេខ"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"សំឡេងចាក់សោអេក្រង់"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"សំឡេងភ្ជាប់"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"សំឡេងប៉ះ"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"ញ័រពេលប៉ះ"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"ភ្ជាប់ការចាក់តាមអូប៉ាល័រ"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"អូឌីយ៉ូទាំងអស់"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"តែអូឌីយ៉ូមេឌៀប៉ុណ្ណោះ"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ស្ងាត់"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ជូនដំណឹង"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ញ័រ"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"ចូលដំណើរការការជូនដំណឹង"</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>
@@ -2171,18 +2200,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2201,6 +2236,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-ko/arrays.xml
index 9158855..f450875 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"없음"</item>
     <item msgid="8673874894887358090">"수동"</item>
-    <item msgid="168893341855953140">"프록시 자동 구성"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"사용 안함"</item>
+    <item msgid="3165868966179561687">"알리미"</item>
+    <item msgid="6038758039030476855">"진동"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"없음"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"사용 안함"</item>
     <item msgid="2751513398307949636">"화면에 막대로 표시"</item>
-    <item msgid="1851438178120770973">"adb shell dumpsys gfxinfo에서 사용"</item>
+    <item msgid="8272260411216018353">"화면에 선으로 표시"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo에서 사용"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"OFF"</item>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index ac7e65d..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"화면 켜짐시간:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"알 수 없음"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"충전 중"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"충전 중(AC 전원)"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"충전 중(USB)"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"충전 중(무선)"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(무선)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"충전 안함"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"충전 안함"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"충전 완료"</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_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"설정"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"설정 바로가기"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"비행기 모드"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC 및 기타 설정"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"더보기..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"무선 및 네트워크 설정"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, 블루투스, 비행기 모드, 모바일 네트워크 및 VPN 관리"</string>
     <string name="roaming" msgid="3596055926335478572">"데이터 로밍"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"소유자 정보"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"위젯 사용"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"관리자가 사용 중지함"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 잠금 해제"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"화면 잠금에 표시할 텍스트를 입력하세요."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"잠금 화면에 사용자 정보 표시"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"태블릿 암호화"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"휴대전화 암호화"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"암호화됨"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"계정, 설정, 다운로드된 앱과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 태블릿을 암호화하고 화면 잠금(패턴, 숫자 PIN 또는 비밀번호)을 설정할 경우 전원을 켤 때마다 화면 잠금을 해제하여 태블릿의 암호화를 해제해야 합니다. 암호화를 해제하는 다른 유일한 방법은 초기화하여 모든 데이터를 삭제하는 것입니다.\n\n암호화에는 1시간 이상이 걸릴 수 있습니다. 충전된 배터리를 이용하여 암호화를 시작하고, 암호화가 완료될 때까지 태블릿의 전원 연결을 해제하지 않아야 합니다. 암호화 프로세스를 중단하면 데이터의 일부 또는 전부를 잃게 됩니다."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"계정, 설정, 다운로드된 앱과 데이터, 미디어 및 기타 파일을 암호화할 수 있습니다. 휴대전화를 암호화하고 화면 잠금(패턴, 숫자 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC 태그에 기록"</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>
@@ -618,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="2288214226916117159">"네트워크 비밀번호 입력"</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>
@@ -735,10 +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="8480105032417444275">"밝기 수준"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"화면 밝기 조정"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"밝기 자동 조절"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"빛의 양에 따라 밝기 수준 최적화"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS 앱을 변경하시겠습니까?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"SMS 앱으로 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 대신 <xliff:g id="NEW_APP">%1$s</xliff:g>을(를) 사용하시겠습니까?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMS 앱으로 <xliff:g id="NEW_APP">%s</xliff:g>을(를) 사용하시겠습니까?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"알 수 없는 SIM 연산자입니다."</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"알 수 없는 SIM 운영자입니다."</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s에 알려진 프로비저닝 웹사이트가 없습니다."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM 카드를 삽입하고 다시 시작하세요."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"인터넷에 연결하세요."</string>
@@ -1322,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="7923901846375587241">"버그 신고 바로가기"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"버그 신고용 빠른 설정 버튼 표시"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"런타임 선택"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"다시 부팅하여 <xliff:g id="OLD">%1$s</xliff:g>에서 <xliff:g id="NEW">%2$s</xliff:g>(으)로 런타임을 변경하시겠습니까?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"무선 디스플레이 인증서"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"WiFi 상세 로깅 사용"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"무선 디스플레이 인증서 옵션 표시"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"WiFi 로깅 수준을 높이고 WiFi 선택도구에서 SSID RSSI당 값을 표시"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB 디버깅을 허용하시겠습니까?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"모바일 네트워크 신호"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"오전 <xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"오후 <xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"장치 무중단 가동 시간"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi 사용 시간"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi 사용 시간"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"모든 인증서 삭제"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"신뢰할 수 있는 자격증명"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"신뢰할 수 있는 CA 인증서 표시"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"고급"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"저장공간 유형"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"하드웨어 지원"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"소프트웨어 전용"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"설정을 계속하려면 "<b>"다음"</b>"을 터치하세요.\n\n다른 Wi-Fi 네트워크에 연결하려면 "<b>"뒤로"</b>"를 터치하세요."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"동기화 사용"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"동기화 사용중지됨"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"지금 동기화 중"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"동기화 오류입니다."</string>
     <string name="sync_failed" msgid="1696499856374109647">"동기화 실패"</string>
     <string name="sync_active" msgid="8476943765960863040">"동기화 사용 중"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"저장소의 암호화를 해제하려면 PIN을 입력하세요."</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"저장소의 암호화를 해제하려면 패턴을 그리세요."</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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"사진 촬영"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"갤러리에서 사진 선택"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC 화면 잠금 설정"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"페어링된 태그"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"사용 설정됨"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"태그와 페어링"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"페어링"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"태그를 테이블에 평평하게 놓고 그 위에 휴대전화를 올려놓습니다."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"태그와 휴대전화가 페어링되었습니다."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"제공된 태그로는 휴대전화를 잠금 해제할 수 없습니다."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"태그와 페어링하지 못했습니다. 다시 시도해 주세요."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC를 사용하도록 설정하지 않았습니다. NFC 잠금해제를 위해 NFC를 사용하도록 설정해 주세요."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC 설정"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"설정"</string>
     <string name="search_results_title" msgid="1796252422574886932">"설정"</string>
     <string name="search_menu" msgid="7053532283559077164">"검색"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2112,43 +2132,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"알림 볼륨"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"전화 및 알림 수신 시"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"알림 도착 시간"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"기본 알림 벨소리"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"전화 수신 시 진동"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"알림 표시"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"알림등 반복 표시"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"기기가 잠겼을 때"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"기타 소리"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"다이얼패드 신호음"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"화면 잠금 소리"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"도킹 소리"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"터치음"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"터치 시 진동"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"도크 스피커 재생"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"모든 오디오"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"미디어 오디오만"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"무음"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"알림"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"진동"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"알림 액세스"</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>
@@ -2168,18 +2200,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-lo-rLA/arrays.xml
index 9d7fb4b..f7825f5 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"ບໍ່ໃຊ້"</item>
     <item msgid="8673874894887358090">"ຕັ້ງຄ່າເອງ"</item>
-    <item msgid="168893341855953140">"ຕັ້ງຄ່າພຣັອກຊີອັດຕະໂນມັດ"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"ປິດ"</item>
+    <item msgid="3165868966179561687">"ແຈ້ງເຕືອນ"</item>
+    <item msgid="6038758039030476855">"ສັ່ນເຕືອນ"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"ບໍ່ມີ"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"ປິດ"</item>
     <item msgid="2751513398307949636">"ເປັນແຖບເທິງໜ້າຈໍ"</item>
-    <item msgid="1851438178120770973">"ໃນ adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"ເປັນເສັ້ນເທິງໜ້າຈໍ"</item>
+    <item msgid="120512413928262547">"ໃນ adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"ປິດ"</item>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index bc93652..faacb96 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"ເວລາເປີດໜ້າຈໍ:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"ບໍ່ຮູ້ຈັກ"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"ກຳລັງສາກໄຟ"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"ກຳລັງສາກຜ່ານໝໍ້ໄຟ"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"ກຳລັງສາກຜ່ານ USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"ກຳລັງສາກໄຮ້ສາຍ"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ໄຮ້ສາຍ)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"ບໍ່ໄດ້ສາກໄຟ"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ບໍ່ໄດ້ສາກໄຟ"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"ເຕັມ"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ຊ່ອງຂໍ້ມູນພອດຈະຕ້ອງປ່ອຍຫວ່າງໄວ້ ຫາກວ່າຊ່ອງ host ຫວ່າງຢູ່."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"ພອດທີ່ທ່ານລະບຸນັ້ນບໍ່ຖືກຕ້ອງ."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy ນີ້ຖືກໃຊ້ໂດຍໂປຣແກຣມທ່ອງເວັບແລ້ວ ແລະບໍ່ອາດໃຊ້ກັບແອັບຯອື່ນໄດ້."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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">"ຂໍ້ມູນ cell:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"ການຕັ້ງຄ່າ"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ທາງລັດການຕັ້ງຄ່າ"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"ໂໝດຢູ່ໃນຍົນ"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC &amp; ອື່ນໆ"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"ເພີ່ມເຕີມ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ລະບົບໄຮ້ສາຍ &amp; ເຄືອຂ່າຍ"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"ຈັດການ Wi-Fi, Bluetooth, ຮູບແບບເທິງຍົນ, ເຄືອຂ່າຍມືຖື &amp; VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"ການໂຣມມິງຂໍ້ມູນ"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"ຂໍ້ມູນເຈົ້າຂອງເຄື່ອງ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"ເປີດນຳໃຊ້ວິດເຈັດ"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"ຖືກປິດນຳໃຊ້ໂດຍຜູ່ເບິ່ງແຍງລະບົບ"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC ປົດລັອກ"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"ພິມຂໍ້ຄວາມເພື່ອສະແດງຜົນໃນໜ້າຈໍລັອກ"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"ສະແດງຂໍ້ມູນຜູ່ໃຊ້ໃນໜ້າຈໍລັອກ"</string>
@@ -990,7 +991,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"ປ່ຽນແອັບຯສົ່ງ SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ໃຊ້ <xliff:g id="NEW_APP">%1$s</xliff:g> ແທນ <xliff:g id="CURRENT_APP">%2$s</xliff:g> ໃຫ້ເປັນແອັບຯ SMS ຂອງທ່ານ?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ໃຊ້ <xliff:g id="NEW_APP">%s</xliff:g> ເປັນແອັບຯ SMS ຂອງທ່ານ?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"ຜູ່ໃຫ້ບໍລິການ SIM ທີ່ບໍ່ຮູ້ຈັກ"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"ບໍ່ຮູ້ຈັກຜູ່ໃຫ້ບໍລິການ SIM ນີ້"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s ບໍ່ມີເວັບໄຊການຈັດສັນ ທີ່ລະບົບຮູ້ຈັກ"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"ກະລຸນາໃສ່ຊິມກາດ ແລະເປີດເຄື່ອງຄືນໃໝ່"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"ກະລຸນາເຊື່ອມຕໍ່ກັບອິນເຕີເນັດ"</string>
@@ -1332,9 +1333,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"ເລືອກຣັນທາມ"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"ເປີດເຄື່ອງຄືນໃໝ່ເພື່ອປ່ຽນຣັນທາມຈາກ <xliff:g id="OLD">%1$s</xliff:g> ເປັນ <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"ສະແດງການຮັບຮອງຂອງລະບົບໄຮ້ສາຍ"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"ເປີດການບັນທຶກ WiFi Verbose"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"ສະແດງໂຕເລືອກສຳລັບການສະແດງການຮັບຮອງລະບົບໄຮ້ສາຍ"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"ເພີ່ມລະດັບການບັນທຶກ Wifi, ສະແດງຕໍ່ SSID RSSI ໃນໂຕເລືອກ WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"ອະນຸຍາດໃຫ້ດີບັ໊ກຜ່ານ USB?"</string>
@@ -1492,11 +1491,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"ສັນຍານເຄືອຂ່າຍມືຖື"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> ກ່ອນທ່ຽງ"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> ຫຼັງທ່ຽງ"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"ເວລາການເຮັດວຽກຂອງອຸປະກອນ"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"ເວລາເປີດໃຊ້ Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"ໄລຍະເວລາການໃຊ້ Wi-Fi"</string>
@@ -1677,7 +1671,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"ລຶບໃບຮັບຮອງທັງໝົດ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖື"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"ສະແດງໃບຮັບຮອງ CA ທີ່ເຊື່ອຖືໄດ້"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"ຂັ້ນສູງ"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"ປະເພດພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ໃຊ້ຮາດແວ"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ຊອບແວເທົ່ານັ້ນ"</string>
@@ -1761,7 +1754,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"ແຕະ "<b>"ຕໍ່ໄປ"</b>" ເພື່ອສືບຕໍ່ຂັ້ນຕອນການຕັ້ງຄ່າ.\n\nແຕະ "<b>"ກັບຄືນ"</b>" ເພື່ອເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍ Wi-Fi ອື່ນ."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"ເປີດການຊິ້ງຂໍ້ມູນແລ້ວ"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"ການຊິ້ງຂໍ້ມູນຖືກປິດໄວ້"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ກຳລັງຊິ້ງຂໍ້ມູນຕອນນີ້"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"ການຊິ້ງຂໍ້ມູນຜິດພາດ."</string>
     <string name="sync_failed" msgid="1696499856374109647">"ການຊິ້ງຂໍ້ມູນລົ້ມເຫລວ"</string>
     <string name="sync_active" msgid="8476943765960863040">"ເປີດໃຊ້ການຊິ້ງຂໍ້ມູນ"</string>
@@ -2097,6 +2089,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ຖ່າຍຮູບ"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"ເລືອກຮູບຈາກແກເລີຣີ"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"ການຕັ້ງຄ່າລັອກໜ້າຈໍ NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ແທັກທີ່ຈັບຄູ່ແລ້ວ"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"ເປີດໃຊ້ແລ້ວ"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"ຈັບຄູ່ກັບແທັກໃດນຶ່ງ"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"ຈັບຄູ່ດຽວນີ້"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"ຕັ້ງແທັກໃຫ້ພຽງຢູ່ເທິງໂຕະ ແລ້ວ ວາງໂທລະສັບໄວ້ເທິງ"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"ແທັກ ແລະ ໂທລະສັບ ຈັບຄູ່ກັນແລ້ວ, ທ່ານເຮັດສຳເລັດແລ້ວ!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"ແທັກທີ່ໃຫ້ມາບໍ່ສາມາດໃຊ້ເພື່ອປົດລັອກໂທລະສັບຂອງທ່ານໄດ້"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"ການຈັບຄູ່ກັບແທັກຂອງທ່ານລົ້ມເຫຼວ, ກະລຸນາລອງໃໝ່ອີກເທື່ອນຶ່ງ"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"ບໍ່ໄດ້ເປີດນຳໃຊ້ NFC ແລະ ມັນຈຳເປັນສຳລັບການປົດລັອກ NFC. ກະລຸນາເປີດ NFC ກ່ອນ."</string>
+    <string name="ok" msgid="3651563352754792958">"ການຕັ້ງຄ່າ NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"ການຕັ້ງຄ່າ"</string>
     <string name="search_results_title" msgid="1796252422574886932">"ການຕັ້ງຄ່າ"</string>
     <string name="search_menu" msgid="7053532283559077164">"ຊອກຫາ"</string>
@@ -2116,10 +2120,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"ລະດັບສຽງມີເດຍ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"ລະດັບສຽງໂມງປຸກ"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"ລະດັບສຽງໂທລະສັບ"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"ລະດັບສຽງແຈ້ງເຕືອນ"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"ຫ້າມລົບກວນ"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"ເມື່ອມີການໂທ ຫຼືການແຈ້ງເຕືອນເຂົ້າມາ"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"ເມື່ອມີການແຈ້ງເຕືອນເຂົ້າມາ"</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>
@@ -2136,18 +2138,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"ສຽງອື່ນໆ"</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="1340569241625989837">"ສຽງລັອກໜ້າຈໍ"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"ສຽງບ່ອນວາງ"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"ສຽງສຳຜັດ"</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="dock_audio_media_title" msgid="1346838179626123900">"ສຽງລຳໂພງບ່ອນວາງ"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"ສຽງທັງໝົດ"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"ສຽງມີເດຍເທົ່ານັ້ນ"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"ປິດສຽງ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"ແຈ້ງເຕືອນ"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"ສັ່ນເຕືອນ"</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">
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index b5943cf..2a83c46 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nėra"</item>
     <item msgid="8673874894887358090">"Rankiniu būdu"</item>
-    <item msgid="168893341855953140">"Aut. tarp. serv. konfig."</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Išjungta"</item>
+    <item msgid="3165868966179561687">"Įspėjimas"</item>
+    <item msgid="6038758039030476855">"Vibruoti"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Nėra"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Išjungta"</item>
     <item msgid="2751513398307949636">"Ekrane (stulpeliai)"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Ekrane (linijos)"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Išjungti"</item>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 519cf74..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="7617195369015536614">"Belaidis ryšys ir tinklai"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Įrenginys"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Asmeninės parinktys"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Ekrane ĮJUNGTAS laikas:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Nežinomas"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Kraunasi..."</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Įkr. naud. kint. sr."</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Įkraunama naud. USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Įkraunama be laidų"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(belaidis)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Nekraunama"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nekraunama"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Visiškai įkrautas"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Prievado laukas turi būti tuščias, jei tuščias prieglobos laukas."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Prievadas, kurį įvedėte, netinkamas."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Šalia esantis CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mob. tel. informacija:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nustatymai"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Spartusis nustatymų klavišas"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Lėktuvo režimas"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"ALR ir daugiau"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Daugiau…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bevielis ryšys ir tinklai"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Tvarkyti „Wi-Fi“, „Bluetooth“, lėktuvo režimą, mobiliojo ryšio tinklus ir VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Tarptinklinis duomenų ryšys"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Savininko informac."</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Įgalinti valdiklius"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Išjungė administratorius"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"ALR atrakinimas"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Įveskite tekstą, pateiktiną užrakinimo ekrane"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Rodyti naudotojo informaciją užrakinimo ekrane"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Šifruotas"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenų, medijų ir kitus failus. Užšifravę planšetinį kompiuterį (jei nustatėte ekrano užraktą, t. y. atrakinimo piešinį arba skaitmeninį PIN kodą ar slaptažodį), turėsite atrakinti ekraną, kad galėtumėte iššifruoti planšetinį kompiuterį kiekvieną kartą, kai įjungsite maitinimą. Vienintelis kitas būdas iššifruoti yra atlikti gamyklinių duomenų atkūrimą, o tai atlikus bus ištrinti visi duomenys.\n\nŠifravimas užtrunka valandą arba ilgiau. Turite pradėti, kai akumuliatorius įkrautas, o planšetinis kompiuteris prijungtas prie maitinimo šaltinio per visą procesą. Jei sutrikdysite šį procesą, prarasite dalį arba visus duomenis."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Galite šifruoti paskyras, nustatymus, atsisiųstas programas ir jų duomenų, medijų ir kitus failus. Užšifravę telefoną (jei nustatėte ekrano užraktą, t. y. atrakinimo piešinį arba skaitmeninį PIN kodą ar slaptažodį), turėsite atrakinti ekraną, kad galėtumėte iššifruoti telefoną kiekvieną kartą, kai įjungsite maitinimą. Vienintelis kitas būdas iššifruoti yra atlikti gamyklinių duomenų atkūrimą, o tai atlikus bus ištrinti visi duomenys.\n\nŠifravimas užtrunka valandą arba ilgiau. Turite pradėti, kai akumuliatorius įkrautas, o telefonas prijungtas prie maitinimo šaltinio per visą procesą. Jei sutrikdysite šį procesą, prarasite dalį arba visus duomenis."</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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Rašyti į ALR žymą"</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>
@@ -618,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="2288214226916117159">"Į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>
@@ -735,10 +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="8480105032417444275">"Šviesumo lygis"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Reguliuoti ekrano šviesumą"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Prisitaikantis šviesumas"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizuoti šviesumo lygį pagal esamą šviesą"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Pakeisti SMS programą?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Naudoti „<xliff:g id="NEW_APP">%1$s</xliff:g>“ kaip SMS programą vietoj „<xliff:g id="CURRENT_APP">%2$s</xliff:g>“?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Naudoti „<xliff:g id="NEW_APP">%s</xliff:g>“ kaip SMS programą?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Nežinomas SIM operatorius"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nežinomas SIM operatorius"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"„%1$s“ neturi aprūpinimo svetainės"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Įdėkite SIM kortelę ir paleiskite iš naujo"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Prisijunkite prie interneto"</string>
@@ -1322,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="7923901846375587241">"Pranešimo apie triktį spartusis klavišas"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Rodyti pranešimo apie triktį mygtuką Sparčiuosiuose nustatymuose"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pasirinkti vykdymo laiką"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Įkelti iš naujo, kad vykdymo laikas būtų pakeistas iš <xliff:g id="OLD">%1$s</xliff:g> į <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Belaidžio rodymo sertifikavimas"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Įgal. „Wi-Fi“ daugiaž. įraš. į žurnalą"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Rodyti belaidžio rodymo sertifikavimo parinktis"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Padidinti „Wi-Fi“ įrašymo į žurnalą lygį, rodyti SSID RSSI „Wi-Fi“ rinkiklyje"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Leisti USB perkrovimą?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mob. ryšio tinklo signal."</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> priešpiet"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> popiet"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="MONTH">%2$d</xliff:g>-<xliff:g id="DAY">%1$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>-<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Įrenginio veikimo laikas"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"„Wi-Fi“ laiku"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"„Wi-Fi“ laiku"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Pašalinti visus sertifikatus"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Patikimi įgaliojimai"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Rodyti patikimus CA sertifikatus"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Išplėstiniai"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Atmintinės tipas"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Atsarginė kopija saugoma įrenginio vidinėje atmintyje"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Saugoma tik programinėje įrangoje"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Palieskite "<b>"Kitas"</b>", kad tęstumėte sąranką.\n\nPalieskite "<b>"Atgal"</b>", kad prisijungtumėte prie kito „Wi-Fi“ tinklo."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinchronizavimas įgalintas"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinchronizavimas neleidžiamas"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinchronizuojama dabar"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinchronizavimo klaida."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Įvyko sinchronizavimo klaida"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sinchronizavimas aktyvus"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Įveskite PIN kodą, kad iššifruotumėte saugyklą"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Nupieškite atrakinimo piešinį, kad iššifruotumėte saugyklą"</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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Fotografuoti"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Pasirinkti nuotrauką iš galerijos"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"ALR ekrano užrakto nustatymai"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Susietos lustinės etiketės"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Įgalinta"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Susieti su žyma"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Susieti dabar"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Padėkite lustinę etiketę gulsčiai ant stalo ir telefoną ant jos"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Lustinė etiketė ir telefonas sėkmingai susieti. Atlikta!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Nurodyta lustinė etiketė negali būti naudojama telefonui atrakinti"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Susiejimas su lustine etikete nepavyko, bandykite dar kartą"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"ALR neįgalintas ir yra būtinas norint naudoti ALR atrakinimą. Įjunkite ALR."</string>
+    <string name="ok" msgid="3651563352754792958">"ALR nustatymai"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nustatymai"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nustatymai"</string>
     <string name="search_menu" msgid="7053532283559077164">"Paieška"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2112,43 +2132,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Garsai ir pranešimai"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Medijų garsumas"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signalo garsumas"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Skambučio garsumas"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Pranešimo garsumas"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Kai gaunami skambučiai ir pranešimai"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Kai gaunami pranešimai"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Skambėti"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibruoti, o ne skambėti"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Neskambėti ir nevibruoti"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Numatytasis pranešimo 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>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Rodomi pranešimai"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsuojanti įspėjimo šviesa"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Kai įrenginys užrakintas"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Visiškai nerodyti pranešimų"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kai įjungtas režimas „Netrukdyti“"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Slėpti naujus sąrašo pranešimus"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Rodyti visus sąrašo pranešimus"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Kiti garsai"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Skambinimo skydelio tonai"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekrano užrakinimo garsai"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Prijungimo prie doko garsai"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Lietimo garsai"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibruoti palietus"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Prie doko prij. garsiak. gars."</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Visi garso įrašai"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Tik medijų garso įrašai"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tylus"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Įspėjimas"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibravimas"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Galimybė pasiekti pranešimus"</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>
@@ -2168,18 +2200,24 @@
     <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="3025242591043646494">"Rodyti sąrašo viršuje"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Paslėpti delikatų turinį, kai įrenginys užrakintas"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Užblokuotas"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Sąrašo viršuje"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Delikatus"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Įjungti"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Išjungti"</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/arrays.xml b/res/values-lv/arrays.xml
index ee51dbf..2498220 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Neviens"</item>
     <item msgid="8673874894887358090">"Manuāli"</item>
-    <item msgid="168893341855953140">"Starpniekserv. aut. konf."</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Izslēgts"</item>
+    <item msgid="3165868966179561687">"Brīdinājums"</item>
+    <item msgid="6038758039030476855">"Vibrē"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Nav"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Izslēgta"</item>
     <item msgid="2751513398307949636">"Ekrānā kā joslas"</item>
-    <item msgid="1851438178120770973">"Komandā “adb shell dumpsys gfxinfo”"</item>
+    <item msgid="8272260411216018353">"Ekrānā kā līnijas"</item>
+    <item msgid="120512413928262547">"Komandā “adb shell dumpsys gfxinfo”"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Izslēgta"</item>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 780409a..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="7617195369015536614">"Bezvadu savienojumi un tīkli"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Ierīce"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Personiski"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Ekrāna ieslēgšanas laiks:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Nezināms"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Uzlāde"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Maiņstrāvas uzlāde"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB uzlāde"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Bezvadu uzlāde"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezvadu)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenotiek uzlāde"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenotiek uzlāde"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Pilns"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ja saimniekdatora lauks ir tukšs, porta laukam jābūt tukšam."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Ierakstītais porta numurs nav derīgs."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP starpniekserveris tiek izmantots pārlūkprogrammā, taču, iespējams, netiek izmantots citās lietotnēs."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Atrašanās vieta:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Tuvējais CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Tālruņa atrašanās vietas informācija:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Iestatījumi"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Saīsne Iestatījumi"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Lidojuma režīms"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"TDLS un citi iestatījumi"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Vēl..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezvadu pakalpojums un tīkli"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, lidojuma režīma, mobilo tīklu un VPN pārvaldība"</string>
     <string name="roaming" msgid="3596055926335478572">"Datu viesabonēšana"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informācija par īpašnieku"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Iespējot logrīkus"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Atspējojis administrators"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"TDLS atbloķēšana"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ierakstiet bloķēšanas ekrānā parādāmo tekstu"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Bloķēšanas ekrānā rādīt informāciju par lietotāju"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Šifrēts"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un to datus, multivides saturu un citus failus. Ja šifrēsiet planšetdatora saturu un būsiet iestatījis ekrāna bloķēšanu (tas ir, atbloķēšanas kombināciju, skaitlisku PIN vai paroli), katru reizi, kad ieslēgsiet planšetdatoru, jums būs jāatbloķē ekrāns, lai atšifrētu planšetdatora saturu. Pastāv vēl tikai viens cits veids, kā atšifrēt saturu, — veikt rūpnīcas datu atiestatīšanu, dzēšot visus jūsu datus.\n\nŠifrēšana ilgst vismaz vienu stundu. Akumulatoram ir jābūt uzlādētam, un procesa laikā planšetdatoram ir jābūt pievienotam strāvas avotam. Ja pārtrauksiet procesu, zaudēsiet visus datus vai to daļu."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Varat šifrēt kontus, iestatījumus, lejupielādētās lietotnes un to datus, multivides saturu un citus failus. Ja šifrēsiet tālruņa saturu un būsiet iestatījis ekrāna bloķēšanu (tas ir, atbloķēšanas kombināciju, skaitlisku PIN vai paroli), katru reizi, kad ieslēgsiet tālruni, jums būs jāatbloķē ekrāns, lai atšifrētu tālruņa saturu. Pastāv vēl tikai viens cits veids, kā atšifrēt saturu, — veikt rūpnīcas datu atiestatīšanu, dzēšot visus jūsu datus.\n\nŠifrēšana ilgst vismaz vienu stundu. Akumulatoram ir jābūt uzlādētam, un procesa laikā tālrunim ir jābūt pievienotam strāvas avotam. Ja pārtrauksiet procesu, zaudēsiet visus datus vai to daļu."</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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Rakstīt TDLS atzīmē"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Spilgtuma līmenis"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Noregulēt ekrāna spilgtumu"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptīvs spilgtums"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizēt spilgtuma līmeni atbilstoši pieejamajam apgaismojumam"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vai mainīt īsziņu lietotni?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vai īsziņām izmantot lietotni <xliff:g id="NEW_APP">%1$s</xliff:g>, nevis <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vai izmantot lietotni <xliff:g id="NEW_APP">%s</xliff:g> kā īsziņu lietotni?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Nezināms SIM operators"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nezināms SIM operators"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Operatora %1$s nodrošināšanas vietne nav zināma."</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lūdzu, ievietojiet SIM karti un restartējiet."</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lūdzu, izveidojiet savienojumu ar internetu."</string>
@@ -1322,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="7923901846375587241">"Kļūdu pārskata saīsne"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Ātrajos iestatījumos rādīt pogu kļūdu pārskata veidošanai"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Izpildlaika atlase"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vai atsāknēt, lai mainītu izpildlaiku no <xliff:g id="OLD">%1$s</xliff:g> uz <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Bezvadu attēlošanas sertifikācija"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Iespējot Wi-Fi izvērsto reģistrēšanu"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Rādīt bezvadu attēlošanas sertifikācijas iespējas"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Paaugstināt Wi-Fi reģistrēšanas līmeni, rādīt katram SSID RSSI Wi-Fi atlasītājā"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vai atļaut USB atkļūdošanu?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilā tīkla signāls"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> no rīta"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> vakarā"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Ierīces nomoda laiks"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi uz laiku"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi uz laiku"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Noņemt visus sertifikātus"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Uzticami akreditācijas dati"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Attēlot uzticamus CA sertifikātus"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Papildu"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Krātuves tips"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Krātuve aparatūrā"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Tikai programmatūrā"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Lai turpinātu iestatīšanu, pieskarieties "<b>"Tālāk"</b>".\n\nLai izveidotu savienojumu ar citu Wi-Fi tīklu, pieskarieties "<b>"Atpakaļ"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizācija iespējota"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizācija atspējota"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Notiek sinhronizācija"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinhronizācijas kļūda"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sinhronizācija neizdevās"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sinhronizācija darbojas"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Ievadiet PIN, lai atšifrētu krātuves saturu."</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Zīmējiet kombināciju, lai atšifrētu krātuves saturu."</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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Uzņemt fotoattēlu"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Izvēlēties fotoattēlu no galerijas"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"TDLS ekrāna bloķēšanas iestatījumi"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Pārī savienotas etiķetes"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Iespējota"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Savienot pārī ar atzīmi"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Savienot pārī tūlīt"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Nolieciet etiķeti uz galda un novietojiet tālruni uz tās."</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Etiķete un tālrunis ir veiksmīgi savienoti pārī."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Šo etiķeti nevar izmantot jūsu tālruņa atbloķēšanai."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Neizdevās izveidot savienojumu pārī ar etiķeti. Lūdzu, mēģiniet vēlreiz."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"TDLS funkcija nav iespējota un ir nepieciešama TDLS atbloķēšanai. Lūdzu, ieslēdziet TDLS."</string>
+    <string name="ok" msgid="3651563352754792958">"TDLS iestatījumi"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Iestatījumi"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Iestatījumi"</string>
     <string name="search_menu" msgid="7053532283559077164">"Meklēt"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Iestatīt Wi-Fi TDLS atzīmi"</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>
@@ -2112,43 +2132,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Skaņas un paziņojumi"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Multivides skaļums"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Signāla skaļums"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Zvana skaļums"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Paziņojumu skaļums"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Kad tiek saņemti zvani un paziņojumi"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Saņemot paziņojumus"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Zvanīt"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrēt, nevis zvanīt"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Nezvanīt un nevibrē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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Paziņojumu noklusējuma 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>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Paziņojumu rādīšana"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsa paziņojuma indikators"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Kad ierīce ir bloķēta"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nerādīt paziņojumus vispār"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kad ieslēgts statuss Netraucēt"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Sarakstā nerādīt jaunus paziņojumus"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Sarakstā rādīt visus paziņojumus"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Citas skaņas"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Numura sastādīšanas tastatūras skaņas"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekrāna bloķēšanas skaņas"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Dokošanas skaņas"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Pieskāriena skaņas"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrēt pieskaroties"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Dokoto skaļruņu skaņa"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Visas skaņas"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Tikai multivides audio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Klusums"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Brīdinājums"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrozvans"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Piekļuve paziņojumiem"</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>
@@ -2168,18 +2200,24 @@
     <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="3025242591043646494">"Attēlot saraksta augšdaļā"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Slēpt sensitīvu saturu, kad ierīce ir bloķēta"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloķēti"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Saraksta augšdaļā"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitīvi"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Ieslēgt"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Izslēgt"</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/arrays.xml b/res/values-mn-rMN/arrays.xml
index a38a3f4..f14dacb 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn-rMN/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Байхгүй"</item>
     <item msgid="8673874894887358090">"Гараар"</item>
-    <item msgid="168893341855953140">"Прокси авто-тохируулга"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Хаах"</item>
+    <item msgid="3165868966179561687">"Сэрэмжлүүлэг"</item>
+    <item msgid="6038758039030476855">"Чичиргээ"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Байхгүй"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Идэвхгүй"</item>
     <item msgid="2751513398307949636">"Дэлгэц дээр савхаар"</item>
-    <item msgid="1851438178120770973">"adb шел доторх dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Дэлгэц дээр шулуунаар"</item>
+    <item msgid="120512413928262547">"adb суурь доторх dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Идэвхгүй"</item>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 94d4986..43ef275 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Дэлгэцний асаалттай цаг:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Тодорхойгүй"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Цэнэглэж байна"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"AC-р цэнэглэж байна"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB-р цэнэглэж байна"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Кабльгүйгээр цэнэглэж байна"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(утасгүй)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Цэнэглэхгүй байна"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Цэнэглэхгүй байна"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Дүүрэн"</string>
@@ -203,7 +203,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_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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">"Үүрийн мэдээлэл:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Тохиргоо"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Тохиргооны товчилбор"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Нислэгийн горим"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC &amp; дэлгэрэнгүй"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Бусад…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Утасгүй &amp; сүлжээ"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, блютүүт , нислэгийн горим, мобайл сүлжээнүүд, &amp; VPNs-г удирдах"</string>
     <string name="roaming" msgid="3596055926335478572">"Дата роуминг"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Эзэмшигчийн мэдээлэл"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Хэрэгсэл идэвхжүүлэх"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Админ идэвхгүй болгосон"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC тайлах"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Түгжих дэлгэцэн дээр харуулах текстийг оруулна уу"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Дэлгэц түгжигдэхэд хэрэглэгчийн мэдээллийг харуулах"</string>
@@ -990,7 +991,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS апп-г өөрчлөх үү?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Таны үндсэн SMS аппликешнээр <xliff:g id="CURRENT_APP">%2$s</xliff:g>-н оронд <xliff:g id="NEW_APP">%1$s</xliff:g>-г ашиглах уу?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"<xliff:g id="NEW_APP">%s</xliff:g>-г таны SMS апп-р ашиглах уу?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Тодорхойгүй SIM оператор"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Тодорхойгүй SIM оператор"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s-д мэдэгдэж байгаа эрх зохицуулах вебсайт байхгүй байна"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"SIM карт оруулаад дахин эхлүүлнэ үү"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Интернэтэд холбогдоно уу"</string>
@@ -1332,9 +1333,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Ажиллах цагийг сонгоно уу"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Ажиллах цагийг <xliff:g id="OLD">%1$s</xliff:g>-с <xliff:g id="NEW">%2$s</xliff:g> рүү өөрчлөхийн тулд дахин асаах уу?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Утасгүй дэлгэцийн сертификат"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"WiFi Verbose логийг идэвхжүүлэх"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Утасгүй дэлгэцийн сертификатын сонголтыг харуулах"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wifi логийн түвшинг нэмэгдүүлж, WiFi сонгогч доторх SSID-д ногдох RSSI-г харуулах"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Хуурамч байршлыг зөвшөөрөх"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Хуурамч байршлыг зөвшөөрөх"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB дебаг хийхийг зөвшөөрөх үү?"</string>
@@ -1492,11 +1491,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Мобайл сүлжээний сигнал"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> ҮӨ"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> ҮХ"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Төхөөрөмжийн идэвхтэй байх хугацаа"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi цагтаа"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi цагтаа"</string>
@@ -1677,7 +1671,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Бүх сертификатыг устгах"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Итгэмжлэгдсэн жуухууд"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Итгэлтэй CA сертификатуудыг харуулах"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Дэлгэрэнгүй"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Хадгалалтын сангийн төрөл"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Техник хангамжаар дэмжигдсэн"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Зөвхөн програм"</string>
@@ -1761,7 +1754,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Тохируулгыг үргэлжлүүлэхийн тулд "<b>"Дараагийн"</b>" гэсэнд хүрнэ үү.\n\nӨөр  Wi‑Fi сүлжээнд холбогдохын тулд "<b>"Буцах"</b>" гэсэнд хүрнэ үү."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синк идэвхжсэн"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синк идэвхгүйжсэн"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Одоо синк хийж байна"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Синкийн алдаа."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Синк амжилтгүй"</string>
     <string name="sync_active" msgid="8476943765960863040">"Синк идэвхжүүлсэн"</string>
@@ -2097,6 +2089,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Зураг авах"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Галерейгаас зураг сонгох"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC дэлгэцийн түгжээний тохиргоо"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Хосолсон таг-ууд"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Идэвхжүүлсэн"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Таг-тай хослуулах"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Одоо хослуулах"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Таг-г ширээн дээр хэвтээгээр байрлуулж дээр нь утсаа тавьна уу"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Таг болон утас амжилттай хосолсон!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Өгөгдсөн таг-г таны утасны түгжээг тайлахад ашиглах боломжгүй"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Таны таг-тай хослуулах амжилтгүй боллоо, дахин оролдоно уу"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC түгжээг тайлахад шаардлагатай NFC идэвхжээгүй байна. NFC-г асаана уу."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC Тохиргоо"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Тохиргоо"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Тохиргоо"</string>
     <string name="search_menu" msgid="7053532283559077164">"Хайх"</string>
@@ -2116,10 +2120,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"Медиа дууны хэмжээ"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Сэрүүлгийн дууны хэмжээ"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Хонхны дууны хэмжээ"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Мэдэгдлийн дууны хэмжээ"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"Бүү саад бол"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"Дуудлага болон мэдэгдэл ирэх үед"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Мэдэгдэл ирэх үед"</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>
@@ -2136,18 +2138,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Бусад ая"</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="1340569241625989837">"Дэлгэц түгжих ая"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Док-н ая"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Хүрэлтийн ая"</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="dock_audio_media_title" msgid="1346838179626123900">"Док чанга яригчаар тоглуулах"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Бүх аудио"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Зөвхөн медиа аудио"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Чимээгүй"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Сэрэмжлүүлэг"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Чичиргээ"</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">
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index ef9cec7..52bdd80 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Tiada"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Auto Konfigurasi Proksi"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Matikan"</item>
+    <item msgid="3165868966179561687">"Awasan"</item>
+    <item msgid="6038758039030476855">"Getar"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Tiada"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Matikan"</item>
     <item msgid="2751513398307949636">"Pada skrin sebagai bar"</item>
-    <item msgid="1851438178120770973">"Dalam adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Pada skrin sebagai garis"</item>
+    <item msgid="120512413928262547">"Dalam adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Mati"</item>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index 91fcc90..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="7617195369015536614">"Wayarles &amp; Rangkaian"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Peranti"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Peribadi"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Waktu HIDUP skrin:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Tidak diketahui"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Mengecas"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Mengecas pada AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Mengecas melalui USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Mengecas tanpa wayar"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wayarles)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Tidak mengecas"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Tidak mengecas"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Penuh"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Medan port haruslah kosong sekiranya medan hos kosong."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang anda taipkan tidak sah."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID berdekatan:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Info Sel:"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Tetapan"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Pintasan tetapan"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mod pesawat"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"Lagi…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wayarles &amp; rangkaian"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Urus Wi‑Fi, Bluetooth, mod pesawat, rangkaian mudah alih &amp; VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Perayauan data"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Maklumat pemilik"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Dayakan widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Dilumpuhkan oleh pentadbir"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Buka kunci NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Taip teks untuk dipaparkan pada skrin kunci"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Tunjukkan maklumat pengguna pada skrin kunci"</string>
@@ -333,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Disulitkan"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Anda boleh sulitkan akaun anda, tetapan, apl yang dimuat turun dan data apl, media serta fail lain. Selepas anda menyulitkan tablet anda, dengan anggapan anda sudah menyediakan kunci skrin (iaitu corak atau PIN berangka atau kata laluan), anda perlu membuka kunci skrin untuk menyahsulit tablet setiap kali anda menghidupkan tablet. Satu-satunya cara lain untuk menyahsulit adalah dengan melakukan tetapan semula data kilang yang akan memadam semua data anda.\n\nPenyulitan mengambil masa sejam atau lebih. Anda mesti bermula dengan bateri yang dicas dan pastikan tablet anda dipalamkan sepanjang proses. Jika anda mengganggu proses, anda akan kehilangan sebahagian atau semua data anda."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Anda boleh sulitkan akaun anda, tetapan, apl yang dimuat turun dan data apl, media serta fail lain. Selepas anda menyulitkan telefon anda, dengan anggapan anda sudah menyediakan kunci skrin (iaitu corak atau PIN berangka atau kata laluan), anda perlu membuka kunci skrin untuk menyahsulit telefon setiap kali anda menghidupkan telefon. Satu-satunya cara lain untuk menyahsulit adalah dengan melakukan tetapan semula data kilang yang akan memadam semua data anda.\n\nPenyulitan mengambil masa sejam atau lebih. Anda mesti bermula dengan bateri yang dicas dan pastikan telefon anda dipalamkan sepanjang proses. Jika anda mengganggu proses, 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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Tulis kepada teg NFC"</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>
@@ -619,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="2288214226916117159">"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>
@@ -736,10 +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="8480105032417444275">"Tahap kecerahan"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Laraskan kecerahan skrin"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Kecerahan mudah suai"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimumkan tahap kecerahan untuk cahaya yang tersedia"</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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Tukar apl SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gunakan <xliff:g id="NEW_APP">%1$s</xliff:g> bukannya <xliff:g id="CURRENT_APP">%2$s</xliff:g> sebagai apl SMS anda?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gunakan <xliff:g id="NEW_APP">%s</xliff:g> sebagai apl SMS anda?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Pengendali SIM yang tidak diketahui"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Pengendali SIM tidak dikenali"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s tdk mempunyai tapak web peruntukan dikenali"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sila masukkan kad SIM dan mulakan semula"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sila sambung ke internet"</string>
@@ -1323,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="7923901846375587241">"Pintas laporan pepijat"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Tunjukkan butang dalam Tetapan Pantas 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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pilih waktu jalan"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"But semula untuk menukar waktu jalan daripada <xliff:g id="OLD">%1$s</xliff:g> kepada <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Pensijilan paparan wayarles"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Dayakan Pengelogan Berjela-jela WiFi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Tunjukkan pilihan untuk pensijilan paparan wayarles"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Tingkatkan tahap pengelogan Wifi, paparkan mengikut SSID RSSI dalam Pemilih WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Benarkan penyahpepijatan USB?"</string>
@@ -1493,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Isyarat rangkaian"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> PG"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> P/M"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Waktu jaga peranti"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Masa hidup Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Masa hidup Wi-Fi"</string>
@@ -1678,8 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alih keluar semua sijil"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Bukti kelayakan dipercayai"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Paparkan sijil CA yang dipercayai"</string>
-    <!-- no translation found for advanced_security_title (2434776238010578865) -->
-    <skip />
     <string name="credential_storage_type" msgid="8629968543494001364">"Jenis storan"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Bersandarkan perkakasan"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Perisian sahaja"</string>
@@ -1763,8 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Seterusnya"</b>" untuk meneruskan dengan persediaan.\n\nSentuh "<b>"Kembali"</b>" untuk menyambung kepada rangkaian Wi-Fi lain."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Segerak didayakan"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Segerak dilumpuhkan"</string>
-    <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
-    <skip />
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Ralat penyegerakan."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Segerak gagal"</string>
     <string name="sync_active" msgid="8476943765960863040">"Segerak aktif"</string>
@@ -1811,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Masukkan PIN anda untuk menyahsulit storan"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Lukis corak anda 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>
@@ -2065,7 +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>
-    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Utamakan apl latar depan"</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>
@@ -2100,6 +2105,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ambil foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Pilih foto dari Galeri"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Tetapan Kunci Skrin NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Teg yang digandingkan"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Didayakan"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Gandingkan dengan teg"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Gandingkan sekarang"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Letakkan teg secara rata di atas meja dan letakkan telefon di atasnya"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Teg dan telefon berjaya digandingkan, selesai!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Teg yang diberikan tidak boleh digunakan untuk membuka kunci telefon anda"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Gandingan dengan teg anda gagal, sila cuba lagi"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC tidak didayakan dan diperlukan untuk Buka Kunci NFC. Sila hidupkan NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Tetapan NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Tetapan"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Tetapan"</string>
     <string name="search_menu" msgid="7053532283559077164">"Carian"</string>
@@ -2107,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sediakan Teg 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">"Ketik teg untuk menulis..."</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Kata laluan tidak sah, cuba lagi."</string>
@@ -2115,43 +2133,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Bunyi &amp; Pmberitahuan"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Kelantangan media"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Kelantangan penggera"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Kelantangan deringan"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Kelantangan pemberitahuan"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Apabila panggilan dan pemberitahuan tiba"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Apabila pemberitahuan tiba"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Berdering"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Bergetar, bukannya berdering"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Jangan berdering atau bergetar"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Nada dering pemberitahuan lalai"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Bergetar apabila berdering"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Menunjukkan pemberitahuan"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Lampu pemberitahuan denyutan"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Apabila peranti dikunci"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Jangan tunjukkan pemberitahuan sama sekali"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Apabila jangan ganggu dihidupkan"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Sembunyikan pemberitahuan baharu dari senarai"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Tunjukkan semua pemberitahuan dalam senarai"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Bunyi lain"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Nada pad dail"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Bunyi mengunci skrin"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Bunyi dok"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Bunyi sentuhan"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Bergetar pada sentuhan"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Pembesar suara dok dimainkan"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Semua audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio media sahaja"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Senyap"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Makluman"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Bergetar"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Akses pemberitahuan"</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>
@@ -2171,18 +2201,24 @@
     <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="3025242591043646494">"Dipaparkan di bahagian atas senarai"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Sembunyikan kandungan sensitif apabila peranti dikunci"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Disekat"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Teratas dlm senarai"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitif"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2201,6 +2237,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Dihidupkan"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Dimatikan"</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 6946158..e53f10a 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ingen"</item>
     <item msgid="8673874894887358090">"Manuelt"</item>
-    <item msgid="168893341855953140">"Auto-konfig. av proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Av"</item>
+    <item msgid="3165868966179561687">"Varsel"</item>
+    <item msgid="6038758039030476855">"Vibrering"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ingen"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Av"</item>
     <item msgid="2751513398307949636">"Viser på skjermen som stolper"</item>
-    <item msgid="1851438178120770973">"I adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"På skjermen som linjer"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Av"</item>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index a4cf54c..d33bee1 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Tid skjermen har vært på:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Ukjent"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Lader"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Lader via strømuttak"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Lader via USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Lader trådløst"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådløs)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Lader ikke"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Lader ikke"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Full"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Angitt port er ikke gyldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC-nettadresse: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC-nettadresse: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posisjon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celleinfo:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Innstillinger"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Snarvei for Innstillinger"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flymodus"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC &amp; mer"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mer"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådløst og nettverk"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Administrer Wi-Fi, Bluetooth, flymodus, mobilnettverk og VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eierinformasjon"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktiver moduler"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Deaktivert av administratoren"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-opplåsning"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Skriv inn teksten som skal vises på låseskjermen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Vis brukerinformasjon på låseskjermen"</string>
@@ -332,8 +333,8 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Kryptert"</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 å tilbakestille 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 å tilbakestille 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_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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skriv til NFC-tag"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Lysstyrkenivå"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Juster skjermens lysstyrke"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Lysstyrke som kan tilpasses"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimaliser lysstyrkenivået for tilgjengelig lys"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vil du bytte SMS-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vil du bruke <xliff:g id="NEW_APP">%1$s</xliff:g> i stedet for <xliff:g id="CURRENT_APP">%2$s</xliff:g> for SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vil du bruke <xliff:g id="NEW_APP">%s</xliff:g> som SMS-app?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Ukjent SIM-operatør"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ukjent SIM-operatør"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har ikke noe kjent nettsted for identitetshåndtering"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sett inn SIM-kortet og start enheten på nytt"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Koble deg til Internett"</string>
@@ -1322,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="7923901846375587241">"Snarvei til feilrapport"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Vis en knapp i hurtiginnstillingene for å opprette en feilrapport"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Velg kjøretid"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vil du starte på nytt for å endre kjøretiden fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Trådløs skjermsertifisering"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktiver detaljert Wi-Fi-loggføring"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis alternativer for trådløs skjerm-sertifisering"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Øk loggføringsnivået for Wi-Fi. Vis per SSID/RSSI i Wi-Fi-velgeren"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Aktiver USB-debugging?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobilnettverkets signal"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>: 00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> (formiddag)"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> (ettermiddag)"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Tid enheten har vært våken"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi – aktivt i"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi – aktivt i"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle sertifikater"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pålitelig legitimasjon"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis pålitelige CA-sertifikater"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avansert"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Lagringstype"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarebasert"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Bare programvare"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Trykk på "<b>"Neste"</b>" for å fortsette konfigurasjonen.\n\nTrykk på "<b>"Tilbake"</b>" for å koble til et annet Wi-Fi-nettverk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktivert"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering deaktivert"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkroniserer nå"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfeil."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Synkroniseringen mislyktes"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synkroniserer"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ta et bilde"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Velg bilde fra galleriet"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Innstillinger for NFC-skjermlåsen"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Sammenkoblede brikker"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktivert"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Koble sammen med en brikke"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Koble sammen nå"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Legg brikken flatt på et bord og plasser telefonen oppå"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Brikken og telefonen er sammenkoblet – du er ferdig!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Den tilkoblede brikken kan ikke brukes til å låse opp telefonen din"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Sammenkoblingen med brikken mislyktes, prøv på nytt"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Du kan ikke låse opp NFC når NFC er ikke aktivert. Slå NFC på."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-innstillinger"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Innstillinger"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Innstillinger"</string>
     <string name="search_menu" msgid="7053532283559077164">"Søk"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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">"Trykk på en brikke for å skrive"</string>
     <string name="status_invalid_password" msgid="2575271864572897406">"Ugyldig passord. Prøv på nytt."</string>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Varselvolum"</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_title_novoice" msgid="4628028304587795604">"Når varsler kommer"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Andre lyder"</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="1340569241625989837">"Skjermlåslyder"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Lyd fra dokk"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Berøringslyder"</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="dock_audio_media_title" msgid="1346838179626123900">"Avspilling fra dokkhøyttaler"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"All lyd"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Bare medielyd"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Stille"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Varsel"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrer"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Av"</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/arrays.xml b/res/values-nl/arrays.xml
index a0a5e99..97c48fe 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Geen"</item>
     <item msgid="8673874894887358090">"Handmatig"</item>
-    <item msgid="168893341855953140">"Proxy autom. configuratie"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Uit"</item>
+    <item msgid="3165868966179561687">"Melding"</item>
+    <item msgid="6038758039030476855">"Trillen"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Geen"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Uit"</item>
     <item msgid="2751513398307949636">"Op het scherm als balken"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Op het scherm als lijnen"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Uit"</item>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 280fd0f..06f633f 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Tijd scherm AAN:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Onbekend"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Opladen"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Opladen via netvoeding"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Opladen via USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Draadloos opladen"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(draadloos)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Wordt niet opgeladen"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Wordt niet opgeladen"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Volledig"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Het poortveld moet leeg zijn als het hostveld leeg is."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"De poort die u heeft ingevoerd, is ongeldig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"De HTTP-proxy wordt gebruikt door de browser, maar mag niet worden gebruikt door de andere apps."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locatie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celinfo:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Instellingen"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Snelkoppeling voor instellingen"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Vliegmodus"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC en meer"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Meer…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Draadloos en netwerken"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wifi, Bluetooth, vliegmodus, mobiele netwerken en VPN\'s beheren"</string>
     <string name="roaming" msgid="3596055926335478572">"Gegevensroaming"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Eigenaarsgegevens"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Widgets inschakelen"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Uitgeschakeld door beheerder"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC-ontgrendeling"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Typ tekst voor weergave op vergrendeld scherm"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Gebruikersgegevens weergeven op vergrendeld scherm"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Schrijven naar NFC-tag"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Helderheidsniveau"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Helderheid van het scherm aanpassen"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Aanpasbare helderheid"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Helderheidsniveau optimaliseren voor beschikbaar licht"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Sms-app wijzigen?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Wilt u <xliff:g id="NEW_APP">%1$s</xliff:g> als uw sms-app gebruiken in plaats van <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Wilt u <xliff:g id="NEW_APP">%s</xliff:g> gebruiken als uw sms-app?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Onbekende simkaartprovider"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Onbekende simprovider"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s heeft geen bekende website voor provisioning"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Plaats een simkaart en start het apparaat opnieuw"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Maak verbinding met internet"</string>
@@ -1322,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="7923901846375587241">"Snelkoppeling naar foutenrapport"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Een knop in Snelle instellingen weergeven om een foutenrapport te maken"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Runtime selecteren"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Opnieuw opstarten om runtime te wijzigen van <xliff:g id="OLD">%1$s</xliff:g> in <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificering van draadloze weergave"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Uitgebreide wifi-logboekregistratie aan"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Opties weergeven voor certificering van draadloze weergave"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wifi-logboekregistratieniveau verhogen, weergeven per SSID RSSI in wifi-kiezer"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signaal mobiel netwerk"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a.m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p.m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Stand-bytijd apparaat"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wifi op tijd"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wifi op tijd"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alle certificaten verwijderen"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Vertrouwde id-gegevens"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrouwde CA-certificaten weergeven"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Geavanceerd"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Opslagtype"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Ondersteund door hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Alleen software"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" aan om door te gaan met de configuratie.\n\nRaak "<b>"Terug"</b>" aan om verbinding te maken met een ander wifi-netwerk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisatie is ingeschakeld"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchroniseren uitgeschakeld"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Nu synchroniseren"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisatiefout."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Synchroniseren mislukt"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synchronisatie actief"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Foto maken"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Foto kiezen in Galerij"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Instellingen voor NFC-schermvergrendeling"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Gekoppelde tags"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Ingeschakeld"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Koppelen aan een tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Nu koppelen"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Leg de tag vlak op een tafel neer en leg de telefoon erop"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Tag en telefoon zijn gekoppeld. U bent klaar."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"De geleverde tag kan niet worden gebruikt om uw telefoon te ontgrendelen"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"De koppeling met uw tag is mislukt, probeer het opnieuw"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC is niet ingeschakeld en is vereist voor NFC-ontgrendeling. Schakel NFC in."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-instellingen"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Instellingen"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Instellingen"</string>
     <string name="search_menu" msgid="7053532283559077164">"Zoeken"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Wifi NFC-tag 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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Meldingsvolume"</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_title_novoice" msgid="4628028304587795604">"Bij inkomende 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Andere geluiden"</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="1340569241625989837">"Geluid v. schermvergrendeling"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Dockinggeluiden"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Aanraakgeluiden"</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="dock_audio_media_title" msgid="1346838179626123900">"Afspelen op dockluidspreker"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Alle audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Alleen media-audio"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Stil"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Waarschuwing"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Trillen"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Aan"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Uit"</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/arrays.xml b/res/values-pl/arrays.xml
index d716e3e..447b364 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Brak"</item>
     <item msgid="8673874894887358090">"Własne"</item>
-    <item msgid="168893341855953140">"Autokonfiguracja proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Wyłączony"</item>
+    <item msgid="3165868966179561687">"Alarm"</item>
+    <item msgid="6038758039030476855">"Wibracje"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Brak"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Wyłączone"</item>
     <item msgid="2751513398307949636">"Na ekranie w postaci pasków"</item>
-    <item msgid="1851438178120770973">"W adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Na ekranie w postaci linii"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Wył."</item>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 8191a02..579d3c3 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Czas włączenia ekranu:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Nieznane"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Ładowanie"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Ładowanie zasilaczem"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Ładowanie przez USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Ład. bezprzewodowe"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezprzewodowo)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Nie podłączony"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nie podłączony"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Pełna"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pole port musi być puste, jeśli pole host jest puste."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Wpisany port jest nieprawidłowy."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Serwer proxy HTTP jest używany przez przeglądarkę, ale inne aplikacje mogą go nie używać."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL pliku PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Adres URL pliku PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokalizacja:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sąsiadujący CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacje:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ustawienia"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Skrót do ustawień"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Tryb samolotowy"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC i inne ustawienia"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Więcej..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Sieci zwykłe i bezprzewodowe"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Zarządzaj połączeniami Wi-Fi i Bluetooth, trybem samolotowym, sieciami komórkowymi i VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming danych"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Informacje o właścicielu"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Włącz widżety"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Wyłączone przez administratora"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Blokada NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Wpisz tekst do wyświetlenia na ekranie blokady."</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Pokaż informacje o użytkowniku na zablokowanym ekranie"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zapisz do tagu NFC"</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>
@@ -618,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="2288214226916117159">"Podaj 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>
@@ -735,10 +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="8480105032417444275">"Poziom jasności"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Dostosuj jasność ekranu"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Automatyczna jasność"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Dostosuj poziom jasności do oświetlenia"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmienić aplikację do SMS-ów?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Używać <xliff:g id="NEW_APP">%1$s</xliff:g> zamiast <xliff:g id="CURRENT_APP">%2$s</xliff:g> jako aplikacji do SMS-ów?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Użyć <xliff:g id="NEW_APP">%s</xliff:g> jako aplikacji do SMS-ów?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Nieznany operator karty SIM"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nieznany operator karty SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nie ma znanej witryny obsługi"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Włóż kartę SIM i zrestartuj urządzenie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Połącz się z internetem"</string>
@@ -1322,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="7923901846375587241">"Skrót do zgłoszenia błędu"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Pokaż w Szybkich ustawieniach przycisk zgłoszenia błędu"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Wybierz czas wykonywania"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Uruchomić ponownie, by zmienić czas wykonywania z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Wyświetlacz bezprzewodowy"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Włącz szczegółowy zapis danych o Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaż opcje certyfikacji wyświetlacza bezprzewodowego"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Zwiększ poziom zapisu danych o Wi-Fi, pokaż RSSI przy SSID w selektorze Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Czy zezwalać na debugowanie USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sygnał sieci komórkowej"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Czas aktywności urządzenia"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Czas z włączonym Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Czas z wł. Wi-Fi"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Usuń wszystkie certyfikaty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Zaufane dane uwierzytelniające"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Wyświetlanie zaufanych certyfikatów CA"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Zaawansowane"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Typ pamięci"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Wspomagana sprzętowo"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Tylko programowa"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Kliknij "<b>"Dalej"</b>", by kontynuować konfigurację.\n\nKliknij "<b>"Wróć"</b>", by połączyć się z inną siecią Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizacja włączona"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizacja wyłączona"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronizacja w toku"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Błąd synchronizacji"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Błąd synchronizacji"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synchronizacja aktywna"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Zrób zdjęcie"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Wybierz zdjęcie z galerii"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Ustawienia wyłączania blokady ekranu przez NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Sparowane zawieszki"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Włączona"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sparuj z tagiem"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sparuj teraz"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Połóż zawieszkę na płaskiej powierzchni i umieść nad nią telefon"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Zawieszka i telefon zostały sparowane. Gotowe."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Tej zawieszki nie można użyć do odblokowania telefonu"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Parowanie z zawieszką nie udało się. Spróbuj ponownie"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Komunikacja NFC nie jest włączona, a jest wymagana do obsługi funkcji Odblokowanie przez NFC. Włącz ją."</string>
+    <string name="ok" msgid="3651563352754792958">"Ustawienia komunikacji NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ustawienia"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ustawienia"</string>
     <string name="search_menu" msgid="7053532283559077164">"Szukaj"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Głośność powiadomień"</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_title_novoice" msgid="4628028304587795604">"Gdy 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Inne dźwięki"</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="1340569241625989837">"Dźwięki blokady ekranu"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Dźwięki dokowania"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Dźwięki przy dotknięciu"</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="dock_audio_media_title" msgid="1346838179626123900">"Głośnik w doku odtwarza"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Wszystkie dźwięki"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Tylko dźwięk multimediów"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Cichy"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alert"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Wibracje"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Wł."</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Wył."</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/arrays.xml b/res/values-pt-rPT/arrays.xml
index fa93829..af4e245 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nenhum"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Config. autom. do proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Desativada"</item>
+    <item msgid="3165868966179561687">"Alerta"</item>
+    <item msgid="6038758039030476855">"Vibrar"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Nenhuma"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Desativado"</item>
     <item msgid="2751513398307949636">"No ecrã como barras"</item>
-    <item msgid="1851438178120770973">"Em adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"No ecrã como linhas"</item>
+    <item msgid="120512413928262547">"Em adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Desativado"</item>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index fb8c971..1ca7b9e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Tempo de activação do ecrã:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconhecido"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"A carregar"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"A carregar por CA"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"A carregar por USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"A carregar sem fios"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sem fios)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Não está a carregar"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está a carregar"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Completo"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo referente à porta tem de estar vazio se o campo do anfitrião estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A porta introduzida não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é utilizado pelo navegador, mas não pode ser utilizado por outras aplicações."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL do PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL de PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Local:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Definições"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho das definições"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo de voo"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC e mais"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fios e outras"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Gerir Wi-Fi, Bluetooth, modo de avião, redes móveis e VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info do proprietário"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Desativados pelo administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueio de NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduzir texto a apresentar no ecrã de bloqueio"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar info. utilizador no ecrã de bloqueio"</string>
@@ -332,8 +333,8 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Encriptado"</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, partindo do princípio 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, partindo do princípio 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_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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Escrever na etiqueta NFC"</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>
@@ -618,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="2288214226916117159">"Introduzir a palavra-passe 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 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>
@@ -735,10 +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="8480105032417444275">"Nível de luminosidade"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho do ecrã"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Luminosidade adaptável"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar o nível de luminosidade de acordo com a luz disponível"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar aplicação de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizar <xliff:g id="NEW_APP">%1$s</xliff:g> em vez de <xliff:g id="CURRENT_APP">%2$s</xliff:g> como a aplicação de SMS predefinida?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizar <xliff:g id="NEW_APP">%s</xliff:g> como a aplicação de SMS predefinida?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operador SIM desconhecido"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operador de cartão SIM desconhecido"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"A %1$s não possui um Website de gestão conhecido"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Ligue-se à Internet"</string>
@@ -1322,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="7923901846375587241">"Atalho para relatório de erros"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Mostrar um botão nas Definições rápidas para obter 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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecionar tempo exec."</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reiniciar para alterar o tempo de execução de <xliff:g id="OLD">%1$s</xliff:g> para <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de display sem fios"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Ativar o registo detalhado de Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opções da certificação de display sem fios"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumentar nível de reg. de Wi-Fi, mostrar por SSID RSSI no selecionador de Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir depuração USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sinal da rede móvel"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Hora de activação do dispositivo"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ligação Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ligação Wi-Fi"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais fiáveis"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados da AC fiáveis"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avançadas"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de armazenamento"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Apenas software"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Seguinte"</b>" para continuar a configuração.\n\nToque em "<b>"Anterior"</b>" para ligar a uma rede Wi‑Fi diferente."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"A sincronizar agora"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização"</string>
     <string name="sync_failed" msgid="1696499856374109647">"A sincronização falhou"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sincronização ativa"</string>
@@ -1808,7 +1807,7 @@
     <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">"Introduza o PIN para desencriptar o 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>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Tirar fotografia"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Escolher fotografia da Galeria"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Definições de bloqueio de ecrã por NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetas sincronizadas"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Ativado"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Sincronizar com uma etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Sincronizar agora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Estique a etiqueta em cima de uma mesa e coloque o telemóvel por cima"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Etiqueta e telemóvel sincronizados com êxito. Tudo pronto!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"A etiqueta fornecida não pode ser utilizada para desbloquear o telemóvel"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Falha ao sincronizar com a etiqueta. Tente novamente."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"O NFC não está ativado e é necessário para o desbloqueio por NFC. Ative o NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Definições de NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Definições"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Definições"</string>
     <string name="search_menu" msgid="7053532283559077164">"Pesquisar"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Config. etiqueta NFC p/ 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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Volume de notificações"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"Não incomodar"</string>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Quando chegam chamadas e notificações"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Quando chegam notificações"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Outros sons"</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="1340569241625989837">"Sons de bloqueio de ecrã"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sons da estação de ancoragem"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Sons de toque"</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="dock_audio_media_title" msgid="1346838179626123900">"Repr. da col. da est. de anc."</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo o áudio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Apenas áudio multimédia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencioso"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrar"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Desativado"</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/arrays.xml b/res/values-pt/arrays.xml
index 8bb5082..dd730b8 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Nenhum"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Autoconfiguração do proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Desativado"</item>
+    <item msgid="3165868966179561687">"Alerta"</item>
+    <item msgid="6038758039030476855">"Vibrar"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Nenhum"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Desativado"</item>
     <item msgid="2751513398307949636">"Na tela em barras"</item>
-    <item msgid="1851438178120770973">"Em adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Na tela em linhas"</item>
+    <item msgid="120512413928262547">"Em adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Desativado"</item>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index c528bfd..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="7617195369015536614">"Redes sem fio e outras"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Dispositivo"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Pessoais"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Tempo ativo da tela:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Desconhecido"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Carregando"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Carregamento CA"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Carregamento via USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Carregamento sem fio"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(CA)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(sem fio)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Não está carregando"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Não está carregando"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Cheio"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo da porta deverá estar vazio se o campo do host estiver vazio."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"A porta digitada não é válida."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros aplicativos."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL do PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL do PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Localização:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Configurar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Atalho para as configurações"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Modo avião"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mais..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Redes sem fio e outras"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Gerenciar Wi-Fi, Bluetooth, modo avião, redes móveis e VPNs"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de dados"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info do proprietário"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Ativar widgets"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Desativado pelo administrador"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Desbloqueio NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Digite o texto a ser exibido na tela de bloqueio"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Mostrar informações do usuário ao bloquear a tela"</string>
@@ -333,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Criptografado"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Você pode criptografar suas contas, configurações, aplicativos transferidos e dados relacionados, conteúdo de mídia e outros arquivos. Depois de criptografar o tablet, caso você tenha configurado uma tela de bloqueio (ou seja, um padrão, PIN númerico ou senha), será necessário desbloquear a tela para descriptografar o tablet sempre que for ligado. A única outra forma de descriptografar o conteúdo é por meio da redefinição para configuração original, o que apaga todos os dados.\n\nA criptografia leva uma hora ou mais. Inicie o processo com a bateria completa e mantenha o tablet conectado até terminar. Em caso de interrupção, pode ocorrer a perda parcial ou total dos dados."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Você pode criptografar suas contas, configurações, aplicativos transferidos e dados relacionados, conteúdo de mídia e outros arquivos. Depois de criptografar o smartphone, caso você tenha configurado uma tela de bloqueio (ou seja, um padrão, PIN númerico ou senha), será necessário desbloquear a tela para descriptografar o smartphone sempre que for ligado. A única outra forma de descriptografar o conteúdo é por meio da redefinição para configuração original, o que apaga todos os dados.\n\nA criptografia leva uma hora ou mais. Inicie o processo com a bateria carregada e mantenha o smartphone conectado até terminar. Em caso de interrupção, pode ocorrer a perda parcial ou total dos 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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Gravar na etiqueta NFC"</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>
@@ -619,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="2288214226916117159">"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>
@@ -736,10 +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="8480105032417444275">"Nível de brilho"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar o brilho da tela"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Brilho adaptável"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Otimizar nível de brilho de acordo com a luz disponível"</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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Alterar aplicativo de SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Usar o <xliff:g id="NEW_APP">%1$s</xliff:g> em vez do <xliff:g id="CURRENT_APP">%2$s</xliff:g> como app de SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Usar o <xliff:g id="NEW_APP">%s</xliff:g> como app de SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operadora do SIM desconhecida"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operadora do SIM desconhecida"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s sem website de aprovisionamento conhecido"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Insira o cartão SIM e reinicie"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conecte-se à Internet"</string>
@@ -1323,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="7923901846375587241">"Atalho para relatório de bugs"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Mostrar um botão para gerar relatórios de bugs em \"Configurações rápidas\""</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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecionar tempo de execução"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reiniciar para mudar tempo de execução de <xliff:g id="OLD">%1$s</xliff:g> para <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de Display sem fio"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Ativar registro extenso de Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opções de certificação de Display sem fio"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumentar nível de reg. de Wi-Fi, mostrar por SSID RSSI no selecionador de Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
@@ -1493,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Sinal da rede móvel"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Tempo ativo do aparelho"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Tempo de ativação da rede Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Tempo de ativação da rede Wi-Fi"</string>
@@ -1615,7 +1621,8 @@
     <string name="tts_default_pitch_title" msgid="6135942113172488671">"Frequência do som"</string>
     <string name="tts_default_pitch_summary" msgid="1328298665182885277">"Afeta o tom do texto falado"</string>
     <string name="tts_default_lang_title" msgid="8018087612299820556">"Idioma"</string>
-    <string name="tts_lang_use_system" msgid="2679252467416513208">"Usar idioma do sistema"</string>
+    <!-- no translation found for tts_lang_use_system (2679252467416513208) -->
+    <skip />
     <string name="tts_lang_not_selected" msgid="7395787019276734765">"Idioma não selecionado"</string>
     <string name="tts_default_lang_summary" msgid="5219362163902707785">"Define a voz específica do idioma para o texto falado"</string>
     <string name="tts_play_example_title" msgid="7094780383253097230">"Ouça um exemplo"</string>
@@ -1678,8 +1685,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Credenciais confiáveis"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados CA de confiança"</string>
-    <!-- no translation found for advanced_security_title (2434776238010578865) -->
-    <skip />
     <string name="credential_storage_type" msgid="8629968543494001364">"Tipo de armazenamento"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Somente software"</string>
@@ -1763,8 +1768,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Próximo"</b>" para continuar a configuração.\n\nToque em "<b>"Voltar"</b>" para conectar-se a outra rede Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
-    <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
-    <skip />
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Falha na sincronização"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sincronização ativa"</string>
@@ -1811,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Digite o PIN para descriptografar o armazenamento"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Trace o padrão 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>
@@ -2065,7 +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>
-    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Favorecer aplicativo em primeiro plano"</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>
@@ -2100,6 +2106,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Tirar foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Escolher foto da Galeria"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Configurações de bloqueio de tela NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etiquetas pareadas"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Ativado"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Parear com uma etiqueta"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Parear agora"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Coloque a etiqueta aberta em uma mesa e coloque o telefone em cima"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Etiqueta e telefone pareados com sucesso. Concluído."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"A etiqueta fornecida não pode ser usada para desbloquear o telefone"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"O pareamento com a etiqueta falhou. Tente novamente"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"A NFC não está ativada para o desbloqueio NFC. Ative a NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Configurações da NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Configurações"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Configurações"</string>
     <string name="search_menu" msgid="7053532283559077164">"Pesquisar"</string>
@@ -2107,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurar etiqueta NFC 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>
@@ -2115,43 +2134,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Sons e notificações"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume de mí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="notification_volume_option_title" msgid="6064656124416882130">"Volume das notificações"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Ao receber chamadas e notificações"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Ao receber 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 ou vibrar"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Toque de notificação padrão"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrar ao tocar"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Exibição de notificações"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsar luz de notificação"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Quando o dispositivo estiver bloqueado"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Não mostrar notificações"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quando \"Não perturbe\" estiver ativado"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ocultar novas notificações da lista"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostrar todas as notificações na lista"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons do teclado"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Sons de bloqueio de tela"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sons da dock"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Sons de toque"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrar ao tocar"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Repr. de alto-falante em dock"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Todo o áudio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Somente áudio de mídia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silencioso"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerta"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibração"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Acesso a notificações"</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>
@@ -2171,18 +2202,24 @@
     <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="3025242591043646494">"Mostrar no início da lista"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ocultar conteúdo confidencial quando o dispositivo estiver bloqueado"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bloqueadas"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Início da lista"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Confidenciais"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2201,6 +2238,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Ativado"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Desativado"</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/arrays.xml b/res/values-rm/arrays.xml
index 544a69c..2c9b1f5 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -129,7 +129,11 @@
     <!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
     <!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
     <!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
-    <!-- no translation found for wifi_proxy_settings:2 (168893341855953140) -->
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Deactivà"</item>
+    <item msgid="3165868966179561687">"Avis"</item>
+    <item msgid="6038758039030476855">"Vibraziun"</item>
+  </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Nagins"</item>
     <item msgid="5756844015743664882">"PAP"</item>
@@ -322,7 +326,8 @@
     <!-- no translation found for show_non_rect_clip_entries:2 (1064373276095698656) -->
     <!-- no translation found for track_frame_time_entries:0 (2193584639058893150) -->
     <!-- no translation found for track_frame_time_entries:1 (2751513398307949636) -->
-    <!-- no translation found for track_frame_time_entries:2 (1851438178120770973) -->
+    <!-- no translation found for track_frame_time_entries:2 (8272260411216018353) -->
+    <!-- no translation found for track_frame_time_entries:3 (120512413928262547) -->
     <!-- no translation found for debug_hw_overdraw_entries:0 (8190572633763871652) -->
     <!-- no translation found for debug_hw_overdraw_entries:1 (7688197031296835369) -->
     <!-- no translation found for debug_hw_overdraw_entries:2 (2290859360633824369) -->
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index cbb8d5f..71e2a99 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -107,11 +107,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Visur activà:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Nunenconuschent"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Vegn chargià"</string>
-    <!-- no translation found for battery_info_status_charging_ac (2909861890674399949) -->
-    <skip />
-    <!-- no translation found for battery_info_status_charging_usb (2207489369680923929) -->
-    <skip />
-    <!-- no translation found for battery_info_status_charging_wireless (3574032603735446573) -->
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <!-- no translation found for battery_info_status_charging_wireless (1822125795446772771) -->
     <skip />
     <!-- no translation found for battery_info_status_discharging (310932812698268588) -->
     <skip />
@@ -288,7 +286,7 @@
     <skip />
     <!-- no translation found for proxy_warning_limited_support (7229337138062837422) -->
     <skip />
-    <!-- no translation found for proxy_url_title (7185282894936042359) -->
+    <!-- no translation found for proxy_url (2523518669129974654) -->
     <skip />
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Posiziun:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vischin:"</string>
@@ -382,7 +380,7 @@
     <!-- no translation found for settings_shortcut (3936651951364030415) -->
     <skip />
     <string name="airplane_mode" msgid="8837269988154128601">"Modus d\'aviun"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
+    <!-- no translation found for radio_controls_title (6889937359495515769) -->
     <skip />
     <!-- no translation found for wireless_networks_settings_title (3643009077742794212) -->
     <skip />
@@ -452,6 +450,8 @@
     <skip />
     <!-- no translation found for security_enable_widgets_disabled_summary (1557090442377855233) -->
     <skip />
+    <!-- no translation found for nfc_unlock_title (8827035651970841825) -->
+    <skip />
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <!-- no translation found for owner_info_settings_edit_text_hint (4608681417960923911) -->
     <skip />
@@ -1525,7 +1525,7 @@
     <skip />
     <!-- no translation found for sms_change_default_no_previous_dialog_text (602683880284921998) -->
     <skip />
-    <!-- no translation found for mobile_unknown_sim_operator (2156912373230276157) -->
+    <!-- no translation found for mobile_unknown_sim_operator (9101230468757324260) -->
     <skip />
     <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
     <skip />
@@ -2073,12 +2073,8 @@
     <skip />
     <!-- no translation found for wifi_display_certification (8611569543791307533) -->
     <skip />
-    <!-- no translation found for wifi_verbose_logging (4770164061102202747) -->
-    <skip />
     <!-- no translation found for wifi_display_certification_summary (1155182309166746973) -->
     <skip />
-    <!-- no translation found for wifi_verbose_logging_summary (4393610458474552685) -->
-    <skip />
     <string name="allow_mock_location" msgid="2787962564578664888">"Posiziuns faussas"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permetter posiziuns faussas"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permetter da debugar USB?"</string>
@@ -2366,16 +2362,6 @@
     <skip />
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <!-- no translation found for battery_stats_hour_24_label (206767955462982310) -->
-    <skip />
-    <!-- no translation found for battery_stats_hour_am_label (8996438390134927921) -->
-    <skip />
-    <!-- no translation found for battery_stats_hour_pm_label (2092425426204059915) -->
-    <skip />
-    <!-- no translation found for battery_stats_date_day_first_label (2416879783432101481) -->
-    <skip />
-    <!-- no translation found for battery_stats_date_month_first_label (669925700794858190) -->
-    <skip />
     <string name="awake" msgid="387122265874485088">"Temp d\'activitad da l\'apparat"</string>
     <!-- no translation found for wifi_on_time (3208518458663637035) -->
     <skip />
@@ -2669,8 +2655,6 @@
     <skip />
     <!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
     <skip />
-    <!-- no translation found for advanced_security_title (2434776238010578865) -->
-    <skip />
     <!-- no translation found for credential_storage_type (8629968543494001364) -->
     <skip />
     <!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
@@ -2816,8 +2800,6 @@
     <skip />
     <!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
     <skip />
-    <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
-    <skip />
     <!-- no translation found for accessibility_sync_error (8703299118794272041) -->
     <skip />
     <!-- no translation found for sync_failed (1696499856374109647) -->
@@ -3482,6 +3464,30 @@
     <!-- no translation found for user_image_choose_photo (3746334626214970837) -->
     <skip />
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <!-- no translation found for lock_settings_nfc_title (33998875572836425) -->
+    <skip />
+    <!-- no translation found for nfc_unlock_paired_tags_title (3837232675294949824) -->
+    <skip />
+    <!-- no translation found for nfc_unlock_enabled (7306199149460932989) -->
+    <skip />
+    <!-- no translation found for start_nfc_pairing (5363319136364735698) -->
+    <skip />
+    <!-- no translation found for title_activity_nfc_pairing (6821817665260628279) -->
+    <skip />
+    <!-- no translation found for pairing_button_title (7411638037556429744) -->
+    <skip />
+    <!-- no translation found for status_no_ring_detected (838954925249421062) -->
+    <skip />
+    <!-- no translation found for status_device_paired (4916932520416516526) -->
+    <skip />
+    <!-- no translation found for status_error_invalid_device (5045003971535647259) -->
+    <skip />
+    <!-- no translation found for status_error_pairing_failed (8260473909085202868) -->
+    <skip />
+    <!-- no translation found for enable_nfc (5234514241098808766) -->
+    <skip />
+    <!-- no translation found for ok (3651563352754792958) -->
+    <skip />
     <!-- no translation found for dashboard_title (5453710313046681820) -->
     <skip />
     <!-- no translation found for search_results_title (1796252422574886932) -->
@@ -3520,14 +3526,10 @@
     <skip />
     <!-- no translation found for ring_volume_option_title (6767101703671248309) -->
     <skip />
-    <!-- no translation found for notification_volume_option_title (6064656124416882130) -->
-    <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_title_novoice (4628028304587795604) -->
-    <skip />
     <!-- no translation found for ringer_mode_audible (4196661772746371017) -->
     <skip />
     <!-- no translation found for ringer_mode_vibrate (3381276665087695839) -->
@@ -3558,30 +3560,16 @@
     <skip />
     <!-- no translation found for app_notifications_title (5810577805218003760) -->
     <skip />
-    <!-- no translation found for other_sound_settings (3151004537006844718) -->
+    <!-- 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 (1340569241625989837) -->
-    <skip />
-    <!-- no translation found for docking_sounds_title (155236288949940607) -->
+    <!-- no translation found for screen_locking_sounds_title (3214032809403683539) -->
     <skip />
-    <!-- no translation found for touch_sounds_title (5326587106892390176) -->
+    <!-- no translation found for other_touch_sounds_title (1692523628776677916) -->
     <skip />
     <!-- no translation found for vibrate_on_touch_title (674710566941697253) -->
     <skip />
-    <!-- no translation found for dock_audio_media_title (1346838179626123900) -->
-    <skip />
-    <!-- no translation found for dock_audio_media_disabled (3430953622491538080) -->
-    <skip />
-    <!-- no translation found for dock_audio_media_enabled (667849382924908673) -->
-    <skip />
-    <!-- no translation found for emergency_tone_silent (1067515631635824291) -->
-    <skip />
-    <!-- no translation found for emergency_tone_alert (8941852695428130667) -->
-    <skip />
-    <!-- no translation found for emergency_tone_vibrate (8281126443204950847) -->
-    <skip />
     <!-- no translation found for manage_notification_access_title (7510080164564944891) -->
     <skip />
     <!-- no translation found for manage_notification_access_summary_zero (2409912785614953348) -->
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 3d622f3..32a908c 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Niciuna"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Config. automată proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Dezactivate"</item>
+    <item msgid="3165868966179561687">"Alarmă"</item>
+    <item msgid="6038758039030476855">"Vibrare"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Niciunul"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Dezactivat"</item>
     <item msgid="2751513398307949636">"Pe ecran ca bare"</item>
-    <item msgid="1851438178120770973">"În adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Pe ecran ca linii"</item>
+    <item msgid="120512413928262547">"În adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Dezactivată"</item>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 7878557..4f91650 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Durata pentru care ecranul este activ:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Necunoscut"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Încarcă"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Se încarcă la C.A."</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Se încarcă prin USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Se încarcă fără fir"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Nu se încarcă"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nu încarcă"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Complet"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Câmpul pentru port trebuie să fie necompletat în situaţia în care câmpul pentru gazdă este necompletat."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Portul introdus nu este valid."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicaţii."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"Adresă URL fișier PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Adresa URL a fișierului PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informaţii celulă:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Setări"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Comandă rapidă pentru setări"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Mod Avion"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC și altele"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mai multe..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless şi reţele"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Gestionați rețelele Wi-Fi, funcția Bluetooth, modul Avion, rețelele mobile și rețelele VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming de date"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info. proprietar"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Activați widgeturi"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Setare dezactivată de administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Deblocare NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Introduceţi textul de afişat pe ecranul de blocare"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Informații utilizator pe ecranul de blocare"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Scrieți într-o etichetă NFC"</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>
@@ -618,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="2288214226916117159">"Introduceți parola de rețea"</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>
@@ -735,10 +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="8480105032417444275">"Nivel de luminozitate"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ajustaţi luminozitatea ecranului"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Luminozitate adaptivă"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimizați nivelul de luminozitate pentru lumina disponibilă"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Schimbați aplicația SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Utilizați <xliff:g id="NEW_APP">%1$s</xliff:g> în loc de <xliff:g id="CURRENT_APP">%2$s</xliff:g> ca aplicație SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Utilizați <xliff:g id="NEW_APP">%s</xliff:g> ca aplicație SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Operator SIM necunoscut"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Operator de SIM necunoscut"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Niciun site de provizionare cunoscut pentru %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Introduceți cartela SIM și reporniți"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Conectați-vă la internet"</string>
@@ -1323,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="7923901846375587241">"Comandă rapidă pentru raportul de erori"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Afișați un buton în Setări rapide pentru a realiza un raport de 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>
@@ -1333,9 +1341,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select. mediul de execuție"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reporniți pentru a schimba mediul de execuție de la <xliff:g id="OLD">%1$s</xliff:g> la <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certificare Ecran wireless"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Activare înscriere detaliată jurnal WiFi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afișați opțiunile pentru certificarea Ecran wireless"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Creștere nivel de înscriere în jurnal Wifi, afișare SSID RSSI în Selector WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Permiteţi depanarea USB?"</string>
@@ -1493,11 +1499,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Semnal reţea mobilă"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> a.m."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> p.m."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Durată de activitate a dispozitivului"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Timp de funcționare Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Timp de funcționare Wi-Fi"</string>
@@ -1678,7 +1679,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminaţi toate certificatele"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Acreditări de încredere"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Afişaţi certificatele CA de încredere"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Setări avansate"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Tip de stocare"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Stocare hardware"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Stocare software"</string>
@@ -1762,7 +1762,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Atingeți "<b>"Înainte"</b>" pentru a continua configurarea.\n\nAtingeți "<b>"Înapoi"</b>" pentru a vă conecta la altă rețea Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizare activată"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizare dezactivată"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Se sincronizează acum…"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Eroare de sincronizare."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sincronizare eşuată"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sincronizare activă"</string>
@@ -2063,7 +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>
-    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"Favorizați aplicația în prim-plan"</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>
@@ -2098,6 +2098,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Faceți o fotografie"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Alegeți o fotografie din Galerie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Setări NFC de blocare a ecranului"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Etichete conectate"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"S-a activat"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Asociați cu o etichetă"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Asociați acum"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Plasați eticheta în poziție orizontală, pe o masă și așezați telefonul deasupra"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Eticheta și telefonul au fost conectate, ați terminat!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Eticheta furnizată nu poate fi utilizată pentru a debloca telefonul."</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Conectarea cu eticheta nu a reușit, încercați din nou."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Funcția NFC nu este activată și este necesară pentru deblocarea NFC. Activați NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Setări NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Setări"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Setări"</string>
     <string name="search_menu" msgid="7053532283559077164">"Căutați"</string>
@@ -2105,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Configurarea etichetei NFC pentru Wi-Fi"</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>
@@ -2117,10 +2130,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Volumul notificărilor"</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_title_novoice" msgid="4628028304587795604">"La primirea notificărilor"</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>
@@ -2137,18 +2148,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Alte sunete"</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="1340569241625989837">"Sunete la blocarea ecranului"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sunete la andocare"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Sunete la atingere"</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="dock_audio_media_title" msgid="1346838179626123900">"Redare difuzor dispoz. andoc."</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Toate semnalele audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Numai audio multimedia"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Silențios"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alertă"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrează"</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">
@@ -2199,6 +2203,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Activat"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Dezactivat"</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/arrays.xml b/res/values-ru/arrays.xml
index 8c4fa57..feda3f3 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Нет"</item>
     <item msgid="8673874894887358090">"Вручную"</item>
-    <item msgid="168893341855953140">"Автоконфигурация прокси"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Выкл."</item>
+    <item msgid="3165868966179561687">"Оповещение"</item>
+    <item msgid="6038758039030476855">"Виброзвонок"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Нет"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Отключить"</item>
     <item msgid="2751513398307949636">"На экране в виде полос"</item>
-    <item msgid="1851438178120770973">"В adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"На экране в виде линий"</item>
+    <item msgid="120512413928262547">"В adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"ВЫКЛ"</item>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 775c39d..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Время работы экрана:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Неизвестно"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Идет зарядка"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Зарядка от сети"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Зарядка через USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Беспроводная зарядка"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"от сети"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"по USB"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(беспроводная)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряжается"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряжается"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Батарея заряжена"</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_title" msgid="7185282894936042359">"URL автоконфигурации прокси "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL файла автоконфигурации прокси-сервера: "</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">"Индекс сети:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Настройки"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ярлык настроек"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим полета"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC и другие настройки"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Ещё..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Беспроводные сети"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Wi-Fi, Bluetooth, режим полета, мобильные сети и VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Интернет-роуминг"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Сведения о владельце"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Включить виджеты"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Отключено администратором"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Разблокировка NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введите текст для показа на экране блокировки"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Показывать введенный ниже текст на экране блокировки"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"Зашифровать данные"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"Зашифровать данные"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"Зашифровано"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Вы можете зашифровать свои аккаунты, настройки, скачанные приложения и их данные, а также медиаданные и другие файлы на устройстве. После этого для расшифровки вам будет необходимо при каждом включении устройства разблокировать экран, если настроена его блокировка (графический ключ, PIN-код или пароль). Другой способ расшифровки – это сбросить настройки планшетного ПК, в результате чего все данные будут удалены.\n\nОбычно шифрование данных занимает час (иногда больше). Перед процедурой полностью зарядите батарею и не отключайте зарядное устройство, пока шифрование не завершится. Если процесс будет прерван, все данные или их часть будет утеряна."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Вы можете зашифровать свои аккаунты, настройки, скачанные приложения и их данные, а также медиаданные и другие файлы на устройстве. После этого для расшифровки вам будет необходимо при каждом включении устройства разблокировать экран, если настроена его блокировка (графический ключ, 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Записать на NFC-метку"</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>
@@ -618,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="2288214226916117159">"Введите пароль для подключения к сети."</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>
@@ -735,10 +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="8480105032417444275">"Яркость"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Настроить яркость экрана"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Адаптивная регулировка"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Настройка яркости с учетом уровня освещенности"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Смена приложения для обмена SMS"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Использовать приложение \"<xliff:g id="NEW_APP">%1$s</xliff:g>\" вместо \"<xliff:g id="CURRENT_APP">%2$s</xliff:g>\" для обмена SMS-сообщениями?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Использовать приложение \"<xliff:g id="NEW_APP">%s</xliff:g>\" для обмена SMS-сообщениями?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Неизвестный оператор связи"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Неизвестный оператор"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"У оператора \"%1$s\" нет веб-сайта для синхронизации"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставьте SIM-карту и перезагрузите устройство"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Подключитесь к Интернету"</string>
@@ -1322,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="7923901846375587241">"Отчет об ошибке"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Показывать в Быстрых настройках кнопку для отправки отчета об ошибке"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Среда выполнения"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Перезагрузить устройство, чтобы сменить среду выполнения с <xliff:g id="OLD">%1$s</xliff:g> на <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Серт. беспроводн. мониторов"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Подробный журнал Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показывать параметры сертификации беспроводных мониторов"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Вести подробный журнал Wi-Fi (показывать значение RSSI для каждой сети)"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Уровень сигнала моб. сети"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Время включения устройства"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Время работы Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Время работы Wi-Fi"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надежные сертификаты"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Дополнительные настройки"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Тип хранилища"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Аппаратное"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Только программное"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Нажмите "<b>"Далее"</b>", чтобы продолжить настройку.\n\nНажмите "<b>"Назад"</b>", чтобы подключиться к другой сети Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизация включена"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизация отключена"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Идет синхронизация."</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Ошибка синхронизации."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Ошибка синхронизации"</string>
     <string name="sync_active" msgid="8476943765960863040">"Синхронизация активна"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Введите PIN-код для расшифровки данных"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Нарисуйте графический ключ для расшифровки данных"</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>
@@ -2099,6 +2106,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Сделать снимок"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Выбрать из Галереи"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Настройки блокировки экрана для связи малого радиуса действия"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Подключенные метки"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Включено"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Подключение NFC-метки"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Подключить"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Положите метку на ровную поверхность и поместите телефон сверху"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Готово!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Этой меткой нельзя разблокировать ваш телефон"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Произошла ошибка. Повторите попытку."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Включите связь малого радиуса действия."</string>
+    <string name="ok" msgid="3651563352754792958">"Настройки связи малого радиуса действия"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Настройки"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Настройки"</string>
     <string name="search_menu" msgid="7053532283559077164">"Поиск"</string>
@@ -2106,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2114,43 +2134,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"Громкость уведомлений"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Рингтон и уведомления"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Уведомления"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Мелодия уведомлений по умолчанию"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Вибросигнал и рингтон"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Уведомления"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Индикатор событий"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"На заблокированном экране"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Другие звуки"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Звук клавиш"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Звук блокировки экрана"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Звуки через док-динамик"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Звук нажатия на экран"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Виброотклик"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Проигрывать через док-динамик"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Все аудио"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Только аудио с носителя"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Без звука"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Оповещения"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибросигнал"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Доступ к уведомлениям"</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>
@@ -2170,18 +2202,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2200,6 +2238,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-sk/arrays.xml
index 2ac8dd8..aca48b4 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Žiadne"</item>
     <item msgid="8673874894887358090">"Ručne"</item>
-    <item msgid="168893341855953140">"Auto. konfig. serv. proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Vypnuté"</item>
+    <item msgid="3165868966179561687">"Upozornenie"</item>
+    <item msgid="6038758039030476855">"Vibrovať"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Žiadne"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Vypnuté"</item>
     <item msgid="2751513398307949636">"Na obrazovke v podobe stĺpcov"</item>
-    <item msgid="1851438178120770973">"V adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Na obrazovke v podobe riadkov"</item>
+    <item msgid="120512413928262547">"V „adb shell dumpsys gfxinfo“"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Vypnuté"</item>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index ffea3ae..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="7617195369015536614">"Bezdrôtové pripojenie a siete"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Zariadenie"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Osobné"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Doba zapnutia obrazovky:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Neznáme"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Nabíjanie"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Nabíjanie zo zásuvky"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Nabíjanie cez USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Bezdrôtové nabíjanie"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(bezdrôtové)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Nenabíja sa"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Nenabíja sa"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Plná"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ak je pole hostiteľ prázdne, musí byť prázdne aj pole port."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Zadaný port nie je platný."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Prehliadač používa server proxy pre protokol HTTP, ale ostatné aplikácie ho používať nemusia."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"Adresa URL PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"Adresa URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Poloha:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedný identifikátor CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavenia"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Odkaz na nastavenia"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Režim V lietadle"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC a ďalšie"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Viac..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Bezdrôtové pripojenie a siete"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Spravovať Wi-Fi, Bluetooth, režim V lietadle, mobilné siete a siete VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dátové služby pri roamingu"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Info o vlastníkovi"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktiv. miniaplikácie"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Zakázané správcom"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Odomknutie NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Zadajte text, ktorý sa zobrazí na uzamknutej obrazovke"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Zobrazovať používateľa na uzamknutej obrazovke"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Šifrované"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Môžete zašifrovať svoje účty, nastavenia, stiahnuté aplikácie a ich údaje, médiá a ďalšie súbory. Ak zašifrujete svoj tablet a zároveň máte nastavenú zámku obrazovky (t. j. vzor, číselný kód PIN alebo heslo), musíte po zapnutí svojho tabletu vždy odomknúť obrazovku, aby ste tablet dešifrovali. Jediný spôsob, ako sa vrátiť do nezašifrovaného režimu, je obnoviť továrenské nastavenia, čím sa vymažú všetky údaje.\n\nŠifrovanie trvá minimálne hodinu. Musíte preto začať s nabitou batériou a počas celého procesu ponechať svoj tablet pripojený k elektrickej zásuvke. Ak dôjde k prerušeniu, stratíte niektoré alebo všetky údaje."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Môžete zašifrovať svoje účty, nastavenia, stiahnuté aplikácie a ich údaje, médiá a ďalšie súbory. Ak zašifrujete svoj telefón a zároveň máte nastavenú zámku obrazovky (t. j. vzor, číselný kód PIN alebo heslo), musíte po zapnutí svojho telefónu vždy odomknúť obrazovku, aby ste telefón dešifrovali. Jediný spôsob, ako sa vrátiť do nezašifrovaného režimu, je obnoviť továrenské nastavenia, čím sa vymažú všetky údaje.\n\nŠifrovanie trvá minimálne hodinu. Musíte preto začať s nabitou batériou a počas celého procesu ponechať svoj telefón pripojený k elektrickej zásuvke. Ak dôjde k prerušeniu, 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zápis do značky NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Úroveň jasu"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Nastavenia jasu obrazovky"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Prispôsobivý jas"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimalizovať úroveň jasu podľa dostupného svetla"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Zmeniť aplikáciu SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Použiť aplikáciu <xliff:g id="NEW_APP">%1$s</xliff:g> namiesto <xliff:g id="CURRENT_APP">%2$s</xliff:g> ako aplikáciu pre SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Použiť aplikáciu <xliff:g id="NEW_APP">%s</xliff:g> ako aplikáciu pre SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Neznámy operátor SIM karty"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznámy operátor karty SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nemá žiadne provízne webové stránky"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vložte kartu SIM a reštartujte"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Pripojte sa k internetu"</string>
@@ -1322,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="7923901846375587241">"Skratka hlásenia o chybe"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Zobraziť tlačidlo vytvorenia hlásenia o chybe v Rýchlych nastaveniach"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výber modulu spustenia"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Chcete vykonať reštart a zmeniť čas spustenia z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikácia bezdrôtového displeja"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Povoliť zapis. do denníka prostr. Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Zobraziť možnosti certifikácie bezdrôtového displeja"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Zvýšiť úroveň zapis. do denníka prostr. Wi-Fi, zobraziť vo výbere Wi-Fi RSSI pre SSID"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Povoliť ladenie USB?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signál mobilnej siete"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> dop."</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> pop."</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>."</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>."</string>
     <string name="awake" msgid="387122265874485088">"Doba používania zariadenia"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Čas prevádzky siete Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas prevádzky siete Wi-Fi"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrániť všetky certifikáty"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Dôveryhodné poverenia"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobraziť dôveryhodné certifikáty CA"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Rozšírené"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Typ úložiska"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardvérové"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Iba softvérový"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>".\n\nAk sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizácia je povolená"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizácia bola zakázaná"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Prebieha synchronizácia"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizácie"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Synchronizácia zlyhala"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synchronizácia je aktívna"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Zadajte kód PIN, čím dešifrujete ukladací priestor"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Nakreslite vzor, čím dešifrujete ukladací priestor"</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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Vytvoriť fotografiu"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Vybrať fotografiu z Galérie"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Nastavenia zámky obrazovky NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Spárované štítky"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Povolené"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Spárovať so značkou"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Spárovať"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Štítok položte vodorovne na stôl a potom naň umiestnite telefón"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Štítok a telefón boli úspešne spárované. Hotovo!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Poskytnutý štítok nie je možné použiť na odomknutie vášho telefónu"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Spárovanie so štítkom zlyhalo. Skúste to znova."</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Nie je povolená technológia NFC, ktorú funkcia Odomknutie NFC vyžaduje. Zapnite technológiu NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Nastavenia NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavenia"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavenia"</string>
     <string name="search_menu" msgid="7053532283559077164">"Hľadať"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"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>
@@ -2112,43 +2132,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Zvuky a upozornenia"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Hlasitosť médií"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Hlasitosť budíka"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Hlasitosť zvonenia"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Hlasitosť upozornení"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Pri prijatí hovorov a upozornení"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Pri prijatí upozornení"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Prezvoniť"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrovať namiesto zvonenia"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Nezvoniť alebo vibrovať"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Predvolený tón zvonenia upozornení"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Vibrovať pri zvonení"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Zobrazovať upozornenia"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blikať kontrolkou upozornenia"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Keď je zariadenie uzamknuté"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nezobrazovať upozornenia"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Keď je zapnutý stav Nerušiť"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Nezobrazovať nové upozornenia v zozname"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Zobraziť všetky upozornenia v zozname"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Iné zvuky"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Zvuky číselnej klávesnice"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Zvuky zámky obrazovky"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Zvuky doku"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Zvuky klepnutia"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrovanie pri klepnutí"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Reproduktory doku"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Všetky zvukové súbory"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Iba zvukové médiá"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tichý režim"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Upozornenie"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibrovanie"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Prístup k upozorneniam"</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>
@@ -2168,18 +2200,24 @@
     <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="3025242591043646494">"Zobraziť v hornej časti zoznamu"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Keď je zariadenie uzamknuté, skryť citlivý obsah"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blokované"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Horná časť zoznamu"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Citlivé"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Zapnuté"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Vypnuté"</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/arrays.xml b/res/values-sl/arrays.xml
index b817bb0..0d3f71a 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Brez"</item>
     <item msgid="8673874894887358090">"Ročno"</item>
-    <item msgid="168893341855953140">"Sam. kon. strežnika proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Izklopljeno"</item>
+    <item msgid="3165868966179561687">"Opozorilo"</item>
+    <item msgid="6038758039030476855">"Vibriranje"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Brez"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Izklopljeno"</item>
     <item msgid="2751513398307949636">"Na zaslonu kot vrstice"</item>
-    <item msgid="1851438178120770973">"V dumpsys gfxinfo lupine adb"</item>
+    <item msgid="8272260411216018353">"Na zaslonu kot črte"</item>
+    <item msgid="120512413928262547">"V gfxinfo dumpsys lupine adb"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Izklop"</item>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 6384e89..a0f5ca3 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Čas vklopa zaslona:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Neznano"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Polnjenje"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Polnj. prek iz. toka"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Polnj. prek USB-ja"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Brezžično polnjenje"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(brezžično)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Se ne polni"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Se ne polni"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Polna"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Če je polje za gostitelja prazno, mora biti prazno tudi polje za vrata."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Vtipkana številka vrat je neveljavna."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL datoteke PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL datoteke PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID v bližini:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Podatki o celici:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Nastavitve"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Bližnjica do nastavitev"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Način za letalo"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC in drugo"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Več ..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Brezžično in omrežja"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Upravljajte Wi‑Fi, Bluetooth, način za letalo, mobilna omrežja in omrežja VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Podatkovno gostovanje"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Lastnikovi podatki"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Omogoči pripomočke"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Onemogočil skrbnik"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Odklepanje z NFC-jem"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Vnesite besedilo za prikaz na zaslonu za zaklepanje"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Pokaži podatke o uporabniku na zaklenjenem zaslonu"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Zapisovanje na oznako NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Raven svetlosti"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Prilagoditev svetlosti zaslona"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Prilagodljiva svetlost"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimiziranje ravni svetlosti glede na razpoložljivo svetlobo"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ali želite zamenjati aplikacijo za SMS-e?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Ali želite za SMS-e namesto aplikacije <xliff:g id="CURRENT_APP">%2$s</xliff:g> uporabljati aplikacijo <xliff:g id="NEW_APP">%1$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Ali želite za SMS-e uporabljati aplikacijo <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Neznan ponudnik kartice SIM"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Neznani operater za SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s nima znanega spletnega mesta za omogočanje uporabe"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vstavite SIM in znova zaženite"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vzpostavite internetno povezavo"</string>
@@ -1322,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="7923901846375587241">"Bližnjica za poročanje o napakah"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Prikaz gumba za poročanje o napakah v »Hitrih nastavitvah«"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Izbira izvajalnika"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Želite napravo znova zagnati, da se različica izvajalnika spremeni z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Potrdilo brezžičnega zaslona"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Omogoči podr. zapis. dnevnika za Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaži možnosti za potrdilo brezžičnega zaslona"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Povečaj raven zapis. dnevn. za Wi-Fi; v izbirniku za Wi-Fi prikaži po SSID RSSI"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ali dovolite odpravljanje težav s povezavo USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal mobilnega omrežja"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>.00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> dop"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> pop"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>. <xliff:g id="MONTH">%2$d</xliff:g>."</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>. <xliff:g id="DAY">%1$d</xliff:g>."</string>
     <string name="awake" msgid="387122265874485088">"Čas odklenjenega zaslona"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Čas z vklopljenim Wi-Fi-jem"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Čas z vklopljenim Wi-Fi-jem"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrani vsa potrdila"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Preverjene poverilnice"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaži zaupanja vredna potrdila overiteljev"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Dodatno"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Vrsta shrambe"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Strojna"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Samo programska"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Če želite nadaljevati namestitev, se dotaknite "<b>"Naprej"</b>".\n\nČe se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizacija omogočena"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizacija onemogočena"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinhronizacija poteka"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Napaka pri sinhronizaciji"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Sinhronizacija ni uspela"</string>
     <string name="sync_active" msgid="8476943765960863040">"Sinhronizacija je aktivna"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Posnemi fotografijo"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Izberite fotografijo iz galerije"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Nastavitve zaklepanja zaslona z NFC-jem"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Seznanjene oznake"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Omogočeno"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Seznani z oznako"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Seznani"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Položite oznako na mizo in odložite telefon nanjo"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Seznanjanje oznake in telefona je uspelo, postopek je končan."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Te oznake ni mogoče uporabiti za odklepanje telefona"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Seznanjanje z oznako ni uspelo, poskusite znova"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC ni omogočen in je potreben za odklepanje z NFC-jem. Vklopite NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Nastavitve za NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Nastavitve"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Nastavitve"</string>
     <string name="search_menu" msgid="7053532283559077164">"Iskanje"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Nastavitev brezžič. 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>
@@ -2116,10 +2128,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Glasnost obvestila"</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_title_novoice" msgid="4628028304587795604">"Ob prejemu 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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Drugi zvoki"</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="1340569241625989837">"Zvoki ob zaklepanju zaslona"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Zvok ob odlaganju v nosilec"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Zvoki dotikov"</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="dock_audio_media_title" msgid="1346838179626123900">"Zvočnik nosilca je vklopljen"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Vsi zvoki"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Samo zvoki predstavnosti"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tiho"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Opozorilo"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibriranje"</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">
@@ -2198,6 +2201,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Vklopljeno"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Izklopljeno"</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/arrays.xml b/res/values-sr/arrays.xml
index 551bf45..ee41a86 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ништа"</item>
     <item msgid="8673874894887358090">"Ручно"</item>
-    <item msgid="168893341855953140">"Аутом. конфиг. проксија"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Искључено"</item>
+    <item msgid="3165868966179561687">"Обавештење"</item>
+    <item msgid="6038758039030476855">"Вибрација"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Ништа"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Искључено"</item>
     <item msgid="2751513398307949636">"На екрану у виду трака"</item>
-    <item msgid="1851438178120770973">"У adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"На екрану у виду линија"</item>
+    <item msgid="120512413928262547">"У adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Искључи"</item>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 464d120..6e5cc3a 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Време укључивања екрана:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Непознато"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Пуњење"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Пуњење преко пуњача"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Пуњење преко USB-а"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Бежично пуњење"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(бежично)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Не пуни се"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не пуни се"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Пуно"</string>
@@ -203,7 +203,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_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Локација:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседни ИД клијента:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Информације о ћелији:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Подешавања"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Пречица подешавања"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим рада у авиону"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC и још тога"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Још…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бежична веза и мреже"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Управљање Wi-Fi мрежом, Bluetooth-ом, режимом рада у авиону, мобилним мрежама и VPN-ом"</string>
     <string name="roaming" msgid="3596055926335478572">"Пренос података у ромингу"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Власник информација"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Омогући виџете"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Онемогућио је администратор"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC откључавање"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Унесите текст за приказ на екрану за закључавање"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Прикажи информације о кориснику на закљ. екрану"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Пиши у NFC ознаку"</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>
@@ -618,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="2288214226916117159">"Унесите лозинку за мрежу"</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>
@@ -735,10 +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="8480105032417444275">"Ниво осветљености"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Прилагођавање осветљености екрана"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Прилагодљива осветљеност"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимизује ниво осветљености према доступном светлу"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Желите ли да промените апликацију за SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Желите ли да користите <xliff:g id="NEW_APP">%1$s</xliff:g> уместо <xliff:g id="CURRENT_APP">%2$s</xliff:g> као апликацију за SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Желите ли да користите <xliff:g id="NEW_APP">%s</xliff:g> као апликацију за SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Непознати SIM оператер"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Непознати SIM оператер"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s нема познатих веб-сајтова за доделу"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Убаците SIM картицу и рестартујте"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Повежите се са интернетом"</string>
@@ -1322,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="7923901846375587241">"Пречица за извештај о грешкама"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Приказује дугме у Брзим подешавањима за прављење извештаја о грешкама"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Избор времена извршавања"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Желите ли да поново покренете уређај да бисте променили време извршавања из <xliff:g id="OLD">%1$s</xliff:g> у <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертификација бежичног екрана"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Омогући опширно пријављивање преко WiFi-ја"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Приказ опција за сертификацију бежичног екрана"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Повећај ниво пријављивања преко Wifi-ја, прикажи према SSID RSSI у WiFi Picker-у"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дозволи отклањање USB грешака?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Сигнал мобилне мреже"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>."</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>."</string>
     <string name="awake" msgid="387122265874485088">"Време буђења уређаја"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi на време"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi на време"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Уклањање свих сертификата"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Поуздани акредитиви"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Прикажи поуздане CA сертификате"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Напредна"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Тип складишног простора"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Подржан хардвером"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтверски"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Додирните "<b>"Даље"</b>" да бисте наставили са подешавањем.\n\nДодирните "<b>"Назад"</b>" да бисте се повезали са другом Wi‑Fi мрежом."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизација је омогућена"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизација је онемогућена"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Синхронизација је у току"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизацији."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Синхронизација није успела"</string>
     <string name="sync_active" msgid="8476943765960863040">"Синхронизација је активна"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Сними слику"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Изабери слику из Галерије"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Подешавања закључавања екрана за NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Упарене ознаке"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Омогућено је"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Упари помоћу ознаке"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Упари одмах"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Поставите ознаку равно на сто и поставите телефон преко ње"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Ознака и телефон су упарени, завршили сте!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Ова ознака не може да се користи за откључавање телефона"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Упаривање са ознаком није успело, покушајте поново"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Нисте омогућили NFC, а он је обавезан за NFC откључавање. Укључите NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC подешавања"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Подешавања"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Подешавања"</string>
     <string name="search_menu" msgid="7053532283559077164">"Претражите"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Подесите 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>
@@ -2116,10 +2128,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"Јачина звука медија"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Јачина звука аларма"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Јачина звука звона"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Јачина звука за обавештења"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не узнемиравај"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"За долазне позиве и обавештења"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Када обавештења стигну"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Други звукови"</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="1340569241625989837">"Звукови закључавања екрана"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Звукови монтирања"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Звукови при додиру"</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="dock_audio_media_title" msgid="1346838179626123900">"Репродукује базна станица"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Сви звукови"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Само медијски звукови"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Нечујно"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Обавештење"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вибрација"</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">
@@ -2198,6 +2201,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-sv/arrays.xml
index e2e5574..a21db3b 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Ingen"</item>
     <item msgid="8673874894887358090">"Manuell"</item>
-    <item msgid="168893341855953140">"Autokonfig. av proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Av"</item>
+    <item msgid="3165868966179561687">"Varning"</item>
+    <item msgid="6038758039030476855">"Vibrera"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Inga"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Av"</item>
     <item msgid="2751513398307949636">"På skärmen som fält"</item>
-    <item msgid="1851438178120770973">"I adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"På skärmen som rader"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Av"</item>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 13a8822..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="7617195369015536614">"Trådlöst och nätverk"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Enhet"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Personligt"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Skärmens PÅ-tid:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Okänd"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Laddar"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Laddas via adapter"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Laddas via USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Laddas trådlöst"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(trådlös)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Laddar inte"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Laddar inte"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Fullt"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfältet måste vara tomt om värdfältet är tomt."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Porten som du har angett är inte giltig."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyn används av webbläsaren men får inte användas av de andra apparna."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC-webbadress: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Plats:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Närliggande CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellinfo:"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Inställningar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Genväg för inställningar"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Flygplansläge"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"Mer..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Trådlöst och nätverk"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Hantera Wi-Fi, Bluetooth, flygplansläge, mobilnät och VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Dataroaming"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Ägaruppgifter"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Aktivera widgetar"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Har inaktiverats av administratören"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Lås upp NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Ange text som ska visas på den låsta skärmen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Visa användarinfo på den låsta skärmen"</string>
@@ -333,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Krypterad"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Du kan kryptera dina konton, inställningar, hämtade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett grafiskt lösenord, en pinkod eller ett lösenord) och krypterar surfplattan måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa fabriksinställningarna, vilket raderar all data.\n\nKrypteringen tar minst en timme. Du måste börja med batteriet laddat och låta surfplattan vara ansluten till ett vägguttag under hela processen. Om du avbryter kommer delar av eller all data att försvinna."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Du kan kryptera dina konton, inställningar, hämtade appar och deras data, mediefiler och övriga filer. Om du har konfigurerat ett skärmlås (det vill säga ett grafiskt lösenord, en pinkod eller ett lösenord) och krypterar mobilen måste du dekryptera den genom att låsa upp skärmen varje gång du slår på den. Det går inte att dekryptera den på något annat sätt utom genom att återställa fabriksinställningarna, vilket raderar all data.\n\nKrypteringen tar minst en timme. Du måste börja med batteriet laddat och låta mobilen vara ansluten till ett vägguttag under hela processen. Om du avbryter kommer delar av eller all data att försvinna."</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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Skriv till en NFC-tagg"</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>
@@ -619,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="2288214226916117159">"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>
@@ -736,10 +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="8480105032417444275">"Ljusstyrka"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ändra skärmens ljusstyrka"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Anpassad ljusstyrka"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Optimera ljusstyrkan efter det tillgängliga ljuset"</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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Vill du byta sms-app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Vill du använda <xliff:g id="NEW_APP">%1$s</xliff:g> som sms-app i stället för <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Vill du använda <xliff:g id="NEW_APP">%s</xliff:g> som sms-app?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Okänd SIM-operatör"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Okänd SIM-operatör"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s har ingen känd administrationswebbplats"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"För in SIM-kortet och starta om"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Anslut till internet"</string>
@@ -1323,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="7923901846375587241">"Genväg till felrapport"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Visa en knapp i snabbinställningarna för att inkludera en felrapport"</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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Välj exekveringsmiljö"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vill du starta om och ändra körningstiden från <xliff:g id="OLD">%1$s</xliff:g> till <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certifiering för Wi-Fi-skärmdelning"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktivera utförlig loggning för Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Visa certifieringsalternativ för Wi-Fi-skärmdelning"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Utöka loggningsnivån för Wi-Fi och visa per SSID RSSI i Wi-Fi-väljaren"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
@@ -1493,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal i mobilt nätverk"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> (fm)"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> (em)"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Aktiv tid för enheten"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi i tid"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi i tid"</string>
@@ -1678,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ta bort alla certifikat"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Tillförlitlig autentisering"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Visa tillförlitliga CA-certifikat"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Avancerat"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Lagringstyp"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarustöd"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Endast programvara"</string>
@@ -1762,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryck på "<b>"Nästa"</b>" om du vill fortsätta med installationen.\n\nTryck på "<b>"Tillbaka"</b>" om du vill ansluta till ett annat Wi-Fi-nätverk."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiverad"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering inaktiverad"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkroniserar nu"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfel."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Det gick inte att synkronisera"</string>
     <string name="sync_active" msgid="8476943765960863040">"Synkronisering är aktiverad"</string>
@@ -1809,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Dekryptera lagringsutrymmet genom att ange pinkoden"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Dekryptera lagringsutrymmet genom att rita det grafiska lösenordet"</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>
@@ -2098,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Ta foto"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Välj ett foto från galleriet"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Inställningar för NFC-skärmlås"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Kopplade NFC-taggar"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Aktiverad"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Parkoppla med en tagg"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Parkoppla nu"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Lägg NFC-taggen på ett bord och lägg mobilen ovanpå"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Kopplingen mellan NFC-taggen och mobilen är klar."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Denna NFC-tagg kan inte användas till att låsa upp mobilen"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kopplingen till NFC-taggen misslyckades, försök igen"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Du kan inte låsa upp med NFC när det inte är aktiverat. Aktivera NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC-inställningar"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Inställningar"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Inställningar"</string>
     <string name="search_menu" msgid="7053532283559077164">"Sökning"</string>
@@ -2105,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Ange en NFC-tagg 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>
@@ -2113,43 +2132,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Ljud och aviseringar"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Medievolym"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarmvolym"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Ringvolym"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Aviseringsvolym"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Vid inkommande samtal och aviseringar"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"När aviseringar tas emot"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Ring"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Vibrera i stället för att ringa"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Varken ring eller vibrera"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Standardsignal för avisering"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Enheten vibrerar vid samtal"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Aviseringar visas"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Blinkande ljusavisering"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"När enheten är låst"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Visa inga aviseringar alls"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"När Stör ej har aktiverats"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Dölj nya aviseringar i listan"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Visa alla aviseringar i listan"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Andra ljud"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Knappsatsljud"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ljud vid skärmlåsning"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Ljud via dockningsstationen"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Ljud vid tryck"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Vibrera vid tryck"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Spela upp i dockade högtalare"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Allt ljud"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Endast ljud från mediafiler"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Tyst"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Varning"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Vibration"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Åtkomst till aviseringar"</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>
@@ -2169,18 +2200,24 @@
     <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="3025242591043646494">"Visa överst i listan"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Dölj känsligt innehåll när enheten är låst"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Blockerad"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Överst i listan"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Känsligt"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2199,6 +2236,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"På"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Av"</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/arrays.xml b/res/values-sw/arrays.xml
index ffbc65f..7a6f6c2 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Hamna"</item>
     <item msgid="8673874894887358090">"Mwongozo"</item>
-    <item msgid="168893341855953140">"Usanidi Kiotomatiki wa Seva Mbadala"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Zima"</item>
+    <item msgid="3165868966179561687">"Tahadhari"</item>
+    <item msgid="6038758039030476855">"Tetema"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Hamna"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Imezimwa"</item>
     <item msgid="2751513398307949636">"Kwenye skrini kama pau"</item>
-    <item msgid="1851438178120770973">"Katika adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Kwenye skrini kama mistari"</item>
+    <item msgid="120512413928262547">"Katika adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Zima"</item>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 155eb89..bdd7302 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -30,7 +30,7 @@
     <string name="show_dev_already" msgid="2151632240145446227">"Hakuna haja, tayari wewe ni msanidi programu."</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">"Ya Kibinafsi"</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>
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Muda wa skrini kuwaka:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Haijulikani"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Inachaji"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Inachaji kupitia AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Inachaji kupitia USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Inachaji bila kutumia waya"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(pasiwaya)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Haichaji"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Haichaji"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Imejaa"</string>
@@ -205,7 +205,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Sehemu ya mlango sharti iwe wazi iwapo sehemu ya mpangishaji haina chochote"</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Lango uliloandika si halali."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL ya PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL ya PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Mahali:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ya ujirani:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Maelezo ya Simu:"</string>
@@ -278,7 +278,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Mipangilio"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Mipangilio ya njia ya mkato"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Hali ya ndege"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC na zaidi"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Zaidi…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Mitandao isiyotumia waya"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Dhibiti Wi-Fi, Bluetooth, hali ya ndege, mitandao ya simu za mkononi na VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Utumiaji data nje ya mtandao wako wa kawaida"</string>
@@ -319,6 +319,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Maelezo ya mmiliki"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Washa wijeti"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Msimamizi ameizima"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Kufungua NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Andika maandishi ya kuonyeshwa kwenye skrini ya kufunga"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Onyesha maelezo ya mtumiaji kwenye skrini ya kufunga"</string>
@@ -334,8 +335,8 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Usimbaji fiche"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Unaweza kusimba akaunti zako, mipangilio, programu zilizopakuliwa na data husika, maudhui, na faili nyingine kwa njia fiche. Baada ya kusimba kompyuta yako kibao kwa njia fiche, tukichukulia kwamba umeweka kifunga 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 ukiwa na 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 husika, maudhui, na faili nyingine kwa njia fiche. Baada ya kusimba simu yako kwa njia fiche, tukichukulia kwamba umeweka kifunga 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 ukiwa na 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_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>
@@ -561,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Andika kwenye tagi ya NFC"</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>
@@ -610,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="2288214226916117159">"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>
@@ -727,10 +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="8480105032417444275">"Hali ya mwangaza"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Rekebisha mwangaza wa skrini"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Mwangaza uliorekebishwa"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Boresha kiwango cha mwangaza kwa mwanga unaopatikana"</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>
@@ -982,7 +988,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Ungependa kubadilisha programu ya SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Ungependa kutumia <xliff:g id="NEW_APP">%1$s</xliff:g> badala ya <xliff:g id="CURRENT_APP">%2$s</xliff:g> kama programu yako ya SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Ungependa kutumia <xliff:g id="NEW_APP">%s</xliff:g> kama programu yako ya SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Mtoa huduma wa SIM asiyejulikana"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Ishara maalum ya utagutaji ya SIM isiyojulikana"</string>
     <!-- String.format failed for translation -->
     <!-- no translation found for mobile_no_provisioning_url (2399426808423775711) -->
     <skip />
@@ -1083,7 +1089,7 @@
     <string name="install_all_warning" product="tablet" msgid="3263360446508268880">"Kompyuta yako ndogo na data ya kibinafsi iko hatarini kushambuliwa na programu kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa kompyuta yako ndogo au kupoteza data ambayo inaweza kutokana kwa kutumia programu hizi."</string>
     <string name="install_all_warning" product="default" msgid="8113734576826384682">"Simu yako na data ya kibinafsi inaweza kushambuliwa na programu kutoka kwa vyanzo visivyojulikana. Unakubali kuwa unawajibika mwenyewe kwa uharibifu wowote kwa simu yako au kupoteza data ambayo inaweza kusababishwa kutokana na kutumiwa na programu hizi."</string>
     <string name="verify_applications" msgid="2959359554974828518">"Thibitisha programu"</string>
-    <string name="verify_applications_summary" msgid="2791141629887492480">"Kagua shughuli za kifaa mara kwa mara ili kubaini ikiwa kuna matatizo ya kiusalama, na kuzuia au kuonya kuhusu chochote kinachoweza kusababisha madhara."</string>
+    <string name="verify_applications_summary" msgid="2791141629887492480">"Kagua shughuli za kifaa mara kwa mara ili kubaini ikiwa kuna matatizo ya kiusalama, na uzuie au kuonya kuhusu uwezekano wa madhara."</string>
     <string name="advanced_settings" msgid="1777249286757067969">"Mipangilio ya kina"</string>
     <string name="advanced_settings_summary" msgid="4016682978071086747">"Wezesha chaguo zaidi ya mipangilio."</string>
     <string name="application_info_label" msgid="5736524913065714880">"Maelezo ya programu"</string>
@@ -1316,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="7923901846375587241">"Njia ya mkato ya kuripoti hitilafu"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Onyesha kitufe katika Mipangilio ya Haraka cha kuwasilisha 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>
@@ -1326,9 +1334,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Chagua muda wa kuendesha"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Fungua upya na ubadilishe muda wa kuendesha kutoka <xliff:g id="OLD">%1$s</xliff:g> hadi <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chaguo za cheti cha kuonyesha pasiwaya"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Washa Uwekaji kumbukumbu za WiFi kutumia Sauti"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Onyesha chaguo za cheti cha kuonyesha pasiwaya"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Ongeza kiwango cha uwekaji kumbukumbu za Wifi, onyesha kwa kila SSID RSSI katika Kichumaji cha WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Ruhusu utatuaji USB?"</string>
@@ -1486,11 +1492,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mawimbi ya mtandao wa simu ya mkononi"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Muda wa kuamka kwa kifaa"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fia kwa wakati unaofaa"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi wakati unaofaa"</string>
@@ -1671,7 +1672,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Ondoa vyeti vyote"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Stakabadhi zinazoaminika"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Onyesha vyeti vya CA vinavyoaminika"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Mipangilio Ya Kina"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Aina ya hifadhi"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Inaweza kutumiwa na maunzi"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Programu pekee"</string>
@@ -1755,7 +1755,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Gusa"<b>"Inayofuata"</b>" ili kuendelea na usanidi.\n\nGusa"<b>"Nyuma"</b>" ili kuunganisha kwenye mtandao tofauti wa Wi-Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Kusawazisha kumelemazwa"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Kusawazisha kumelemazwa"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Inasawazisha sasa"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Hitilafu ya usawazishaji."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Usawazishaji haukuwezekana"</string>
     <string name="sync_active" msgid="8476943765960863040">"Usawazishaji amilifu"</string>
@@ -2056,7 +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">"Weka programu unayopendelea mbele"</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>
@@ -2091,6 +2090,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Piga picha"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Chagua picha kutoka Matunzio"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Mipangilio ya Kufunga Skrini ya NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Lebo Zilizooanishwa"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Imewashwa"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Oanisha na tagi"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Shughuli ya Kuoanisha Nfc"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Oanisha sasa"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Weka lebo mezani na uweke simu juu yake"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Lebo na simu zimeoanishwa bila tatizo, umemaliza!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Lebo iliyotolewa haiwezi kutumika kufungua simu yako"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Kuoanisha na lebo yako kulishindikana, tafadhali jaribu tena"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC haijawashwa na inahitajika ili Kufungua NFC. Tafadhali washa NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Mipangilio ya NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Mipangilio"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mipangilio"</string>
     <string name="search_menu" msgid="7053532283559077164">"Utafutaji"</string>
@@ -2098,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Sanidi tagi ya NFC ya Wi-Fi"</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>
@@ -2110,19 +2122,17 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Sauti ya arifa"</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_title_novoice" msgid="4628028304587795604">"Arifa zinapopokelewa"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Itoe mlio"</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 chaguo-msingi wa arifa"</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">"Kifaa kikiwa kimefungwa"</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>
@@ -2130,18 +2140,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Sauti nyingine"</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="1340569241625989837">"Sauti za kufunga skrini"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Sauti za kuambatisha"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Itoe sauti inapoguswa"</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="dock_audio_media_title" msgid="1346838179626123900">"Cheza kutumia spika ya kituo"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Sauti zote"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Sauti za vyombo vya habari tu"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Kimya"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Tahadhari"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Tetema"</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">
@@ -2162,10 +2165,10 @@
     <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="3025242591043646494">"Onyesha mwanzoni mwa orodha"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ficha maudhui nyeti kifaa kikiwa kimefungwa"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Imezuiwa"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Mwanzo wa orodha"</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_default_option" msgid="6940069025071935243">"Hadi utakapozima hili"</string>
@@ -2192,6 +2195,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Imewashwa"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Imezimwa"</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/arrays.xml b/res/values-th/arrays.xml
index 85a72e2..c27e22f 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"ไม่มี"</item>
     <item msgid="8673874894887358090">"ด้วยตนเอง"</item>
-    <item msgid="168893341855953140">"กำหนดค่าพร็อกซีอัตโนมัติ"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"ปิด"</item>
+    <item msgid="3165868966179561687">"การเตือน"</item>
+    <item msgid="6038758039030476855">"สั่น"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"ไม่มี"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"ปิด"</item>
     <item msgid="2751513398307949636">"เป็นแถบบนหน้าจอ"</item>
-    <item msgid="1851438178120770973">"ใน adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"เป็นเส้นบนหน้าจอ"</item>
+    <item msgid="120512413928262547">"ใน adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"ปิด"</item>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a92eb98..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"เวลาเปิดหน้าจอ:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"ไม่ทราบ"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"กำลังชาร์จ"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"กำลังชาร์จไฟ AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"กำลังชาร์จผ่าน USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"กำลังชาร์จแบบไร้สาย"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(ระบบไร้สาย)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"ไม่ได้ชาร์จ"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"ไม่ได้ชาร์จ"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"เต็ม"</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_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</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">"ข้อมูลเซลล์:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"การตั้งค่า"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"ทางลัดการตั้งค่า"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"โหมดใช้งานบนเครื่องบิน"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC และอื่นๆ เพิ่มเติม"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"เพิ่มเติม..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"ระบบไร้สายและเครือข่าย"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"จัดการ WiFi, บลูทูธ, โหมดใช้งานบนเครื่องบิน, เครือข่ายมือถือ และ VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"การโรมมิ่งข้อมูล"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"ข้อมูลเจ้าของ"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"เปิดใช้งานวิดเจ็ต"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"ปิดใช้งานโดยผู้ดูแลระบบ"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"การปลดล็อก NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"พิมพ์ข้อความที่ต้องการให้แสดงบนหน้าจอล็อก"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"แสดงข้อมูลผู้ใช้บนหน้าจอล็อก"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"เข้ารหัสแท็บเล็ต"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"เข้ารหัสโทรศัพท์"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"ที่เข้ารหัส"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปที่ดาวน์โหลดและข้อมูลของแอปนั้น สื่อ และไฟล์อื่นๆ หลังจากที่คุณเข้ารหัสแท็บเล็ต สมมติว่าคุณตั้งค่าล็อกหน้าจอ (ที่เป็นรูปแบบหรือ PIN ตัวเลข หรือรหัสผ่าน) คุณจะต้องปลดล็อกหน้าจอเพื่อถอดรหัสแท็บเล็ตทุกครั้งที่เปิดเครื่อง วิธีการถอดรหัสอีกวิธีหนึ่งคือการรีเซ็ตข้อมูลเป็นค่าเริ่มต้น ซึ่งจะลบข้อมูลทั้งหมด\n\nการเข้ารหัสจะใช้เวลาอย่างน้อย 1 ชั่วโมง คุณต้องดำเนินการเมื่อแท็บเล็ตมีแบตเตอรี่ที่ชาร์จแล้วและเสียบปลั๊กไว้ตลอดขั้นตอนนี้ หากคุณขัดจังหวะการทำงาน ข้อมูลบางส่วนหรือทั้งหมดจะหายไป"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"คุณสามารถเข้ารหัสบัญชี การตั้งค่า แอปที่ดาวน์โหลดและข้อมูลของแอปนั้น สื่อ และไฟล์อื่นๆ หลังจากที่คุณเข้ารหัสโทรศัพท์ สมมติว่าคุณตั้งค่าล็อกหน้าจอ (ที่เป็นรูปแบบหรือ 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"เขียนไปยังแท็ก NFC"</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>
@@ -618,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="2288214226916117159">"ป้อนรหัสผ่านเครือข่าย"</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>
@@ -735,10 +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="8480105032417444275">"ระดับความสว่าง"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"ปรับความสว่างหน้าจอ"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"ความสว่างที่ปรับได้"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"ปรับระดับความสว่างให้เหมาะกับแสงที่มีอยู่"</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>
@@ -789,7 +801,7 @@
     <string name="device_info_settings" product="default" msgid="475872867864762157">"สถานะโทรศัพท์"</string>
     <string name="system_update_settings_list_item_title" msgid="3342887311059985961">"การอัปเดตระบบ"</string>
     <string name="system_update_settings_list_item_summary" msgid="3853057315907710747"></string>
-    <string name="firmware_version" msgid="4801135784886859972">"เวอร์ชันของแอนดรอยด์"</string>
+    <string name="firmware_version" msgid="4801135784886859972">"เวอร์ชันของ Android"</string>
     <string name="model_number" msgid="3765737700545384794">"หมายเลขรุ่น"</string>
     <string name="fcc_equipment_id" msgid="149114368246356737">"รหัสอุปกรณ์"</string>
     <string name="baseband_version" msgid="1848990160763524801">"เวอร์ชันเบสแบนด์"</string>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"เปลี่ยนแอป SMS ไหม"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"ใช้ <xliff:g id="NEW_APP">%1$s</xliff:g> เป็นแอป SMS ของคุณแทน <xliff:g id="CURRENT_APP">%2$s</xliff:g> ไหม"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"ใช้ <xliff:g id="NEW_APP">%s</xliff:g> เป็นแอป SMS ของคุณไหม"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"ไม่รู้จักผู้ให้บริการซิม"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"ผู้ให้บริการซิมที่ไม่รู้จัก"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s ไม่มีเว็บไซต์การจัดสรรที่รู้จัก"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"โปรดใส่ซิมการ์ดและรีสตาร์ท"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"โปรดเชื่อมต่ออินเทอร์เน็ต"</string>
@@ -1156,7 +1168,7 @@
     <string name="app_not_found_dlg_text" msgid="8333723538280257243">"ไม่พบแอปพลิเคชันนี้ในรายการแอปพลิเคชันที่ติดตั้งไว้"</string>
     <string name="clear_data_failed" msgid="1907582169616856698">"ไม่สามารถล้างข้อมูลแอปพลิเคชัน"</string>
     <string name="app_factory_reset_dlg_title" msgid="7441012826373143593">"ถอนการติดตั้งการอัปเดตหรือไม่"</string>
-    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"การอัปเดตทั้งหมดของแอปพลิเคชันระบบแอนดรอยด์นี้จะถูกถอนการติดตั้ง"</string>
+    <string name="app_factory_reset_dlg_text" msgid="6371247225487725860">"การอัปเดตทั้งหมดของแอปพลิเคชันระบบ Android นี้จะถูกถอนการติดตั้ง"</string>
     <string name="clear_failed_dlg_title" msgid="2387060805294783175">"ล้างข้อมูล"</string>
     <string name="clear_failed_dlg_text" msgid="1092177570631523106">"ไม่สามารถล้างข้อมูลสำหรับแอปพลิเคชัน"</string>
     <string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"แอปพลิเคชันนี้สามารถเข้าถึงสิ่งต่อไปนี้บนแท็บเล็ตของคุณ:"</string>
@@ -1322,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="7923901846375587241">"ทางลัดรายงานข้อบกพร่อง"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"แสดงปุ่มใน \"การตั้งค่าด่วน\" สำหรับการใช้รายงานข้อบกพร่อง"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"เลือกรันไทม์"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"รีบูตเพื่อเปลี่ยนรันไทม์จาก <xliff:g id="OLD">%1$s</xliff:g> เป็น <xliff:g id="NEW">%2$s</xliff:g> ไหม"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"การรับรองการแสดงผลแบบไร้สาย"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"เปิดใช้การบันทึกรายละเอียด WiFi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"แสดงตัวเลือกสำหรับการรับรองการแสดงผล แบบไร้สาย"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"เพิ่มระดับการบันทึก WiFi แสดงตาม SSID RSSI ในเครื่องมือเลือก WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"อนุญาตให้แก้ไขข้อบกพร่อง USB หรือไม่"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"สัญญาณเครือข่ายมือถือ"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>.00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"เวลาการทำงานของอุปกรณ์"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"เวลาเปิดใช้ WiFi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"เวลาเปิดใช้ WiFi"</string>
@@ -1565,7 +1572,7 @@
     <string name="menu_stats_last_unplugged" msgid="5922246077592434526">"การใช้งานตั้งแต่ถอดปลั๊กของ <xliff:g id="UNPLUGGED">%1$s</xliff:g>"</string>
     <string name="menu_stats_total" msgid="8973377864854807854">"ยอดใช้งานรวม"</string>
     <string name="menu_stats_refresh" msgid="1676215433344981075">"รีเฟรช"</string>
-    <string name="process_kernel_label" msgid="3916858646836739323">"ระบบปฏิบัติการของแอนดรอยด์"</string>
+    <string name="process_kernel_label" msgid="3916858646836739323">"ระบบปฏิบัติการของ Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Mediaserver"</string>
     <string name="process_stats_summary_title" msgid="1144688045609771677">"สถิติเกี่ยวกับกระบวนงาน"</string>
     <string name="process_stats_summary" msgid="109387941605607762">"สถิติเชิงลึกเกี่ยวกับกระบวนงานที่ทำงานอยู่"</string>
@@ -1593,7 +1600,7 @@
     <string name="voice_input_output_settings" msgid="1336135218350444783">"อินพุตและเอาต์พุตเสียง"</string>
     <string name="voice_input_output_settings_title" msgid="2442850635048676991">"การตั้งค่าอินพุตและเอาต์พุตเสียง"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"ค้นหาด้วยเสียง"</string>
-    <string name="keyboard_settings_title" msgid="5080115226780201234">"แป้นพิมพ์แอนดรอยด์"</string>
+    <string name="keyboard_settings_title" msgid="5080115226780201234">"แป้นพิมพ์ Android"</string>
     <string name="voice_category" msgid="1430370497125803904">"คำพูด"</string>
     <string name="voice_interactor_title" msgid="4591706322348912721">"การป้อนข้อมูลด้วยเสียง"</string>
     <string name="voice_interactor_settings_title" msgid="448041804591022360">"การป้อนข้อมูลด้วยเสียง"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"นำใบรับรองทั้งหมดออก"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"ข้อมูลรับรองที่เชื่อถือได้"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"แสดงใบรับรอง CA ที่เชื่อถือได้"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"ขั้นสูง"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"ประเภทพื้นที่เก็บข้อมูล"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"ใช้ฮาร์ดแวร์"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"ซอฟต์แวร์เท่านั้น"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"แตะ "<b>"ถัดไป"</b>" เพื่อตั้งค่าต่อไป\n\nแตะ "<b>"ย้อนกลับ"</b>" เพื่อเชื่อมต่อกับเครือข่าย WiFi อื่น"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"เปิดใช้งานการซิงค์แล้ว"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"ปิดใช้งานการซิงค์แล้ว"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"กำลังซิงค์อยู่ในขณะนี้"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"ข้อผิดพลาดในการซิงค์"</string>
     <string name="sync_failed" msgid="1696499856374109647">"การซิงค์ล้มเหลว"</string>
     <string name="sync_active" msgid="8476943765960863040">"เปิดใช้งานการซิงค์"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"ป้อน PIN เพื่อถอดรหัสที่จัดเก็บข้อมูล"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"วาดรูปแบบเพื่อถอดรหัสที่จัดเก็บข้อมูล"</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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"ถ่ายภาพ"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"เลือกรูปภาพจากแกลเลอรี"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"การตั้งค่าล็อกหน้าจอด้วย NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"ป้ายที่จับคู่"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"เปิดอยู่"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"จับคู่กับแท็ก"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"จับคู่เลย"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"วางป้ายราบไปกับโต๊ะ และวางโทรศัพท์ไว้ข้างบน"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"จับคู่ป้ายและโทรศัพท์สำเร็จแล้ว ทุกอย่างเรียบร้อย!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"ป้ายที่ระบุไม่สามารถใช้ปลดล็อกโทรศัพท์ของคุณ"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"การจับคู่กับป้ายของคุณล้มเหลว โปรดลองอีกครั้ง"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC ไม่ได้เปิดอยู่ แต่จำเป็นสำหรับการปลดล็อกด้วย NFC โปรดเปิด NFC"</string>
+    <string name="ok" msgid="3651563352754792958">"การตั้งค่า NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"การตั้งค่า"</string>
     <string name="search_results_title" msgid="1796252422574886932">"การตั้งค่า"</string>
     <string name="search_menu" msgid="7053532283559077164">"ค้นหา"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"ตั้งค่าแท็ก 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>
@@ -2112,43 +2132,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"ระดับเสียงของการแจ้งเตือน"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"เมื่อมีสายเรียกเข้าหรือการแจ้งเตือน"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"เมื่อมีการแจ้งเตือน"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"เสียงเรียกเข้าเริ่มต้นสำหรับการแจ้งเตือน"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"สั่นเมื่อมีสายเข้า"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"การแสดงการแจ้งเตือน"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"ไฟแจ้งเตือนพัลซ์"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"เมื่ออุปกรณ์ล็อก"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"เสียงอื่นๆ"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"เสียงแป้นหมายเลข"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"เสียงล็อกหน้าจอ"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"เสียงเชื่อมต่อแท่น"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"เสียงแตะ"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"สั่นเมื่อแตะ"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"แท่นลำโพงเล่น"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"เสียงทั้งหมด"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"เสียงของสื่อเท่านั้น"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"เงียบ"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"การแจ้งเตือน"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"สั่น"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"การเข้าถึงการแจ้งเตือน"</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>
@@ -2168,18 +2200,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-tl/arrays.xml
index eaac377..51be726 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Wala"</item>
     <item msgid="8673874894887358090">"Manual"</item>
-    <item msgid="168893341855953140">"Auto-Config ng Proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Naka-off"</item>
+    <item msgid="3165868966179561687">"Alerto"</item>
+    <item msgid="6038758039030476855">"I-vibrate"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Wala"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Naka-off"</item>
     <item msgid="2751513398307949636">"Sa screen bilang mga bar"</item>
-    <item msgid="1851438178120770973">"In adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Sa screen bilang mga linya"</item>
+    <item msgid="120512413928262547">"Sa adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"I-off"</item>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 3c3182a..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="7617195369015536614">"Wireless at Mga Network"</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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Oras na NAKA-ON ang screen :"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Hindi Kilala"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Nagcha-charge"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Nagcha-charge sa AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Nagcha-charge sa USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Wireless nag-charge"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(wireless)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Hindi nagcha-charge"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hindi nagkakarga"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Buo"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Dapat na walang laman ang field ng port kung walang laman ang field ng host."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Hindi wasto ang port na iyong na-type."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng iba pang apps."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasyon:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Katabing CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Mga Setting"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Shortcut ng Mga Setting"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Airplane mode"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC at higit pa"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Higit pa..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Wireless &amp; mga network"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Pamahalaan ang Wi-Fi, Bluetooth, airplane mode, mga mobile network at mga VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Roaming ng data"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Impo ng may-ari"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"I-enable ang widget"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Na-disable ng administrator"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Pag-unlock ng NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Mag-type ng teksto upang maipakita sa lock screen"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Ipakita ang impormasyon ng user sa lock screen"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Na-encrypt"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na app at ang data, media at iba pang mga file ng mga ito. Pagkatapos mong i-encrypt ang iyong tablet, kung ipagpalagay na nag-set up ka ng lock ng screen (na isang pattern o numeric na PIN o password), kakailanganin mong i-unlock ang screen upang i-decrypt ang tablet sa tuwing i-o-on mo ito. Ang tanging paraan upang mag-decrypt bukod dito ay magsagawa ng pag-reset ng factory data, na magbubura sa lahat ng iyong data.\n\nTumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may na-charge na baterya at panatilihing naka-plug in ang iyong tablet sa kabuuan ng proseso. Kung ihihinto mo, mawawala mo ang ilan sa o lahat ng iyong data"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Maaari mong i-encrypt ang iyong mga account, setting, na-download na app at ang data, media at iba pang mga file ng mga ito. Pagkatapos mong i-encrypt ang iyong telepono, kung ipagpalagay na nag-set up ka ng lock ng screen (na isang pattern o numeric na PIN o password), kakailanganin mong i-unlock ang screen upang i-decrypt ang telepono sa tuwing i-o-on mo ito. Ang tanging paraan upang mag-decrypt bukod dito ay magsagawa ng pag-reset ng factory data, na magbubura sa lahat ng iyong data.\n\nTumatagal nang isang oras o higit pa ang pag-encrypt. Dapat kang magsimula nang may na-charge na baterya at panatilihing naka-plug in ang iyong telepono sa kabuuan ng proseso. Kung ihihinto mo, 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Isulat sa tag ng NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Antas ng brightness"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ayusin ang liwanag ng screen"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Adaptive brightness"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"I-optimize ang antas ng brightness para sa available na ilaw"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Palitan ang SMS app?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Gamitin ang <xliff:g id="NEW_APP">%1$s</xliff:g> sa halip na ang <xliff:g id="CURRENT_APP">%2$s</xliff:g> bilang iyong SMS app?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Gamitin ang <xliff:g id="NEW_APP">%s</xliff:g> bilang iyong SMS app?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Hindi kilalang SIM operator"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Hindi kilalang operator ng SIM"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"Walang kilalang nagpoprobisyong website ang %1$s"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Mangyaring magpasok ng SIM card at mag-restart"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Mangyaring kumonekta sa Internet"</string>
@@ -1322,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="7923901846375587241">"Shortcut ng ulat sa bug"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Magpakita ng button sa Mga Mabilisang Setting para sa paggawa 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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Piliin ang runtime"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"I-reboot upang baguhin ang runtime mula sa <xliff:g id="OLD">%1$s</xliff:g> patungo sa <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Certification ng wireless display"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"I-enable ang WiFi Verbose Logging"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Ipakita ang mga opsyon para sa certification ng wireless display"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Taasan ang antas ng pagla-log sa Wifi, ipakita sa bawat SSID RSSI sa WiFi Picker"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Payagan ang pag-debug ng USB?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Signal ng mobile network"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Device ng oras ng paggising"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi na nasa oras"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi na nasa oras"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Alisin ang lahat ng certificate"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Pinagkakatiwalaang kredensyal"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Ipakita ang mga pinagkakatiwalaang mga CA certificate"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Advanced"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Uri ng storage"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Software lang"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa pag-setup.\n\nPindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang Wi-Fi network."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Pinapagana ang sync"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Hindi pinapagana ang pag-sync"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Nagsi-sync ngayon"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Error sa pag-sync."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Nabigo ang pag-sync"</string>
     <string name="sync_active" msgid="8476943765960863040">"Aktibo ang pag-sync"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Ilagay ang iyong PIN upang i-decrypt ang storage"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Iguhit ang iyong pattern 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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Kumuha ng larawan"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Pumili ng larawan mula sa Gallery"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Mga Setting ng Lock ng Screen ng NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Mga Magkapares na Tag"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Naka-enable"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Ipares sa isang tag"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Ipares ngayon"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Itakda ang tag nang naka-flat sa lamesa at ilagay ang telepono sa ibabaw"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Matagumpay na naipares ang tag at telepono, tapos ka na!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Hindi maaaring gamitin ang ibinigay na tag upang i-unlock ang iyong telepono"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Hindi naipares ang iyong tag, pakisubukang muli"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Hindi naka-enable ang NFC at kinakailangan para sa Pag-unlock ng NFC. Paki-on ang NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Mga Setting ng NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Mga Setting"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Mga Setting"</string>
     <string name="search_menu" msgid="7053532283559077164">"Maghanap"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"I-set up ang Tag ng NFC sa Wi-Fi"</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>
@@ -2112,43 +2132,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Tunog at Notification"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Volume ng media"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Volume ng alarm"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Volume ng pag-ring"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Volume ng notification"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Kapag dumating ang mga tawag at notification"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Kapag dumating notification"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Ipa-ring"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Mag-vibrate sa halip na mag-ring"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Huwag ipa-ring o mag-vibrate"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Default na ringtone sa notification"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"I-vibrate kapag nagri-ring"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Nagpapakita ng mga notification"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"Pulse na ilaw ng notification"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Kapag naka-lock ang device"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ganap na huwag magpakita ng mga notification"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kapag naka-on ang huwag abalahin"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Itago ang mga bagong notification mula sa listahan"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Ipakita ang lahat ng notification sa listahan"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Iba pang mga tunog"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Mga tono ng dial pad"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Tunog sa pag-lock ng screen"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Mga tunog sa pag-dock"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Mga tunog sa pagpindot"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Mag-vibrate sa pagpindot"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Magpe-play ang speaker mg dock"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Lahat ng audio"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Audio ng media lang"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Naka-silent"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Alerto"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Mag-vibrate"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Access sa notification"</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>
@@ -2168,18 +2200,24 @@
     <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="3025242591043646494">"Ipakita sa itaas ng listahan"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Itago ang sensitibong nilalaman kapag naka-lock ang device"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Naka-block"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Itaas ng listahan"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Sensitibo"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Naka-on"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Naka-off"</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/arrays.xml b/res/values-tr/arrays.xml
index 4a2a883..875506a 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Yok"</item>
     <item msgid="8673874894887358090">"El ile"</item>
-    <item msgid="168893341855953140">"Proxy Otomatik Yapılandırması"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Kapalı"</item>
+    <item msgid="3165868966179561687">"Uyarı"</item>
+    <item msgid="6038758039030476855">"Titret"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Yok"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Kapalı"</item>
     <item msgid="2751513398307949636">"Ekranda çubuk şeklinde"</item>
-    <item msgid="1851438178120770973">"adb shell dumpsys gfxinfo içinde"</item>
+    <item msgid="8272260411216018353">"Ekranda çizgi şeklinde"</item>
+    <item msgid="120512413928262547">"adb shell dumpsys gfxinfo içinde"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Kapalı"</item>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f4ea83d..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="7617195369015536614">"Kablosuz ve Ağlar"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Cihaz"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Kişisel"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Ekran AÇIK kalma süresi:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Bilinmiyor"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Şarj oluyor"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"AC ile şarj oluyor"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"USB ile şarj oluyor"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Kablosuz şarj oluyor"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(kablosuz)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Şarj olmuyor"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Şarj etmiyor"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Dolu"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Yazdığınız bağlantı noktası geçerli değil."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL\'si: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC URL\'si: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Hücre Bilgileri:"</string>
@@ -276,8 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Ayarlar"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ayarlar kısayolu"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Uçak modu"</string>
-    <!-- no translation found for radio_controls_title (5364843879587669966) -->
-    <skip />
+    <string name="radio_controls_title" msgid="6889937359495515769">"Diğer…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Kablosuz özelliği ve ağlar"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Kablosuz, Bluetooth, uçak modu, mobil ağlar ve VPN\'leri yönet"</string>
     <string name="roaming" msgid="3596055926335478572">"Veri dolaşımı"</string>
@@ -318,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Cihaz sahibinin bilgileri"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Widget\'ları etkinleştir"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Yönetici tarafından devre dışı bırakıldı"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC ile kilidi açma"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Kilit ekranında görüntülenecek metni yazın"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Kilit ekranında kullanıcı bilgilerini göster"</string>
@@ -333,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Şifreli"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ilişkin veriler, medya dosyaları ile diğer dosyaları şifreleyebilirsiniz. Tabletinizi şifreledikten sonra, bir kilit ekranı (yani bir desen veya sayısal PIN ya da şifre) oluşturduğunuz varsayılırsa, tabletinizi her açtığınızda şifresini çözmek için ekran kilidini açmanız gerekecektir. Şifreyi çözmenin tek diğer yolu fabrika verilerine sıfırlama işlemi yapmaktır (tüm verileriniz silinir).\n\nŞifreleme bir saat veya daha fazla sürebilir. Şifreleme işlemine şarj olmuş bir pille başlamalı ve tüm işlem boyunca tableti şarj cihazına takılı olarak tutmalısınız. İşlemi yarıda keserseniz verilerinizin bir bölümünü veya tamamını kaybedersiniz."</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"Hesaplarınızı, ayarlarınızı, indirilen uygulamalarınızı ve bunlara ilişkin veriler, medya dosyaları ile diğer dosyaları şifreleyebilirsiniz. Telefonunuzu şifreledikten sonra, bir kilit ekranı (yani bir desen veya sayısal PIN ya da şifre) oluşturduğunuz varsayılırsa, telefonunuzu her açtığınızda şifresini çözmek için ekran kilidini açmanız gerekecektir. Şifreyi çözmenin tek diğer yolu fabrika verilerine sıfırlama işlemi yapmaktır (tüm verileriniz silinir).\n\nŞifreleme bir saat veya daha fazla sürebilir. Şifreleme işlemine şarj olmuş bir pille başlamalı ve tüm işlem boyunca telefonu şarj cihazına takılı olarak tutmalısınız. İşlemi yarıda keserseniz verilerinizin bir bölümü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>
@@ -570,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"NFC etiketine yaz"</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>
@@ -619,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="2288214226916117159">"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>
@@ -736,10 +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="8480105032417444275">"Parlaklık düzeyi"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Ekranın parlaklığını ayarla"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Uyarlanan parlaklık"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Mevcut ışık koşullarında parlaklık düzeyini optimize et"</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>
@@ -991,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"SMS uygulaması değiştirilsin mi?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"<xliff:g id="NEW_APP">%1$s</xliff:g>, SMS uygulamanız olarak <xliff:g id="CURRENT_APP">%2$s</xliff:g> yerine kullanılsın mı?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"SMS uygulamanız olarak <xliff:g id="NEW_APP">%s</xliff:g> kullanılsın mı?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Bilinmeyen SIM operatörü"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Bilinmeyen SIM operatörü"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s için bilinen bir provizyon web sitesi yok"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Lütfen SIM kartı takın ve yeniden başlatın"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Lütfen İnternet\'e bağlanın"</string>
@@ -1323,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="7923901846375587241">"Hata raporu kısayolu"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Hata raporu almak için Hızlı Ayarlar\'da bir düğme göster"</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>
@@ -1333,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Çalışma zamanını seçin"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Çalışma zamanını <xliff:g id="OLD">%1$s</xliff:g> yerine <xliff:g id="NEW">%2$s</xliff:g> olarak değiştirmek için yeniden başlatılsın mı?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Kablosuz ekran sertifikası"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Kablosuz Ayrıntılı Günlük Kaydını Etkinleştir"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Kablosuz ekran sertifikası seçeneklerini göster"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Kablosuz günlük kaydı düzeyini artır, Kablosuz Seçici\'deki her bir SSID RSSI için göster"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"USB hata ayıklamasına izin verilsin mi?"</string>
@@ -1493,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Mobil ağ sinyali"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> ÖÖ"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> ÖS"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Cihazın açılma zamanı"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Zamanında Kablosuz"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Zamanında Kablosuz"</string>
@@ -1678,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Tüm sertifikaları kaldır"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Güvenilir kimlik bilgisi"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Güvenilir CA sertifikalarını görüntüle"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Gelişmiş"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Depolama türü"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Donanım destekli"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Yalnızca yazılım"</string>
@@ -1762,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun.\n\nFarklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Senkronizasyon etkinleştirildi"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Senkronizasyon devre dışı"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Şimdi senkronize ediliyor"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Senkronizasyon hatası"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Senkronizasyon başarısız oldu"</string>
     <string name="sync_active" msgid="8476943765960863040">"Senkronizasyon etkin"</string>
@@ -1809,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Depolamanın şifresini çözmek için PIN\'inizi girin"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Depolamanın şifresini çözmek için deseninizi çizin"</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>
@@ -2098,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Fotoğraf çek"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Galeri\'den fotoğraf seçin"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC ile Ekran Kilidi Ayarları"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Eşlenen Künyeler"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Etkin"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Bir etiketle eşle"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Şimdi eşle"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Künyeyi masaya düz olarak koyun ve telefonu künyenin üzerine yerleştirin"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Künye ve telefon başarıyla eşlendi. İşlemi tamamladınız!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Sağlanan künye, telefonunuzu açmak için kullanılamıyor"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Künyenizle eşleme başarısız oldu. Lütfen tekrar deneyin"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC etkin değil ve NFC ile Kilit Açma özelliği için gerekiyor. Lütfen NFC\'yi açın."</string>
+    <string name="ok" msgid="3651563352754792958">"NFC Ayarları"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Ayarlar"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Ayarlar"</string>
     <string name="search_menu" msgid="7053532283559077164">"Arama yapın"</string>
@@ -2105,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Kablosuz NFC Etiketini ayarla"</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>
@@ -2113,43 +2132,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Sesler ve Bildirimler"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Medya sesi düzeyi"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Alarm sesi düzeyi"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Zil sesi düzeyi"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Bildirim sesi düzeyi"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Çağrı ve bildirim geldiğinde"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Bildirim geldiğinde"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Zili çaldır"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Zili çaldırmak yerine cihazı titreştir"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Zili çaldırma veya cihazı titreştirme"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Varsayılan bildirim zil sesi"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Çalarken titret"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Bildirimleri gösterme"</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>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Cihaz kilitliyken"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Bildirimleri hiç gösterme"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Rahatsız etmeme ayarı açık olduğunda"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Yeni bildirimleri listede gizle"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Tüm bildirimleri listede göster"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Diğer sesler"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Tuş takımı sesleri"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Ekran kilitleme sesleri"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Yuvaya yerleştirme sesleri"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Dokunma sesleri"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Dokunulduğunda cihazı titreştir"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Yuva hoparlörü çalsın"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tüm ses"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Yalnızca medya sesi"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Sessiz"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Uyarı"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Titreşim"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Bildirim erişimi"</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>
@@ -2169,18 +2200,24 @@
     <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="3025242591043646494">"Listenin başında görüntüle"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Cihaz kilitlendiğinde hassas içeriği gizle"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Engellendi"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Listenin başı"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Hassas"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2199,6 +2236,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Açık"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Kapalı"</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/arrays.xml b/res/values-uk/arrays.xml
index 98feaf6..a7af301 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Немає"</item>
     <item msgid="8673874894887358090">"Вручну"</item>
-    <item msgid="168893341855953140">"Автоконфігурація проксі"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Вимк."</item>
+    <item msgid="3165868966179561687">"Сповіщ."</item>
+    <item msgid="6038758039030476855">"Вібрув."</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Немає"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Вимк."</item>
     <item msgid="2751513398307949636">"На екрані у вигляді смужок"</item>
-    <item msgid="1851438178120770973">"У adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"На екрані у вигляді ліній"</item>
+    <item msgid="120512413928262547">"In adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Вимк."</item>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index ab9c321..2d85c08 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Час АКТИВ. екрана:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Невідомо"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарядж-ся"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Заряджання з розетки"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Заряджання через USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Заряджання без дроту"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(бездротовий доступ)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряджається"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряджається"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Повна"</string>
@@ -203,7 +203,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_title" msgid="7185282894936042359">"URL-адреса PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL-адреса файлу PAC: "</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">"Інформація про телефон:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Налаштування"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Ярлик налаштувань"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Режим польоту"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC й інше"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Більше..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Бездротовий зв\'язок і мережі"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Керуйте Wi-Fi, Bluetooth, режимом польоту, мережами мобільного зв’язку та VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Роумінг даних"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Інфо про власника"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Увімкнути віджети"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Вимкнено адміністратором"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Розблокування в NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Введіть текст, що відображ. на екрані блокування"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Показувати дані користувача на екрані блокування"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Записати дані в NFC-тег"</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>
@@ -618,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="2288214226916117159">"Введіть пароль своєї мережі"</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>
@@ -735,10 +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="8480105032417444275">"Рівень яскравості"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Налаштуйте яскравість екрана"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Регульована яскравість"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Оптимізація рівня яскравості до наявного світла"</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>
@@ -990,7 +996,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Змінити програму для SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Використовувати для SMS програму <xliff:g id="NEW_APP">%1$s</xliff:g> замість <xliff:g id="CURRENT_APP">%2$s</xliff:g>?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Використовувати для SMS програму <xliff:g id="NEW_APP">%s</xliff:g>?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Невідомий оператор SIM-карти"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Невідомий оператор SIM-карти"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s не має веб-сайту для мобільних"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Вставте SIM-карту та перезапустіть"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Під’єднайтеся до Інтернету"</string>
@@ -1322,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="7923901846375587241">"Ярлик звіту про помилки"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Показувати у вікні швидкого налаштування кнопку створення звіту про помилки"</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>
@@ -1332,9 +1340,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Вибрати робочий цикл"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Перезавантажити, щоб змінити робочий цикл із <xliff:g id="OLD">%1$s</xliff:g> на <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Сертифікація бездротового екрана"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Увімкнути докладну реєстрацію Wi-Fi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показати параметри сертифікації бездротового екрана"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Збільшити рівень реєстрації Wi-Fi, показувати за RSSI SSID під час вибору Wi-Fi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Дозвол. налагодж. USB?"</string>
@@ -1492,11 +1498,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Сигнал мобільної мережі"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> дп"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> пп"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="DAY">%1$d</xliff:g>.<xliff:g id="MONTH">%2$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Час активн. пристрою"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Час роботи Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Час роботи Wi-Fi"</string>
@@ -1677,7 +1678,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Видалити всі сертифікати"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Надійні облікові дані"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Показати надійні сертифікати ЦС"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Додатково"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Тип сховища"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Апаратне забезпечення"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Лише програмне забезпечення"</string>
@@ -1761,7 +1761,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування.\n\nТоркніться опції "<b>"Назад"</b>", щоб під’єднатися до іншої мережі Wi‑Fi."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронізацію ввімкнено"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронізацію вимкнено"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Синхронізація"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Помилка синхронізації"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Помилка синхронізації"</string>
     <string name="sync_active" msgid="8476943765960863040">"Синхронізація активна"</string>
@@ -2097,6 +2096,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Зробити фото"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Вибрати фото з галереї"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Параметри блокування екрана через NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Спарені чипи"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Увімкнено"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Створити пару з тегом"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Створення пари в NFC"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Створити пару зараз"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Розмістіть чип рівно на столі й покладіть зверху телефон"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Пару між чипом і телефоном створено."</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Неможливо розблокувати телефон за допомогою цього чипа"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Не вдалося створити пару з чипом. Повторіть спробу"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"Зв’язок малого радіуса дії (NFC) не ввімкнено, але він потрібен для розблокування через NFC. Увімкніть NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Параметри NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Налаштування"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Налаштування"</string>
     <string name="search_menu" msgid="7053532283559077164">"Пошук"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Налаштувати 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>
@@ -2116,10 +2128,8 @@
     <string name="media_volume_option_title" msgid="2811531786073003825">"Гучність медіа"</string>
     <string name="alarm_volume_option_title" msgid="8219324421222242421">"Гучність сигналу"</string>
     <string name="ring_volume_option_title" msgid="6767101703671248309">"Гучність дзвінка"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Гучність сповіщень"</string>
     <string name="zen_mode_settings_title" msgid="2689740350895257590">"Не турбувати"</string>
     <string name="ringer_mode_title" msgid="7489457312298627735">"Коли надходять дзвінки та сповіщення"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Коли надходять сповіщення"</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>
@@ -2136,18 +2146,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Інші звуки"</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="1340569241625989837">"Звуки блокування екрана"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Звуки вставлення в док-станцію"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Звуки під час дотику"</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="dock_audio_media_title" msgid="1346838179626123900">"Звук через динамік док-станції"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Усе аудіо"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Лише аудіо з медіа-файлів"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Без звуку"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Сповіщення"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Вібросигнал"</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">
@@ -2198,6 +2201,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-vi/arrays.xml
index a123024..ba8a548 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Không chọn"</item>
     <item msgid="8673874894887358090">"Thủ công"</item>
-    <item msgid="168893341855953140">"Tự động định cấu hình proxy"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Tắt"</item>
+    <item msgid="3165868966179561687">"Thông báo"</item>
+    <item msgid="6038758039030476855">"Rung"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Không"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Tắt"</item>
     <item msgid="2751513398307949636">"Trên màn hình dưới dạng thanh"</item>
-    <item msgid="1851438178120770973">"Trong adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Trên màn hình dưới dạng đường"</item>
+    <item msgid="120512413928262547">"Trong adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Tắt"</item>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index e52c972..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="7617195369015536614">"Không dây và mạng"</string>
-    <string name="header_category_device" msgid="4544026001618307754">"Thiết bị"</string>
-    <string name="header_category_personal" msgid="3310195187905720823">"Cá nhân"</string>
-    <string name="header_category_system" msgid="2816866961183068977">"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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"Thời gian màn hình BẬT:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Không xác định"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Đang sạc"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Sạc trên AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Sạc qua USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Sạc không dây"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(không dây)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Hiện không sạc"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Hiện không sạc"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Đầy"</string>
@@ -203,7 +207,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Trường cổng phải trống nếu trường máy chủ lưu trữ trống."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Cổng bạn đã nhập không hợp lệ."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP được sử dụng bởi trình duyệt nhưng có thể không được sử dụng bởi các ứng dụng khác."</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Vị trí:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID lân cận:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Cài đặt"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Lối tắt cài đặt"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Chế độ trên máy bay"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC &amp; hơn thế nữa"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Thêm…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Không dây &amp; mạng"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Quản lý Wi-Fi, Bluetooth, chế độ trên máy bay, mạng di động và VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Chuyển vùng dữ liệu"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Thông tin chủ sở hữu"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Bật tiện ích con"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Bị tắt bởi quản trị viên"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Mở khóa NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Nhập văn bản để hiển thị trên màn hình khóa"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Hiển thị thông tin người dùng trên màn hình khóa"</string>
@@ -332,8 +337,10 @@
     <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_encrypted_summary" msgid="1868233637888132906">"Đã mã hóa"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"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 ứng dụng, phương tiện cũng như các tệp khác của mình. Sau khi mã hóa máy tính bảng, giả định rằng bạn đã thiết lập khóa màn hình (tức là một hình hay mã PIN hoặc mật khẩu dạng số), bạn cần phải mở khóa màn hình để giải mã máy tính bảng mỗi khi bật lên. Cách duy nhất khác là đặt lại về dữ liệu gốc, thao tác này sẽ 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 bằng việc sạc pin và cắm máy tính bảng cho đến 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 vài hoặc tất cả dữ liệu của mình"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"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 ứng dụng, phương tiện cũng như các tệp khác của mình. Sau khi mã hóa điện thoại, giả định rằng bạn đã thiết lập khóa màn hình (tức là một hình hay mã PIN hoặc mật khẩu dạng số), bạn cần phải mở khóa màn hình để giải mã điện thoại mỗi khi bật lên. Cách duy nhất khác là đặt lại về dữ liệu gốc, thao tác này sẽ 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 bằng việc sạc pin và cắm điện thoại cho đến 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 vài hoặc tất cả dữ liệu của mình."</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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Ghi vào thẻ NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Độ 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>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Độ sáng thích nghi"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Tối ưu hóa độ sáng cho ánh sáng có sẵn"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Thay đổi ứng dụng SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Sử dụng <xliff:g id="NEW_APP">%1$s</xliff:g> thay vì <xliff:g id="CURRENT_APP">%2$s</xliff:g> làm ứng dụng SMS của bạn?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Sử dụng <xliff:g id="NEW_APP">%s</xliff:g> làm ứng dụng SMS của bạn?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"Nhà cung cấp dịch vụ SIM không xác định"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"Nhà cung cấp SIM không xác định"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s không có trang web cấp phép xác định"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Vui lòng lắp thẻ SIM và khởi động lại"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Vui lòng kết nối internet"</string>
@@ -1322,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="7923901846375587241">"Phím tắt báo cáo lỗi"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Hiển thị một nút trong Cài đặt nhanh để tạo 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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Chọn thời gian chạy"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Khởi động lại để thay đổi thời gian chạy từ <xliff:g id="OLD">%1$s</xliff:g> sang <xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Chứng nhận hiển thị không dây"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Bật ghi nhật ký chi tiết WiFi"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Hiển thị tùy chọn chứng nhận hiển thị không dây"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Tăng mức ghi nhật ký Wifi, hiển thị mỗi SSID RSSI trong bộ chọn WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Cho phép gỡ lỗi USB?"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Tín hiệu mạng di động"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> SA"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> CH"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Thời gian thức của thiết bị"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Thời gian bật Wi-Fi"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Thời gian bật Wi‑Fi"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Xóa tất cả chứng chỉ"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Thông tin đăng nhập tin cậy"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Hiển thị chứng chỉ CA tin cậy"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Nâng cao"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Loại lưu trữ"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Dựa trên phần cứng"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Chỉ phần mềm"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Chạm "<b>"Tiếp theo"</b>" để tiếp tục thiết lập.\n\nChạm "<b>"Quay lại"</b>" để kết nối với mạng Wi‑Fi khác."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Đồng bộ hóa đã được bật"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Đồng bộ hóa đã bị tắt"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Đang đồng bộ hóa"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Lỗi đồng bộ hóa"</string>
     <string name="sync_failed" msgid="1696499856374109647">"Đồng bộ hóa không thành công"</string>
     <string name="sync_active" msgid="8476943765960863040">"Đồng bộ hóa hoạt động"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"Nhập mã PIN để giải mã bộ nhớ"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"Vẽ hình để 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>
@@ -2097,6 +2104,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Chụp ảnh"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Chọn ảnh từ Thư viện"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Cài đặt khóa màn hình NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Thẻ được ghép nối"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Đã bật"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Ghép nối với thẻ"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Ghép nối bây giờ"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Đặt thẻ bằng phẳng lên bàn và đặt điện thoại lên trên"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Đã ghép nối thẻ và điện thoại thành công, bạn đã hoàn tất!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Không thể sử dụng thẻ đã cung cấp để mở khóa điện thoại của bạn"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Không ghép nối với thẻ của bạn được, hãy thử lại"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC chưa được bật và cần có để Mở khóa NFC. Hãy bật NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Cài đặt NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Cài đặt"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Cài đặt"</string>
     <string name="search_menu" msgid="7053532283559077164">"Tìm kiếm"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Thiết lập thẻ NFC Wi-Fi"</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>
@@ -2112,43 +2132,55 @@
     <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="notification_settings" msgid="7558043253996992936">"Âm thanh và thông báo"</string>
-    <string name="media_volume_option_title" msgid="2811531786073003825">"Âm lượng phương tiện"</string>
-    <string name="alarm_volume_option_title" msgid="8219324421222242421">"Âm lượng báo thức"</string>
-    <string name="ring_volume_option_title" msgid="6767101703671248309">"Âm lượng chuông"</string>
-    <string name="notification_volume_option_title" msgid="6064656124416882130">"Âm lượng thông báo"</string>
+    <!-- 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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"Khi cuộc gọi và thông báo đến"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"Khi thông báo đến"</string>
-    <string name="ringer_mode_audible" msgid="4196661772746371017">"Đổ chuông"</string>
-    <string name="ringer_mode_vibrate" msgid="3381276665087695839">"Rung thay vì đổ chuông"</string>
-    <string name="ringer_mode_silent" msgid="4812605852723880795">"Không đổ chuông hoặc rung"</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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"Nhạc chuông thông báo mặc định"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"Rung khi đổ chuông"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"Hiển thị thông báo"</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>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"Khi khóa thiết bị"</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>
-    <string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Không hiển thị thông báo nào"</string>
-    <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Khi đang bật chế độ không làm phiền"</string>
-    <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ẩn thông báo mới khỏi danh sách"</string>
-    <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Hiển thị tất cả thông báo trong danh sách"</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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"Âm thanh khác"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"Âm bàn phím số"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"Âm thanh khóa màn hình"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Âm đế kết nối"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Âm chạm"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"Rung khi chạm"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"Phát âm đế kết nối"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Tất cả âm thanh"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Chỉ âm thanh phương tiện"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Im lặng"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Thông báo"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Rung"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"Quyền quy cập thông báo"</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>
@@ -2168,18 +2200,24 @@
     <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="3025242591043646494">"Hiển thị ở đầu danh sách"</string>
-    <string name="app_notifications_dialog_visibility" msgid="2983683711202708107">"Ẩn nội dung nhạy cảm khi khóa thiết bị"</string>
-    <string name="app_notification_row_banned" msgid="5983655258784814773">"Bị chặn"</string>
-    <string name="app_notification_row_priority" msgid="7597101427045166499">"Đầu danh sách"</string>
-    <string name="app_notification_row_sensitive" msgid="1809610030432329940">"Nhạy cảm"</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_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="summary_divider_text" msgid="3087735442599707533">","</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>
@@ -2198,6 +2236,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Bật"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Tắt"</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/arrays.xml b/res/values-zh-rCN/arrays.xml
index 6930d65..9810c40 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"无"</item>
     <item msgid="8673874894887358090">"手动"</item>
-    <item msgid="168893341855953140">"代理自动配置"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"关闭"</item>
+    <item msgid="3165868966179561687">"警报"</item>
+    <item msgid="6038758039030476855">"振动"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"无"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"关闭"</item>
     <item msgid="2751513398307949636">"在屏幕上显示为条形图"</item>
-    <item msgid="1851438178120770973">"在 adb shell dumpsys gfxinfo 中"</item>
+    <item msgid="8272260411216018353">"在屏幕上显示为线型图"</item>
+    <item msgid="120512413928262547">"在 adb shell dumpsys gfxinfo 中"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"关闭"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index b2cbee5..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"屏幕开启时间："</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"未知"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"正在充电"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"正在通过交流电源充电"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"正在通过USB充电"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"正在进行无线充电"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"（交流电）"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"（无线）"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"未在充电"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"未在充电"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"电量充足"</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_title" msgid="7185282894936042359">"PAC网址： "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC 网址： "</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">"小区信息："</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"设置"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"设置快捷方式"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飞行模式"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC及其他设置"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"更多..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"无线和网络"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"管理 WLAN、蓝牙、飞行模式、移动网络和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"移动数据网络漫游"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"机主信息"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"启用小部件"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"已被管理员停用"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 解锁"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"输入要在锁定屏幕上显示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在锁定屏幕上显示用户信息"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密平板电脑"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"加密手机"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"您可以对自己的帐户、设置、下载的应用及其数据、媒体和其他文件进行加密。加密平板电脑后，如果您设置了屏幕锁定（即图案、数字PIN码或密码），那么您必须在每次开机时解锁屏幕，才能将平板电脑解密。除此之外，唯一的解密方法就是恢复出厂设置，但这会清除您所有的数据。\n\n加密过程至少需要1个小时的时间。在开始加密之前，您必须先将电池充满电，并让平板电脑在整个加密过程中保持电源接通状态。如果加密过程出现中断，您将丢失部分或所有数据。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"您可以对自己的帐户、设置、下载的应用及其数据、媒体和其他文件进行加密。加密手机后，如果您设置了屏幕锁定（即图案、数字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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"写入NFC标签"</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>
@@ -618,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="2288214226916117159">"请输入您的网络密码"</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>
@@ -735,10 +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="8480105032417444275">"亮度"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"调整屏幕亮度"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"自动调节亮度"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"根据环境光线情况优化亮度"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"要更改短信应用吗？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"要使用“<xliff:g id="NEW_APP">%1$s</xliff:g>”（取代“<xliff:g id="CURRENT_APP">%2$s</xliff:g>”）作为您的短信应用吗？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"要使用“<xliff:g id="NEW_APP">%s</xliff:g>”作为您的短信应用吗？"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"未知的SIM卡运营商"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 运营商"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s没有已知的配置网站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"请插入 SIM 卡，然后重新启动"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"请连接到互联网"</string>
@@ -1322,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="7923901846375587241">"错误报告快捷方式"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"在快捷设置中显示用于提交错误报告的按钮"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"选择运行环境"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新启动以将运行环境从“<xliff:g id="OLD">%1$s</xliff:g>”改为“<xliff:g id="NEW">%2$s</xliff:g>”吗？"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"无线显示认证"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"启用WLAN详细日志记录功能"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"显示无线显示认证选项"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"提升WLAN日志记录级别（在WLAN选择器中显示每个SSID的RSSI）"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"是否允许 USB 调试？"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"移动网络信号"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"上午<xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"下午<xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"设备唤醒时间"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"WLAN 开启时间"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"WLAN 开启时间"</string>
@@ -1677,7 +1684,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"删除所有证书"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"受信任的凭据"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"显示受信任的 CA 证书"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"高级"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"存储类型"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬件支持"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"仅限软件"</string>
@@ -1761,7 +1767,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"触摸"<b>"下一步"</b>"可继续进行设置。\n\n触摸"<b>"返回"</b>"可连接到其他 WLAN 网络。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步功能已启用"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"未启用同步功能"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"正在同步"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同步错误。"</string>
     <string name="sync_failed" msgid="1696499856374109647">"同步失败"</string>
     <string name="sync_active" msgid="8476943765960863040">"正在同步"</string>
@@ -1808,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"输入您的PIN码即可解密存储设备"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"绘制您的解锁图案即可解密存储设备"</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>
@@ -2062,7 +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>
-    <string name="nfc_payment_favor_foreground" msgid="8881893980929835838">"前台应用优先"</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>
@@ -2097,6 +2105,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"拍照"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"从图库中选择照片"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC屏幕锁定设置"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"配对的标签"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"已启用"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"与标签配对"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"立即配对"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"请将标签平放在桌子上，然后将手机放在标签上"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"标签和手机已成功配对，大功告成了！"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"无法使用相应标签为您的手机解锁"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"与您的标签配对失败，请重试"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC解锁功能需要使用NFC，但NFC尚未启用。请启用NFC。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC设置"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"设置"</string>
     <string name="search_results_title" msgid="1796252422574886932">"设置"</string>
     <string name="search_menu" msgid="7053532283559077164">"搜索"</string>
@@ -2104,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置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>
@@ -2112,43 +2133,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"收到来电和通知时"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"收到通知时"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"默认通知铃声"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"响铃时振动"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"显示通知"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"收到通知时指示灯闪烁"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"设备锁定时"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"其他提示音"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"拨号键盘音效"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"屏幕锁定提示音"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"基座提示音"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"触摸提示音"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"触摸时振动"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"基座扬声器播放的音频"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"所有音频"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"仅限媒体音频"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"静音"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"警示音"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"振动"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"通知使用权"</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>
@@ -2168,18 +2201,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">"、"</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>
@@ -2198,6 +2237,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-zh-rHK/arrays.xml
index 7ff30fd..3bcce5f 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"無"</item>
     <item msgid="8673874894887358090">"手動"</item>
-    <item msgid="168893341855953140">"Proxy 自動設定"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"關閉"</item>
+    <item msgid="3165868966179561687">"警示"</item>
+    <item msgid="6038758039030476855">"震動"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"沒有"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"關閉"</item>
     <item msgid="2751513398307949636">"在屏幕上以列顯示"</item>
-    <item msgid="1851438178120770973">"在「adb shell dumpsys gfxinfo」指令中"</item>
+    <item msgid="8272260411216018353">"在屏幕上以行顯示"</item>
+    <item msgid="120512413928262547">"在「adb shell dumpsys gfxinfo」指令中"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"關閉"</item>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index ecc98e7..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"屏幕開啟時間："</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"未知"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"正在透過 AC 充電"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"正在透過 USB 充電"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"正在透過無線方式充電"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(無線)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"非充電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"未開始充電"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"電量已滿"</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 Proxy，但其他應用程式不一定會採用這項設定"</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC 網址： "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC 網址： "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號："</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"手機資訊："</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飛行模式"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC 及其他設定"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"更多..."</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網絡"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"管理 Wi-Fi、藍牙、飛行模式、流動網絡和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"數據漫遊"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"擁有者資訊"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"已由管理員停用"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 解鎖"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"輸入要在鎖定畫面上顯示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在上鎖的畫面上顯示用戶資訊"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"對平板電腦進行加密"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"您可以為帳戶、設定、已下載的應用程式和其資料、媒體和其他檔案加密。當您將平板電腦加密後，系統會套用螢幕鎖定 (即設定解鎖圖案、數字 PIN 或密碼)，而您每次開機時均需解除螢幕鎖定，才能將平板電腦解密。除此之外，唯一的解密方法是將平板電腦回復原廠設定，並清除所有資料。\n\n加密程序可能需時個多小時才能完成。加密程序開始前，您必須將電池充滿，而平板電腦必須全程連接電源。如果您中斷程序，您將遺失部分或全部資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"您可以為帳戶、設定、已下載的應用程式和其資料、媒體和其他檔案加密。當您將手機加密後，系統會套用螢幕鎖定 (即設定解鎖圖案、數字 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"寫入 NFC 標籤"</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>
@@ -618,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="2288214226916117159">"輸入您的網絡密碼"</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>
@@ -735,10 +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="8480105032417444275">"亮度"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"調校屏幕亮度"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"自動調整亮度"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"根據環境光源優化亮度"</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>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更短訊應用程式？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"改用「<xliff:g id="NEW_APP">%1$s</xliff:g>」為您的短訊應用程式，以取代「<xliff:g id="CURRENT_APP">%2$s</xliff:g>」？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"使用「<xliff:g id="NEW_APP">%s</xliff:g>」為您的短訊應用程式？"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"未知的 SIM 流動網絡供應商"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 流動網絡供應商"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s 沒有提供任何已知的網站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連接互聯網"</string>
@@ -1322,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="7923901846375587241">"錯誤舉報捷徑"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"在「快速設定」中顯示按鈕以提交錯誤舉報"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"選取執行階段"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新啟動裝置，將執行階段從 <xliff:g id="OLD">%1$s</xliff:g> 變更為 <xliff:g id="NEW">%2$s</xliff:g> 嗎？"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"啟用 Wi-Fi 詳細記錄功能"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"提升 Wi-Fi 記錄功能等級 (在「Wi-Fi 挑選器」中根據 SSID RSSI 顯示)"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"流動網絡訊號"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"上午 <xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"下午 <xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"裝置啟用時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"Wi-Fi 開啟時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"Wi-Fi 開啟時間"</string>
@@ -1681,7 +1688,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"移除所有憑證"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"可信的憑證"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示可信的 CA 憑證"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"進階"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"儲存空間類型"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬件支援"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"只限軟件"</string>
@@ -1765,7 +1771,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"輕觸 [下一步]"<b></b>" 即可繼續安裝；\n\n輕觸 [返回]"<b></b>" 則可連接其他 Wi-Fi 網絡。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步已啟用"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步已停用"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"目前正在同步處理"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同步處理錯誤"</string>
     <string name="sync_failed" msgid="1696499856374109647">"同步失敗"</string>
     <string name="sync_active" msgid="8476943765960863040">"同步啟用中"</string>
@@ -1812,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"輸入 PIN 即可解密儲存裝置"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"畫出圖案即可解密儲存裝置"</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>
@@ -2101,6 +2108,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"拍照"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"從圖片庫選擇相片"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC 螢幕鎖定設定"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"配對標籤"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"已啟用"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"與標籤配對"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NFC 配對活動"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"立即配對"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"請將標籤平放在桌上，然後將手機放在標籤上"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"標籤和手機已成功配對，操作完成！"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"無法使用所提供的標籤為您的手機解鎖"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"無法與您的標籤配對，請再試一次"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"「NFC 解鎖」功能需要使用 NFC 功能，但 NFC 尚未啟用。請啟用 NFC。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC 設定"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="7053532283559077164">"搜尋"</string>
@@ -2108,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 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>
@@ -2116,43 +2136,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"當收到來電和通知時"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"當收到通知時"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"鈴響時震動"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"顯示通知"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"當裝置上鎖時"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號盤音效"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"螢幕鎖定音效"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"插座音效"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"輕觸音效"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"輕觸時震動"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"插座喇叭播放音效"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"所有音效"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"只限媒體音效"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"靜音"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"警示"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</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>
@@ -2172,18 +2204,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">"、"</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>
@@ -2202,6 +2240,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-zh-rTW/arrays.xml
index f464b95..2839ec9 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"無"</item>
     <item msgid="8673874894887358090">"手動"</item>
-    <item msgid="168893341855953140">"Proxy 自動設定"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"關閉"</item>
+    <item msgid="3165868966179561687">"警示"</item>
+    <item msgid="6038758039030476855">"震動"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"無"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"關閉"</item>
     <item msgid="2751513398307949636">"在螢幕上以列顯示"</item>
-    <item msgid="1851438178120770973">"在「adb shell dumpsys gfxinfo」指令中"</item>
+    <item msgid="8272260411216018353">"在螢幕上以行顯示"</item>
+    <item msgid="120512413928262547">"在「In adb shell dumpsys gfxinfo」指令中"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"關閉"</item>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 4757ce1..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="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>
+    <!-- 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>
@@ -90,9 +94,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"螢幕顯示時間："</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"不明"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"正在透過 AC 變壓器充電"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"正在透過 USB 充電"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"正在透過無線方式充電"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(無線)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"非充電中"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"非充電中"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"電力充足"</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 Proxy，但其他應用程式不一定會採用這項設定。"</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"PAC 網址： "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"PAC 網址： "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"位置："</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號："</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"儲存格資訊："</string>
@@ -276,7 +280,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"設定"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"設定捷徑"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"飛航模式"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"NFC 和其他設定"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"更多內容…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"無線與網路"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"管理 Wi-Fi、藍牙、飛航模式、行動網路和 VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"漫遊服務"</string>
@@ -317,6 +321,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"擁有者資訊"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"啟用小工具"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"已由管理員停用"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"NFC 解鎖"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"輸入要在鎖定畫面上顯示的文字"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"在鎖定畫面上顯示使用者資訊"</string>
@@ -332,8 +337,10 @@
     <string name="crypt_keeper_encrypt_title" product="tablet" msgid="1060273569887301457">"加密保護平板電腦"</string>
     <string name="crypt_keeper_encrypt_title" product="default" msgid="1878996487755806122">"對手機進行加密"</string>
     <string name="crypt_keeper_encrypted_summary" msgid="1868233637888132906">"已加密"</string>
-    <string name="crypt_keeper_desc" product="tablet" msgid="7966195172468864148">"帳戶、設定、下載的應用程式及其資料、媒體和其他檔案皆可加密。將平板電腦加密後，系統會套用螢幕鎖定 (也就是設定解鎖圖形、數字 PIN 或密碼)，您必須在每次開機時解除螢幕鎖定，才能將平板電腦解密。除此之外，唯一的解密方法是將平板電腦恢復原廠設定，同時清除所有資料。\n\n加密程序可能需要一個多小時才能完成。開始執行加密程序前，電池必須充飽，而平板電腦在加密過程中必須全程連接電源。如果中斷程序，您將遺失部分或所有資料。"</string>
-    <string name="crypt_keeper_desc" product="default" msgid="9182896617884899822">"帳戶、設定、下載的應用程式及其資料、媒體和其他檔案皆可加密。將手機加密後，系統會套用螢幕鎖定 (也就是設定解鎖圖形、數字 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>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"寫入 NFC 標記"</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>
@@ -618,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="2288214226916117159">"輸入您的網路密碼"</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>
@@ -735,10 +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="8480105032417444275">"亮度"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"調整螢幕亮度"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"自動調整亮度"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"根據環境光源調整最佳亮度"</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>
@@ -958,7 +970,7 @@
     <string name="media_format_gesture_explanation" product="nosdcard" msgid="2192044794228379224">"您必須畫出解鎖圖形以確認要清除 USB 儲存裝置的資料。"</string>
     <string name="media_format_gesture_explanation" product="default" msgid="6288926293245938415">"請畫出解鎖圖形，確認您要清除 SD 卡中的資料。"</string>
     <string name="call_settings_title" msgid="5188713413939232801">"通話設定"</string>
-    <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及來電顯示"</string>
+    <string name="call_settings_summary" msgid="7291195704801002886">"設定語音信箱、來電轉接、來電待接及本機號碼顯示"</string>
     <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB 網路共用"</string>
     <string name="tether_settings_title_wifi" msgid="3277144155960302049">"可攜式無線基地台"</string>
     <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"藍牙網路共用"</string>
@@ -990,7 +1002,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"變更簡訊應用程式？"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"您要改用 <xliff:g id="NEW_APP">%1$s</xliff:g> 而不再使用 <xliff:g id="CURRENT_APP">%2$s</xliff:g> 做為簡訊應用程式嗎？"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"使用 <xliff:g id="NEW_APP">%s</xliff:g> 做為簡訊應用程式嗎？"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"未知的 SIM 卡行動通訊業者"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"未知的 SIM 行動通訊業者"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s 沒有任何已知的佈建網站"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"請插入 SIM 卡，並重新啟動裝置"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"請連線至網際網路"</string>
@@ -1322,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="7923901846375587241">"錯誤回報捷徑"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"在快速設定中顯示回報錯誤按鈕"</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>
@@ -1332,9 +1346,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"選取執行階段"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新啟動裝置，將執行階段從 <xliff:g id="OLD">%1$s</xliff:g> 變更為 <xliff:g id="NEW">%2$s</xliff:g> 嗎？"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"啟用 Wi-Fi 詳細資訊記錄功能"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"提升 Wi-Fi 記錄功能等級 (在 Wi-Fi 選擇工具中依 SSID RSSI 顯示)"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
@@ -1492,11 +1504,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"行動網路訊號"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"上午 <xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"下午 <xliff:g id="TIME">%1$d</xliff:g>"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"裝置清醒時間"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"開啟 Wi-Fi 的時間"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"開啟 Wi-Fi 的時間"</string>
@@ -1681,7 +1688,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"移除所有憑證"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"信任的憑證"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示信任的 CA 憑證"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"進階"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"儲存空間類型"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬體備份"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"僅限軟體"</string>
@@ -1765,7 +1771,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"輕觸 [下一步]"<b></b>" 即可繼續設定程序；\n\n輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"同步處理已啟用"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步處理已停用"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"目前正在同步處理"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"同步處理錯誤。"</string>
     <string name="sync_failed" msgid="1696499856374109647">"同步處理失敗"</string>
     <string name="sync_active" msgid="8476943765960863040">"同步處理已啟用"</string>
@@ -1812,8 +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>
-    <string name="enter_pin" msgid="286221169871526876">"輸入您的 PIN 即可解密儲存裝置"</string>
-    <string name="enter_pattern" msgid="5707838886272453608">"畫出您的圖形即可解密儲存裝置"</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>
@@ -2101,6 +2108,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"拍攝相片"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"從圖片庫選擇相片"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"NFC 螢幕鎖定設定"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"配對的標記"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"已啟用"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"與標記配對"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"NfcPairingActivity"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"立即配對"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"請將標記平放在桌上，然後將手機放在標記上"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"標記和手機已成功配對，大功告成！"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"無法使用您提供的標記為您的手機解鎖"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"與您的標記配對失敗，請再試一次"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"NFC 解鎖功能需要使用 NFC，但 NFC 尚未啟用。請開啟 NFC。"</string>
+    <string name="ok" msgid="3651563352754792958">"NFC 設定"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>
     <string name="search_results_title" msgid="1796252422574886932">"設定"</string>
     <string name="search_menu" msgid="7053532283559077164">"搜尋"</string>
@@ -2108,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"設定 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>
@@ -2116,43 +2136,55 @@
     <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="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="notification_volume_option_title" msgid="6064656124416882130">"通知音量"</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>
-    <string name="ringer_mode_title" msgid="7489457312298627735">"來電和收到通知時"</string>
-    <string name="ringer_mode_title_novoice" msgid="4628028304587795604">"收到通知時"</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>
+    <!-- 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>
-    <string name="notification_ringtone_title" msgid="3361201340352664272">"預設通知鈴聲"</string>
+    <!-- no translation found for notification_ringtone_title (3361201340352664272) -->
+    <skip />
     <string name="vibrate_when_ringing_title" msgid="3885857358303178029">"鈴響時震動"</string>
-    <string name="notification_display_settings" msgid="2274556854544572598">"顯示通知"</string>
+    <!-- no translation found for notification_display_settings (2274556854544572598) -->
+    <skip />
     <string name="notification_pulse_title" msgid="1247988024534030629">"閃爍燈光通知"</string>
-    <string name="lock_screen_notifications_title" msgid="9118805570775519455">"裝置鎖定時"</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>
-    <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>
+    <!-- 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>
-    <string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
-    <string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號鍵盤音效"</string>
-    <string name="screen_locking_sounds_title" msgid="1340569241625989837">"螢幕鎖定音效"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"固定音效"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"觸控音效"</string>
-    <string name="vibrate_on_touch_title" msgid="674710566941697253">"觸控時震動"</string>
-    <string name="dock_audio_media_title" msgid="1346838179626123900">"固定喇叭播放音效"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"所有音訊"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"僅限媒體音訊"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"靜音"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"警示"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"震動"</string>
-    <string name="manage_notification_access_title" msgid="7510080164564944891">"通知存取權"</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>
@@ -2172,18 +2204,24 @@
     <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="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>
+    <!-- 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_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="summary_divider_text" msgid="3087735442599707533">"、"</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>
@@ -2202,6 +2240,8 @@
     <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>
+    <!-- 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/arrays.xml b/res/values-zu/arrays.xml
index 103a973..8512d5d 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -196,7 +196,11 @@
   <string-array name="wifi_proxy_settings">
     <item msgid="4473276491748503377">"Lutho"</item>
     <item msgid="8673874894887358090">"Ngokulawulwa"</item>
-    <item msgid="168893341855953140">"Ukulungiselela ngokuzenzakalela kwephroksi"</item>
+  </string-array>
+  <string-array name="emergency_tone_entries">
+    <item msgid="5165439859689033665">"Valiwe"</item>
+    <item msgid="3165868966179561687">"Isaziso"</item>
+    <item msgid="6038758039030476855">"Dlidliza"</item>
   </string-array>
   <string-array name="apn_auth_entries">
     <item msgid="3856896061242872146">"Lutho"</item>
@@ -435,7 +439,8 @@
   <string-array name="track_frame_time_entries">
     <item msgid="2193584639058893150">"Valiwe"</item>
     <item msgid="2751513398307949636">"Kusikrini njengamabha"</item>
-    <item msgid="1851438178120770973">"Ku-adb shell dumpsys gfxinfo"</item>
+    <item msgid="8272260411216018353">"Kusikrini njengemigqa"</item>
+    <item msgid="120512413928262547">"Ku-adb shell dumpsys gfxinfo"</item>
   </string-array>
   <string-array name="debug_hw_overdraw_entries">
     <item msgid="8190572633763871652">"Valiwe"</item>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 4183442..8dedc0e 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -90,9 +90,9 @@
     <string name="battery_info_screen_on" msgid="376277447175613889">"VULA isikhathi kwisikrini:"</string>
     <string name="battery_info_status_unknown" msgid="196130600938058547">"Akwaziwa"</string>
     <string name="battery_info_status_charging" msgid="1705179948350365604">"Iyashaja"</string>
-    <string name="battery_info_status_charging_ac" msgid="2909861890674399949">"Iyashaja ku-AC"</string>
-    <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Iyashaja ngaphezulu kwe-USB"</string>
-    <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Iyashaja ngaphandle kwentambo"</string>
+    <string name="battery_info_status_charging_ac" msgid="5874340256342956252">"(AC)"</string>
+    <string name="battery_info_status_charging_usb" msgid="4059070156126770959">"(USB)"</string>
+    <string name="battery_info_status_charging_wireless" msgid="1822125795446772771">"(okungenantambo)"</string>
     <string name="battery_info_status_discharging" msgid="310932812698268588">"Ayishaji"</string>
     <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Ayishaji"</string>
     <string name="battery_info_status_full" msgid="2824614753861462808">"Kugcwele"</string>
@@ -203,7 +203,7 @@
     <string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Inkundla yembobo kumelwe ingabi nalutho uma inkundla yesikhungo ingenalutho."</string>
     <string name="proxy_error_invalid_port" msgid="2671425042711054494">"Imbobo oyithayiphile ayilungile."</string>
     <string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</string>
-    <string name="proxy_url_title" msgid="7185282894936042359">"I-PAC URL: "</string>
+    <string name="proxy_url" msgid="2523518669129974654">"I-PAC URL: "</string>
     <string name="radio_info_signal_location_label" msgid="16475158265551708">"Indawo:"</string>
     <string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"I-CID Yokwakhelana:"</string>
     <string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Ulwazi leseli:"</string>
@@ -276,7 +276,7 @@
     <string name="settings_label_launcher" msgid="8344735489639482340">"Izilungiselelo"</string>
     <string name="settings_shortcut" msgid="3936651951364030415">"Isinqamuleli sezilungiselelo"</string>
     <string name="airplane_mode" msgid="8837269988154128601">"Imodi yendiza"</string>
-    <string name="radio_controls_title" msgid="5364843879587669966">"I-NFC nokuningi"</string>
+    <string name="radio_controls_title" msgid="6889937359495515769">"Okuningi…"</string>
     <string name="wireless_networks_settings_title" msgid="3643009077742794212">"Amanethiwekhi; nokungenantambo"</string>
     <string name="radio_controls_summary" msgid="1838624369870907268">"Phatha i-Wi-Fi, i-Bluetooth, imodi yendiza, amanethiwekhi eselula; nama-VPN"</string>
     <string name="roaming" msgid="3596055926335478572">"Ukuzulazula kwedatha"</string>
@@ -317,6 +317,7 @@
     <string name="owner_info_settings_title" msgid="2723190010708381889">"Imininingwane yomnikazi"</string>
     <string name="security_enable_widgets_title" msgid="2754833397070967846">"Nika amandla amawijethi"</string>
     <string name="security_enable_widgets_disabled_summary" msgid="1557090442377855233">"Ikhutshazwe ngumlawuli"</string>
+    <string name="nfc_unlock_title" msgid="8827035651970841825">"Ukuvula i-NFC"</string>
     <string name="owner_info_settings_summary" msgid="3800834657847339570"></string>
     <string name="owner_info_settings_edit_text_hint" msgid="4608681417960923911">"Faka umbhalo wokubonisa kwisikrini sokuvala"</string>
     <string name="show_user_info_on_lockscreen_label" msgid="8408914624925608365">"Bonisa ulwazi lomsebenzisi esikrinini sokukhiya"</string>
@@ -569,7 +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>
-    <string name="wifi_menu_write_to_nfc" msgid="7692881642188240324">"Bhalela kumaka we-NFC"</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>
@@ -618,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="2288214226916117159">"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>
@@ -735,10 +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="8480105032417444275">"Izinga lokukhanya"</string>
+    <!-- no translation found for brightness (8480105032417444275) -->
+    <skip />
     <string name="brightness_summary" msgid="838917350127550703">"Lungisa ukukhanya kwesikrini"</string>
-    <string name="auto_brightness_title" msgid="6341042882350279391">"Ukukhanya okuguqukayo"</string>
-    <string name="auto_brightness_summary" msgid="1799041158760605375">"Lungiselela izinga lokukhanya ekukhanyeni okutholakalayo"</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>
@@ -991,7 +997,7 @@
     <string name="sms_change_default_dialog_title" msgid="1958688831875804286">"Shintsha uhlelo lokusebenza le-SMS?"</string>
     <string name="sms_change_default_dialog_text" msgid="1522783933230274787">"Sebenzisa i-<xliff:g id="NEW_APP">%1$s</xliff:g> kunokusebenzisa i-<xliff:g id="CURRENT_APP">%2$s</xliff:g> njengohlelo lwakho lokusebenza le-SMS?"</string>
     <string name="sms_change_default_no_previous_dialog_text" msgid="602683880284921998">"Sebenzisa i-<xliff:g id="NEW_APP">%s</xliff:g> njengohlelo lwakho lokusebenza le-SMS?"</string>
-    <string name="mobile_unknown_sim_operator" msgid="2156912373230276157">"I-opharetha ye-SIM engaziwa"</string>
+    <string name="mobile_unknown_sim_operator" msgid="9101230468757324260">"I-Opharetha ye-SIM engaziwa"</string>
     <string name="mobile_no_provisioning_url" msgid="2399426808423775711">"%1$s ayinayo iwebhusayithi eyilungiselelo eyaziwayo"</string>
     <string name="mobile_insert_sim_card" msgid="9052590985784056395">"Sicela ufake ikhadi le-SIM bese uqala kabusha"</string>
     <string name="mobile_connect_to_internet" msgid="1733894125065249639">"Sicela uxhume ku-inthanethi"</string>
@@ -1329,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="7923901846375587241">"Isinqamuleli sombiko wesiphazamisi"</string>
-    <string name="bugreport_in_power_summary" msgid="3245617665067320992">"Bonisa inkinobho ku-Izilungiselelo Ezisheshayo zokuthatha umbiko wesiphazamisi"</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>
@@ -1339,9 +1347,7 @@
     <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Khetha isikhathi sokusebenza"</string>
     <string name="select_runtime_warning_message" msgid="1937574953265648165">"Qalisa kabusha ukuze ushintshe isikhathi sokusebenza kusukela ku-<xliff:g id="OLD">%1$s</xliff:g> ngu-<xliff:g id="NEW">%2$s</xliff:g>?"</string>
     <string name="wifi_display_certification" msgid="8611569543791307533">"Ukunikezwa isitifiketi sokubukeka okungenantambo"</string>
-    <string name="wifi_verbose_logging" msgid="4770164061102202747">"Nika amandla ukungena kwe-WiFi Verbose"</string>
     <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Bonisa izinketho zokunikeza isitifiketi ukubukeka okungenantambo"</string>
-    <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Khuphula izinga lokungena kwe-Wifi, bonisa nge-SSID RSSI ngayinye kusikhethi se-WiFi"</string>
     <string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
     <string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
     <string name="adb_warning_title" msgid="6234463310896563253">"Vumela ukulungisa iphutha le-USB?"</string>
@@ -1499,11 +1505,6 @@
     <string name="battery_stats_phone_signal_label" msgid="4137799310329041341">"Isiginali yenethiwekhi yefoni"</string>
     <!-- no translation found for battery_stats_last_duration (1535831453827905957) -->
     <skip />
-    <string name="battery_stats_hour_24_label" msgid="206767955462982310">"<xliff:g id="TIME">%1$d</xliff:g>:00"</string>
-    <string name="battery_stats_hour_am_label" msgid="8996438390134927921">"<xliff:g id="TIME">%1$d</xliff:g> AM"</string>
-    <string name="battery_stats_hour_pm_label" msgid="2092425426204059915">"<xliff:g id="TIME">%1$d</xliff:g> PM"</string>
-    <string name="battery_stats_date_day_first_label" msgid="2416879783432101481">"<xliff:g id="DAY">%1$d</xliff:g>/<xliff:g id="MONTH">%2$d</xliff:g>"</string>
-    <string name="battery_stats_date_month_first_label" msgid="669925700794858190">"<xliff:g id="MONTH">%2$d</xliff:g>/<xliff:g id="DAY">%1$d</xliff:g>"</string>
     <string name="awake" msgid="387122265874485088">"Isikhathi sokuvuka kwedivaysi"</string>
     <string name="wifi_on_time" msgid="3208518458663637035">"I-Wi-Fi isesikhathini"</string>
     <string name="bluetooth_on_time" msgid="3056108148042308690">"I-Wi-Fi isesikhathini"</string>
@@ -1684,7 +1685,6 @@
     <string name="credentials_reset_summary" msgid="3369361230171260282">"Susa zonke izitifiketi"</string>
     <string name="trusted_credentials" msgid="4266945289534242402">"Izifakazeli ezithenjwayo"</string>
     <string name="trusted_credentials_summary" msgid="6735221351155686632">"Bonisa izitifiketi ze-CA ezithenjwayo"</string>
-    <string name="advanced_security_title" msgid="2434776238010578865">"Ithuthukisiwe"</string>
     <string name="credential_storage_type" msgid="8629968543494001364">"Uhlobo lwesitoreji"</string>
     <string name="credential_storage_type_hardware" msgid="6077193544333904427">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
     <string name="credential_storage_type_software" msgid="4403117271207715378">"Isofthiwe kuphela"</string>
@@ -1768,7 +1768,6 @@
     <string name="wifi_setup_description_connected" msgid="736032046548460779">"Thinta"<b>"Okulandelayo"</b>" ukuqhubeka nokusetha.\n\nThinta"<b>"Emuva"</b>" ukuxhuma kuhleloxhumano olwehlukile."</string>
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Ukunika amandla kuvumelanisiwe"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Ukuvumelanisa kukhubaziwe"</string>
-    <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Iyavumelanisa manje"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Iphutha lokuvumelanisa."</string>
     <string name="sync_failed" msgid="1696499856374109647">"Ukuvumelanisa kwehlulekile"</string>
     <string name="sync_active" msgid="8476943765960863040">"Ukuvumelanisa kuyasebenza"</string>
@@ -2104,6 +2103,18 @@
     <string name="user_image_take_photo" msgid="1280274310152803669">"Thatha isithombe"</string>
     <string name="user_image_choose_photo" msgid="7940990613897477057">"Khetha isithombe kusuka kugalari"</string>
     <string name="regulatory_info_text" msgid="5623087902354026557"></string>
+    <string name="lock_settings_nfc_title" msgid="33998875572836425">"Izilungiselelo zokukhiya isikrini se-NFC"</string>
+    <string name="nfc_unlock_paired_tags_title" msgid="3837232675294949824">"Omaka ababhanqiwe"</string>
+    <string name="nfc_unlock_enabled" msgid="7306199149460932989">"Kunikwe amandla"</string>
+    <string name="start_nfc_pairing" msgid="5363319136364735698">"Bhangqa nomaka"</string>
+    <string name="title_activity_nfc_pairing" msgid="6821817665260628279">"Umsebenzi wokumatanisa we-Nfc"</string>
+    <string name="pairing_button_title" msgid="7411638037556429744">"Bhangqa manje"</string>
+    <string name="status_no_ring_detected" msgid="838954925249421062">"Lalisa umaka kuthebula bese ubeka ifoni ngaphezulu"</string>
+    <string name="status_device_paired" msgid="4916932520416516526">"Umaka nefoni kubhanqwe ngempumelelo, usuqedile!"</string>
+    <string name="status_error_invalid_device" msgid="5045003971535647259">"Umaka onikeziwe awukwazi ukusetshenziselwa ukuvula ifoni yakho"</string>
+    <string name="status_error_pairing_failed" msgid="8260473909085202868">"Ukubhanqwa nomaka wakho kuhlulekile, sicela uzame futhi"</string>
+    <string name="enable_nfc" msgid="5234514241098808766">"I-NFC ayinikwanga amandla futhi idingelwa ukuvulwa kwe-NFC. Sicela uvule i-NFC."</string>
+    <string name="ok" msgid="3651563352754792958">"Izilungiselelo ze-NFC"</string>
     <string name="dashboard_title" msgid="5453710313046681820">"Izilungiselelo"</string>
     <string name="search_results_title" msgid="1796252422574886932">"Izilungiselelo"</string>
     <string name="search_menu" msgid="7053532283559077164">"Sesha"</string>
@@ -2111,7 +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="setup_wifi_nfc_tag" msgid="9028353016222911016">"Setha umaka we-Wi-Fi 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>
@@ -2123,10 +2135,8 @@
     <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="notification_volume_option_title" msgid="6064656124416882130">"Ivolumu yesaziso"</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_title_novoice" msgid="4628028304587795604">"Uma izaziso 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>
@@ -2143,18 +2153,11 @@
     <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="other_sound_settings" msgid="3151004537006844718">"Eminye imisindo"</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="1340569241625989837">"Imisindo yokukhiya isikrini"</string>
-    <string name="docking_sounds_title" msgid="155236288949940607">"Imisindo yokudokha"</string>
-    <string name="touch_sounds_title" msgid="5326587106892390176">"Imisindo yokuthinta"</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="dock_audio_media_title" msgid="1346838179626123900">"Isipikha sedokhu sidlala"</string>
-    <string name="dock_audio_media_disabled" msgid="3430953622491538080">"Wonke umsindo"</string>
-    <string name="dock_audio_media_enabled" msgid="667849382924908673">"Umsindo wemidiya kuphela"</string>
-    <string name="emergency_tone_silent" msgid="1067515631635824291">"Thulile"</string>
-    <string name="emergency_tone_alert" msgid="8941852695428130667">"Isaziso"</string>
-    <string name="emergency_tone_vibrate" msgid="8281126443204950847">"Dlidliza"</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">
@@ -2205,6 +2208,8 @@
     <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>
-    <string name="switch_on_text" msgid="1124106706920572386">"Vuliwe"</string>
-    <string name="switch_off_text" msgid="1139356348100829659">"Valiwe"</string>
+    <!-- no translation found for switch_on_text (1124106706920572386) -->
+    <skip />
+    <!-- no translation found for switch_off_text (1139356348100829659) -->
+    <skip />
 </resources>
author	Baligh Uddin <baligh@google.com>	2014-06-04 05:28:30 +0000
committer	Baligh Uddin <baligh@google.com>	2014-06-04 05:28:30 +0000
commit	97473868432d6523c6b25ef0ec490589b739a455 (patch)
tree	ff80b2346a6673615f5d6d057801a12eb79565f4
parent	460d5b7400d91afb12f1f5cd25d65544c19cdd4a (diff)
download	packages_apps_Settings-97473868432d6523c6b25ef0ec490589b739a455.zip packages_apps_Settings-97473868432d6523c6b25ef0ec490589b739a455.tar.gz packages_apps_Settings-97473868432d6523c6b25ef0ec490589b739a455.tar.bz2