From bf0e6d138e0773d71846562fd20970a41ef59ff4 Mon Sep 17 00:00:00 2001
From: Eric Fischer <enf@google.com>
Date: Mon, 14 Nov 2011 13:33:52 -0800
Subject: [PATCH] Import revised translations. DO NOT MERGE

Change-Id: I3c719179477fda49580dbc58f79443a4e5c25cc9
---
 res/values-af/arrays.xml        |  4 +--
 res/values-af/strings.xml       | 54 ++++++++++++++++-----------------
 res/values-de/strings.xml       |  8 ++---
 res/values-es-rUS/strings.xml   |  2 +-
 res/values-fa/strings.xml       |  2 +-
 res/values-hi/strings.xml       |  2 +-
 res/values-hr/strings.xml       |  2 +-
 res/values-in/strings.xml       |  6 ++--
 res/values-iw/strings.xml       |  2 +-
 res/values-ko/strings.xml       |  6 ++--
 res/values-ms/strings.xml       |  6 ++--
 res/values-nl/strings.xml       |  6 ++--
 res/values-ro/strings.xml       |  2 +-
 res/values-ru/strings.xml       | 20 ++++++------
 res/values-sw/strings.xml       |  2 +-
 res/values-zh-rCN/strings.xml   |  6 ++--
 res/values-zh-rTW/strings.xml   |  4 +--
 res/values-zu/strings.xml       | 36 +++++++++++-----------
 tests/res/values-ko/strings.xml |  4 +--
 tests/res/values-zu/strings.xml |  4 +--
 20 files changed, 89 insertions(+), 89 deletions(-)

diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 00ff90d589e..12b13f7516a 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -131,11 +131,11 @@
     <item msgid="8151962652413645395">"2 minute"</item>
     <item msgid="8675215713017289017">"5 minute"</item>
     <item msgid="477015974247590543">"1 uur"</item>
-    <item msgid="5198271470953124739">"Nooit uittel nie"</item>
+    <item msgid="5198271470953124739">"Moenie uittel nie"</item>
   </string-array>
   <string-array name="wifi_signal">
     <item msgid="2245412278046491293">"Swak"</item>
-    <item msgid="5615082285463430971">"Billik"</item>
+    <item msgid="5615082285463430971">"Redelik"</item>
     <item msgid="3565079809875324621">"Goed"</item>
     <item msgid="5702329417707689835">"Uitstekend"</item>
   </string-array>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5524b9473af..6de7656fd97 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -105,7 +105,7 @@
     <string name="bluetooth_not_visible_to_other_devices" msgid="9120274591523391910">"Nie sigbaar vir ander Bluetooth-toestelle nie"</string>
     <string name="bluetooth_only_visible_to_paired_devices" msgid="2049983392373296028">"Net sigbaar vir saamgebinde toestelle"</string>
     <string name="bluetooth_not_discoverable" msgid="128269993123955177">"Maak toestel opspoorbaar"</string>
-    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Uittelling van sigbaarheid"</string>
+    <string name="bluetooth_visibility_timeout" msgid="8002247464357005429">"Sigbaarheid-tydperk"</string>
     <string name="bluetooth_visibility_timeout_summary" msgid="6483353842671501585">"Stel hoe lank die toestel opspoorbaar moet wees"</string>
     <string name="bluetooth_lock_voice_dialing" msgid="3139322992062086225">"Sluit stembellery"</string>
     <string name="bluetooth_lock_voice_dialing_summary" msgid="4741338867496787042">"Voorkom die gebruik van die Bluetooth-beller wanneer die skerm gesluit is"</string>
@@ -312,7 +312,7 @@
     <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laai jou battery en probeer weer."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Prop jou laaier in en probeer weer."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Geen skermslot-PIN of -wagwoord nie"</string>
-    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Jy moet \'n PIN of wagwoord vir die skermslot stel, voordat jy met enkripsie kan begin."</string>
+    <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Jy moet \'n PIN of wagwoord vir die sluitskerm stel voordat jy met enkripsie kan begin."</string>
     <string name="crypt_keeper_confirm_title" msgid="3637925350381905012">"Bevestig enkripsie"</string>
     <string name="crypt_keeper_final_desc" product="tablet" msgid="2496639211575162172">"Enkripteer tablet? Hierdie handeling kan nie ontdoen word nie, en as jy dit onderbreek, sal jy data verloor. Enkripsie duur \'n uur of meer, waartydens die tablet \'n paar keer sal herbegin."</string>
     <string name="crypt_keeper_final_desc" product="default" msgid="3248595818246515395">"Enkripteer foon? Hierdie handeling kan nie ontdoen word nie, en as jy dit onderbreek, sal jy data verloor. Enkripsie duur \'n uur of meer, waartydens die foon \'n paar keer sal herbegin."</string>
@@ -417,7 +417,7 @@
     <string name="bluetooth_confirm_passkey_msg" msgid="3708312912841950052">"Om saam te bind met:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;maak seker dit wys hierdie geheimsleutel:&lt;br&gt;&lt;b&gt;<xliff:g id="PASSKEY">%2$s</xliff:g>&lt;/b&gt;"</string>
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Van:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Bind met hierdie toestel saam?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Om saam te bind met:<xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g>Voer daarop in:<xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g>, druk dan Return of Enter."</string>
-    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Saambind"</string>
+    <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Bind saam"</string>
     <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Kanselleer"</string>
     <string name="bluetooth_error_title" msgid="6850384073923533096"></string>
     <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"Kon nie saambind met <xliff:g id="DEVICE_NAME">%1$s</xliff:g> nie."</string>
@@ -477,13 +477,13 @@
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Vir musiek en media"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Onthou instellings"</string>
     <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
-    <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Laat data-ruilprogram toe wanneer die foon aan \'n ander toestel raak"</string>
+    <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Laat dataruiling toe wanneer die foon aan \'n ander toestel raak"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Gereed om program-inhoud te stuur via NFC"</string>
     <string name="android_beam_off_summary" msgid="4663095428454779138">"Af"</string>
     <string name="android_beam_disabled_summary" msgid="1737782116894793393">"Onbeskikbaar omdat NFC afgeskakel is"</string>
     <string name="android_beam_label" msgid="6257036050366775040">"Android Beam"</string>
-    <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer hierdie funksie aangeskakel is, kan jy app-inhoud na \'n ander NFC-aanpasbare toestel oorsein deur die toestelle naby aan mekaar te hou. Jy kan byvoorbeeld Webblaaier-bladsye, You Tube-video\'s, People-kontakte en meer oorsein. "\n" "\n"Bring bloot die toestelle bymekaar (gewoonlik rug teen rug) en raak dan aan jou skerm. Die app bepaal wat oorgesein word."</string>
+    <string name="android_beam_explained" msgid="6981652347448777459">"Wanneer hierdie funksie aangeskakel is, kan jy programinhoud na \'n ander NFC-toestel oorsein deur die toestelle naby aan mekaar te hou. Jy kan byvoorbeeld blaaierbladsye, YouTube-video\'s, Mense-kontakte en meer oorsein. "\n" "\n"Bring bloot die toestelle bymekaar (gewoonlik rug teen rug) en raak dan aan jou skerm. Die program bepaal wat oorgesein word."</string>
     <string name="wifi_quick_toggle_title" msgid="8900579245913917111">"WiFi"</string>
     <string name="wifi_quick_toggle_summary" msgid="7071157039678370553">"Skakel WiFi aan"</string>
     <string name="wifi_settings" msgid="80140065298764210">"WiFi"</string>
@@ -584,7 +584,7 @@
     <string name="wifi_tether_configure_ap_text" msgid="7163376477399687419">"Stel WiFi-warmkol op"</string>
     <string name="wifi_tether_configure_subtext" msgid="1168351091215556844">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g><xliff:g id="NETWORK_SECURITY">%2$s</xliff:g> losstaande WiFi-warmkol"</string>
     <string name="wifi_tether_configure_ssid_default" msgid="8467525402622138547">"AndroidHotspot"</string>
-    <string name="display_settings_title" msgid="1708697328627382561">"Wys"</string>
+    <string name="display_settings_title" msgid="1708697328627382561">"Skerm"</string>
     <string name="sound_settings" msgid="5534671337768745343">"Klank"</string>
     <string name="silent_mode_title" msgid="3181479108593217704">"Stilmodus"</string>
     <string name="ringtone_title" msgid="5379026328015343686">"Foon-luitoon"</string>
@@ -632,7 +632,7 @@
     <string name="sync_settings" msgid="9186125469300013491">"Rekeninge en sinkronisasie"</string>
     <string name="search_settings" msgid="1910951467596035063">"Soek"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Bestuur soekinstellings en geskiedenis"</string>
-    <string name="display_settings" msgid="7965901687241669598">"Wys"</string>
+    <string name="display_settings" msgid="7965901687241669598">"Skerm"</string>
     <string name="accelerometer_title" msgid="7854608399547349157">"Outodraai skerm"</string>
     <string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</string>
     <string name="accelerometer_summary_on" product="default" msgid="1133737282813048021">"Verwissel outomaties van oriëntasie wanneer foon draai"</string>
@@ -763,18 +763,18 @@
     <string name="usb_label_installer_cd" msgid="4331173824920630215">"Installeer lêeroordrag-hulpmiddels"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batterystatus"</string>
     <string name="battery_level_title" msgid="2965679202786873272">"Batteryvlak"</string>
-    <string name="apn_settings" msgid="3743170484827528406">"APN\'s"</string>
+    <string name="apn_settings" msgid="3743170484827528406">"Toegangspuntname"</string>
     <string name="apn_edit" msgid="1354715499708424718">"Redigeer toegangspunt"</string>
     <string name="apn_not_set" msgid="4974192007399968164">"Nie gestel nie"</string>
     <string name="apn_name" msgid="4115580098369824123">"Naam"</string>
-    <string name="apn_apn" msgid="2479425126733513353">"APN"</string>
+    <string name="apn_apn" msgid="2479425126733513353">"Toegangspuntnaam"</string>
     <string name="apn_http_proxy" msgid="1826885957243696354">"Volmag"</string>
     <string name="apn_http_port" msgid="3763259523984976226">"Poort"</string>
     <string name="apn_user" msgid="455637547356117761">"Gebruikernaam"</string>
     <string name="apn_password" msgid="5412301994998250968">"Wagwoord"</string>
     <string name="apn_server" msgid="2436185314756372858">"Bediener"</string>
     <string name="apn_mmsc" msgid="3670124402105585737">"MMSC"</string>
-    <string name="apn_mms_proxy" msgid="5374082621073999275">"MMS volmag"</string>
+    <string name="apn_mms_proxy" msgid="5374082621073999275">"MMS-volmag"</string>
     <string name="apn_mms_port" msgid="4074188088199243040">"MMS-poort"</string>
     <string name="apn_mcc" msgid="4258628382260674636">"MCC"</string>
     <string name="apn_mnc" msgid="8629374076888809874">"MNC"</string>
@@ -783,15 +783,15 @@
     <string name="apn_auth_type_pap" msgid="1666934536996033383">"PAP"</string>
     <string name="apn_auth_type_chap" msgid="3369626283789068360">"CHAP"</string>
     <string name="apn_auth_type_pap_chap" msgid="9102343063036134541">"PAP of CHAP"</string>
-    <string name="apn_type" msgid="469613123902220544">"APN-tipe"</string>
-    <string name="apn_protocol" msgid="3272222921649348640">"APN-protokol"</string>
+    <string name="apn_type" msgid="469613123902220544">"Toegangspunt-tipe"</string>
+    <string name="apn_protocol" msgid="3272222921649348640">"Toegangspunt-protokol"</string>
     <string name="apn_roaming_protocol" msgid="3386954381510788422">"APN-swerwingsprotokol"</string>
-    <string name="carrier_enabled" msgid="407655861175280806">"APN aktiveer/deaktiveer"</string>
-    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"APN is geaktiveer"</string>
+    <string name="carrier_enabled" msgid="407655861175280806">"Aktiveer/deaktiveer toegangspunt"</string>
+    <string name="carrier_enabled_summaryOn" msgid="6338915271908057531">"Toegangspunt is geaktiveer"</string>
     <string name="carrier_enabled_summaryOff" msgid="4300790190221203756">"APN gedeaktiveer"</string>
     <string name="bearer" msgid="594270280031923558">"Draer"</string>
-    <string name="menu_delete" msgid="6981294422841124659">"Vee APN uit"</string>
-    <string name="menu_new" msgid="3014205883303921729">"Nuwe APN"</string>
+    <string name="menu_delete" msgid="6981294422841124659">"Vee toegangspunt uit"</string>
+    <string name="menu_new" msgid="3014205883303921729">"Nuwe toegangspunt"</string>
     <string name="menu_save" msgid="8109345640668285399">"Stoor"</string>
     <string name="menu_cancel" msgid="2194502410474697474">"Gooi weg"</string>
     <string name="error_title" msgid="7631322303341024692"></string>
@@ -848,7 +848,7 @@
     <string name="usb_tethering_button_text" msgid="585829947108007917">"USB-verbinding"</string>
     <string name="usb_tethering_available_subtext" msgid="156779271296152605">"USB gekoppel, merk om te verbind"</string>
     <string name="usb_tethering_active_subtext" msgid="8916210851136467042">"Verbind"</string>
-    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Kan nie verbind wanneer USB-geheue gebruik word nie"</string>
+    <string name="usb_tethering_storage_active_subtext" msgid="5210094834194907094">"Kan nie verbind wanneer USB-berging gebruik word nie"</string>
     <string name="usb_tethering_unavailable_subtext" msgid="1044622421184007254">"USB nie gekoppel nie"</string>
     <string name="usb_tethering_errored_subtext" msgid="1377574819427841992">"USB-verbindingsfout"</string>
     <string name="bluetooth_tether_checkbox_text" msgid="2379175828878753652">"Bluetooth-verbinding"</string>
@@ -902,7 +902,7 @@
     <string name="lockpassword_confirm_your_pin_header" msgid="49038294648213197">"Bevestig jou PIN"</string>
     <string name="lockpassword_confirm_passwords_dont_match" msgid="6850677112663979120">"Wagwoorde stem nie ooreen nie"</string>
     <string name="lockpassword_confirm_pins_dont_match" msgid="4757532830594400147">"PIN\'e stem nie ooreen nie"</string>
-    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ontsluit keuse"</string>
+    <string name="lockpassword_choose_lock_generic_header" msgid="3811438094903786145">"Ontsluitmetode"</string>
     <string name="lockpassword_password_set_toast" msgid="4875050283108629383">"Wagwoord is gestel"</string>
     <string name="lockpassword_pin_set_toast" msgid="6011826444725291475">"PIN is gestel"</string>
     <string name="lockpassword_pattern_set_toast" msgid="6867259621331406236">"Patroon is ingestel"</string>
@@ -937,7 +937,7 @@
     <string name="lock_title" product="tablet" msgid="2909697418179419990">"Beveilig jou tablet"</string>
     <string name="lock_title" product="default" msgid="4059246467204273930">"Beveilig jou foon"</string>
     <string name="lock_intro_message" product="tablet" msgid="1075370160667458122">"Beskerm jou tablet teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Gly met jou vinger om die kolletjies in enige volgorde te verbind op die volgende skerm. Jy moet ten minste vier kolletjies verbind. "\n\n"Reg om te begin? Raak “Volgende”."</string>
-    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskerm jou foon teen ongemagtigde gebruik deur \'n persoonlike skermontsluit-patroon te skep. Gly met jou vinger om ten minste vier kolletjies in enige volgorde op die volgende skerm te verbind. "\n\n"Gereed? Raak \"Volgende\"."</string>
+    <string name="lock_intro_message" product="default" msgid="8393155371327584659">"Beskerm jou foon teen ongemagtigde gebruik deur \'n persoonlike skermontsluitpatroon te skep. Gly met jou vinger om ten minste vier kolletjies in enige volgorde op die volgende skerm te verbind. "\n\n"Gereed? Raak \"Volgende\"."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"Bestuur programme"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"Bestuur en verwyder geïnstalleerde programme"</string>
     <string name="applications_settings" msgid="1721442176406964682">"Programme"</string>
@@ -963,7 +963,7 @@
     <string name="application_size_label" msgid="8494609207373874267">"Program"</string>
     <string name="external_code_size_label" msgid="3459343140355961335">"USB-geheueprogram"</string>
     <string name="data_size_label" msgid="8679376373625710107">"Data"</string>
-    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-geheue-data"</string>
+    <string name="external_data_size_label" product="nosdcard" msgid="7533821466482000453">"USB-berging-data"</string>
     <string name="external_data_size_label" product="default" msgid="626414192825329708">"SD-kaart"</string>
     <string name="uninstall_text" msgid="3644892466144802466">"Verwyder"</string>
     <string name="disable_text" msgid="6544054052049395202">"Deaktiveer"</string>
@@ -1327,7 +1327,7 @@
     <string name="credentials_erased" msgid="2907836028586342969">"Eiebewysberging is uitgevee."</string>
     <string name="credentials_not_erased" msgid="93461830775441220">"Eiebewysberging kon nie uitgevee word nie."</string>
     <string name="credentials_enabled" msgid="7588607413349978930">"Eiebewysberging is geaktiveer."</string>
-    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Jy moet \'n sluitskerm se PIN of wagwoord stel voordat jy eiebewysberging kan gebruik."</string>
+    <string name="credentials_configure_lock_screen_hint" msgid="6048426197489058494">"Jy moet \'n PIN of wagwoord vir die sluitskerm stel voordat jy eiebewysberging kan gebruik."</string>
     <string name="emergency_tone_title" msgid="1055954530111587114">"Noodtoon"</string>
     <string name="emergency_tone_summary" msgid="722259232924572153">"Stel gedrag wanneer \'n noodoproep gemaak word"</string>
     <string name="privacy_settings" msgid="5446972770562918934">"Rugsteun en stel terug"</string>
@@ -1391,7 +1391,7 @@
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasie geaktiveer"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasie gedeaktiveer"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"Sinkroniseerfout."</string>
-    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sinkroniseer instellings"</string>
+    <string name="account_sync_settings_title" msgid="4578227872921044660">"Sinkroniseer-instellings"</string>
     <string name="sync_is_failing" msgid="1591561768344128377">"Sinkronisering ondervind tans probleme. Dit sal binnekort terug wees."</string>
     <string name="add_account_label" msgid="7811707265834013767">"Voeg rekening by"</string>
     <string name="background_data" msgid="5779592891375473817">"Agtergronddata"</string>
@@ -1460,13 +1460,13 @@
     <string name="show_all_anrs" msgid="28462979638729082">"Wys alle ANRe"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"Wys Program reageer nie-dialoog vir agtergrond programme"</string>
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Datagebruik"</string>
-    <string name="data_usage_cycle" msgid="5652529796195787949">"Dataverbruiksiklus"</string>
+    <string name="data_usage_cycle" msgid="5652529796195787949">"Datagebruiksiklus"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Dataswerwing"</string>
     <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Beperk agtergronddata"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Aparte 4G-gebruik"</string>
     <string name="data_usage_menu_show_wifi" msgid="3872007281231638058">"Wys WiFi-gebruik"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Wys Ethernet-gebruik"</string>
-    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Verander tans siklus..."</string>
+    <string name="data_usage_change_cycle" msgid="7776556448920114866">"Verander siklus..."</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"Dag van maand om dataverbruiksiklus terug te stel:"</string>
     <string name="data_usage_empty" msgid="8621855507876539282">"Geen programme het gedurende hierdie tydperk data gebruik nie."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Voorgrond"</string>
@@ -1495,7 +1495,7 @@
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Beperk agtergronddata?"</string>
     <string name="data_usage_app_restrict_dialog" msgid="7471043848664440826">"Hierdie funksie kan veroorsaak dat \'n program wat afhanklik is van agtergronddata ophou werk as WiFi nie beskikbaar is nie."\n\n"Jy kan meer geskikte datagebruik-kontroles vind in die instellings wat beskikbaar is in die program."</string>
     <string name="data_usage_restrict_denied_dialog" msgid="7086969103661420799">"Beperking van agtergronddata is moontlik slegs as jy \'n mobieldatalimiet gestel het."</string>
-    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Gebruiksiklus se terugsteldatum"</string>
+    <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Gebruiksiklus-terugsteldatum"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Datum van elke maand:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Stel"</string>
     <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Stel dataverbruik-waarskuwing"</string>
@@ -1509,7 +1509,7 @@
     <string name="data_usage_sweep_limit" msgid="860566507375933039"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"limiet"</font></string>
     <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Verwyderde programme"</string>
     <string name="data_usage_received_sent" msgid="5039699009276621757">"<xliff:g id="RECEIVED">%1$s</xliff:g> ontvang, <xliff:g id="SENT">%2$s</xliff:g> gestuur"</string>
-    <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g> : ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruik"</string>
+    <string name="data_usage_total_during_range" msgid="441648308264260691">"<xliff:g id="RANGE">%2$s</xliff:g>: ongeveer <xliff:g id="TOTAL">%1$s</xliff:g> gebruik"</string>
     <string name="cryptkeeper_emergency_call" msgid="198578731586097145">"Noodoproep"</string>
     <string name="cryptkeeper_return_to_call" msgid="5613717339452772491">"Keer terug na oproep"</string>
     <string name="vpn_name" msgid="4689699885361002297">"Naam"</string>
@@ -1521,7 +1521,7 @@
     <string name="vpn_ipsec_secret" msgid="4526453255704888704">"IPSec voorafgedeelde sleutel"</string>
     <string name="vpn_ipsec_user_cert" msgid="6880651510020187230">"IPSec-gebruikersertifikaat"</string>
     <string name="vpn_ipsec_ca_cert" msgid="91338213449148229">"IPSec CA-sertifikaat"</string>
-    <string name="vpn_show_options" msgid="7182688955890457003">"vertoon gevorderde opsies"</string>
+    <string name="vpn_show_options" msgid="7182688955890457003">"Wys gevorderde opsies"</string>
     <string name="vpn_search_domains" msgid="5391995501541199624">"DNS-soekdomeine"</string>
     <string name="vpn_dns_servers" msgid="5570715561245741829">"DNS-bedieners (bv. 8.8.8.8)"</string>
     <string name="vpn_routes" msgid="3818655448226312232">"Aanstuurroetes (bv. 10.0.0.0/8)"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 48cc846a378..20d5e7b5162 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -309,7 +309,7 @@
     <string name="crypt_keeper_desc" product="default" msgid="3504519024884099702">"Sie können Ihre Konten, Einstellungen, heruntergeladenen Apps und die entsprechenden Daten, Medien und sonstigen Dateien verschlüsseln. Nach einer Verschlüsselung Ihres Telefons müssen Sie bei jedem Einschalten des Geräts eine numerische PIN oder ein Passwort eingeben. Sie können die Verschlüsselung Ihres Telefons nur durch Zurücksetzen auf die Werkseinstellungen aufheben, wobei alle auf ihm befindlichen Daten gelöscht werden."\n\n"Die Verschlüsselung dauert mindestens eine Stunde. Der Akku muss beim Start des Vorgangs aufgeladen sein und das Gerät muss eingesteckt bleiben, bis die Verschlüsselung abgeschlossen ist. Wenn Sie den Verschlüsselungsvorgang unterbrechen, gehen einige oder alle Daten verloren."</string>
     <string name="crypt_keeper_button_text" product="tablet" msgid="1189623490604750854">"Tablet verschlüsseln"</string>
     <string name="crypt_keeper_button_text" product="default" msgid="2008346408473255519">"Telefon verschlüsseln"</string>
-    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laden Sie Ihren Akku auf und versuchen Sie es noch einmal."</string>
+    <string name="crypt_keeper_low_charge_text" msgid="2029407131227814893">"Laden Sie Ihren Akku auf und versuchen Sie es erneut."</string>
     <string name="crypt_keeper_unplugged_text" msgid="4785376766063053901">"Schließen Sie Ihr Ladegerät an und versuchen Sie es erneut."</string>
     <string name="crypt_keeper_dialog_need_password_title" msgid="4058971800557767">"Keine PIN oder kein Passwort für Bildschirmsperre"</string>
     <string name="crypt_keeper_dialog_need_password_message" msgid="17076329416977176">"Sie müssen eine PIN oder ein Passwort für die Bildschirmspeere festlegen, bevor Sie die Verschlüsselung starten können."</string>
@@ -414,7 +414,7 @@
     <string name="bluetooth_pin_values_hint" msgid="3815897557875873646">"In der Regel 0000 oder 1234"</string>
     <string name="bluetooth_enter_pin_other_device" msgid="3617812138113586885">"Möglicherweise müssen Sie diese PIN auch auf dem anderen Gerät eingeben."</string>
     <string name="bluetooth_enter_passkey_other_device" msgid="1808735246794073465">"Möglicherweise müssen Sie diesen Schlüssel auch auf dem anderen Gerät eingeben."</string>
-    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@771c8a71)  -->
+    <!-- syntax error in translation for bluetooth_confirm_passkey_msg (3708312912841950052) org.xmlpull.v1.XmlPullParserException: name expected (position:START_TAG <null>@1:241 in java.io.StringReader@446b7920)  -->
     <string name="bluetooth_incoming_pairing_msg" msgid="1615930853859551491">"Von:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;&lt;br&gt;&lt;br&gt;Pairing mit diesem Gerät durchführen?"</string>
     <string name="bluetooth_display_passkey_pin_msg" msgid="2796550001376088433">"Geben Sie zum Pairing mit <xliff:g id="BOLD1_0">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="DEVICE_NAME">%1$s</xliff:g><xliff:g id="END_BOLD1">&lt;/b&gt;&lt;br&gt;&lt;br&gt;</xliff:g> <xliff:g id="BOLD2_1">&lt;br&gt;&lt;b&gt;</xliff:g><xliff:g id="PASSKEY">%2$s</xliff:g><xliff:g id="END_BOLD2">&lt;/b&gt;</xliff:g> ein und drücken Sie anschließend die Eingabetaste."</string>
     <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Kopplung durchführen"</string>
@@ -747,8 +747,8 @@
     <string name="dlg_confirm_unmount_text" product="default" msgid="6998379994779187692">"Wenn Sie die SD-Karte entfernen, werden einige von Ihnen verwendete Apps angehalten und sind nicht mehr verfügbar, bis Sie die SD-Karte wieder einsetzen."</string>
     <string name="dlg_error_unmount_title" product="nosdcard" msgid="4642742385125426529"></string>
     <string name="dlg_error_unmount_title" product="default" msgid="4642742385125426529"></string>
-    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"USB-Speicher kann nicht getrennt werden. Bitte versuchen Sie es später noch einmal."</string>
-    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"SD-Karte kann nicht entfernt werden. Bitte versuchen Sie es später noch einmal."</string>
+    <string name="dlg_error_unmount_text" product="nosdcard" msgid="4346280469528260684">"USB-Speicher kann nicht getrennt werden. Bitte versuchen Sie es später erneut."</string>
+    <string name="dlg_error_unmount_text" product="default" msgid="3073562815631781894">"SD-Karte kann nicht entfernt werden. Bitte versuchen Sie es später erneut."</string>
     <string name="unmount_inform_text" product="nosdcard" msgid="7120241136790744265">"USB-Speicher wird getrennt."</string>
     <string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-Karte wird getrennt."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Trennen..."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index aa935a10f2f..da0ef9b38de 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -330,7 +330,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Cambiar pant. de bloq."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Cambiar/inhab. patrón/PIN/contraseña"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Elige un método para bloquear la pantalla."</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Si el desbloqueo facial no puede verte, ¿qué alternativa quieres para desbloquear?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Si el desbloqueo facial no te reconoce, ¿cómo quieres desbloquear la pantalla?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Ninguna"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Inhabilitar seguridad"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0e06ffadf14..7e27ea987c7 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -335,7 +335,7 @@
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"اسلاید"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"عدم وجود امنیت"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlockj"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"امنیت پایین، تجربی"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"الگو"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"امنیت متوسط"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 38d9c918471..9a6500b86e8 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -1387,7 +1387,7 @@
     <string name="wifi_setup_status_eap_not_supported" msgid="5335338851032315905">"EAP समर्थित नहीं है."</string>
     <string name="wifi_setup_eap_not_supported" msgid="4521956828166347452">"आप सेट करते समय किसी EAP WiFi कनेक्‍शन को कॉन्‍िफ़गर नहीं कर सकते. सेट करने के बाद, आप उसे सेटिंग &gt; वायरलेस और नेटवर्क में कॉन्फ़िगर कर सकते हैं."</string>
     <string name="wifi_setup_description_connecting" msgid="2793554932006756795">"कनेक्‍ट होने में कुछ मिनट लग सकते हैं..."</string>
-    <!-- syntax error in translation for wifi_setup_description_connected (1748172546080673171) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:191 in java.io.StringReader@43256ea2)  -->
+    <!-- syntax error in translation for wifi_setup_description_connected (1748172546080673171) org.xmlpull.v1.XmlPullParserException: expected: /string read: b (position:END_TAG </b>@1:191 in java.io.StringReader@5cdf8f5e)  -->
     <string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
     <string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
     <string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 0e128175313..739a5a2084b 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -827,7 +827,7 @@
     <string name="media_format_title" product="default" msgid="4427528440306787972">"Izbriši karticu SD"</string>
     <string name="media_format_summary" product="nosdcard" msgid="776603298628082065">"Briše sve podatke USB memorije"</string>
     <string name="media_format_summary" product="default" msgid="3805714639375830120">"Briše sve podatke na SD kartici"</string>
-    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"Izbrisati čitavu USB pohranu? Izgubit ćete "<b>"sve"</b>" pohranjene podatke!"</string>
+    <string name="media_format_desc" product="nosdcard" msgid="4557243156946319034">"Izbrisati čitavu USB memoriju? Izgubit ćete "<b>"sve"</b>" pohranjene podatke!"</string>
     <string name="media_format_desc" product="default" msgid="8764037252319942415">"Izbrisati SD karticu? Izgubit ćete "<b>"sve"</b>" podatke na kartici!"</string>
     <string name="media_format_button_text" product="nosdcard" msgid="6293669371185352810">"Izbriši USB memoriju"</string>
     <string name="media_format_button_text" product="default" msgid="6721544380069373626">"Izbriši karticu SD"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 49c0628f0dd..ed5bdc9dbfd 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -330,12 +330,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Ubah layar gembok"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Ubah atau nonaktifkan pola, PIN, atau sandi keamanan"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pilih metode untuk mengunci layar"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Jika Wajah Pembuka Gembok tidak dapat melihat Anda, bagaimana Anda ingin membuka gembok?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Bila Face Unlock tidak dapat melihat Anda, cara apa yang ingin Anda gunakan untuk membuka gembok?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Tidak ada"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Geser"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Tanpa pengamanan"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Wajah Pembuka Gembok"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Keamanan rendah, eksperimental"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Pola"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Keamanan sedang"</string>
@@ -346,7 +346,7 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dinonaktifkan oleh administrator, kebijakan enkripsi, atau penyimpanan kredensial"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tidak ada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Geser"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Wajah Pembuka Gembok"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Diamankan dengan pola"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Diamankan dengan PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Diamankan dengan sandi"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4ce3b80a913..fc750d4dc11 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -874,7 +874,7 @@
     <string name="assisted_gps" msgid="4649317129586736885">"השתמש ב-Assisted GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"השתמש בשרת כדי לסייע ל-GPS (הסר את הסימון כדי לצמצם את השימוש ברשת)"</string>
     <string name="assisted_gps_disabled" msgid="6982698333968010748">"השתמש בשרת כדי לסייע ל-GPS (הסר את הסימון כדי לשפר את ביצועי GPS)"</string>
-    <string name="use_location_title" msgid="5206937465504979977">"מיקום והחיפוש של Google"</string>
+    <string name="use_location_title" msgid="5206937465504979977">"מיקום וחיפוש Google"</string>
     <string name="use_location_summary" msgid="3978805802386162520">"אפשר ל-Google להשתמש במיקום שלך כדי לשפר את תוצאות החיפוש ושירותים נוספים"</string>
     <string name="about_settings" product="tablet" msgid="593457295516533765">"מידע על הטבלט"</string>
     <string name="about_settings" product="default" msgid="1743378368185371685">"מידע על הטלפון"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 7b76b00f58c..75bee254876 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -244,7 +244,7 @@
     <string name="skip_label" msgid="47510779345218297">"건너뛰기"</string>
     <string name="next_label" msgid="4693520878012668114">"다음"</string>
     <string name="language_picker_title" msgid="5349877711342869319">"언어"</string>
-    <string name="activity_picker_label" msgid="6295660302548177109">"활동 선택"</string>
+    <string name="activity_picker_label" msgid="6295660302548177109">"작업 선택"</string>
     <string name="device_info_label" msgid="6551553813651711205">"장치정보"</string>
     <string name="battery_info_label" msgid="4132685016148679403">"배터리 정보"</string>
     <string name="display_label" msgid="8074070940506840792">"화면"</string>
@@ -940,7 +940,7 @@
     <string name="lock_intro_message" product="default" msgid="8393155371327584659">"나만의 화면 잠금해제 패턴을 만들어서 인증되지 않은 사람이 휴대전화를 사용하지 못하게 할 수 있습니다. 다음 화면에서 손가락을 슬라이드하여 원하는 순서로 최소한 4개의 점을 연결하세요. "\n\n"시작할 준비가 되었으면 \'다음\'을 터치합니다."</string>
     <string name="manageapplications_settings_title" msgid="7041951105633616745">"앱 관리"</string>
     <string name="manageapplications_settings_summary" msgid="1794401500935451259">"설치된 앱 관리 및 제거"</string>
-    <string name="applications_settings" msgid="1721442176406964682">"앱"</string>
+    <string name="applications_settings" msgid="1721442176406964682">"애플리케이션"</string>
     <string name="applications_settings_summary" msgid="6683465446264515367">"앱 관리, 빠른실행 바로가기 설정"</string>
     <string name="applications_settings_header" msgid="1014813055054356646">"앱 설정"</string>
     <string name="install_applications" msgid="4872012136210802181">"알 수 없는 소스"</string>
@@ -1455,7 +1455,7 @@
     <string name="transition_animation_scale_title" msgid="387527540523595875">"전환 애니메이션 배율"</string>
     <string name="debug_applications_category" msgid="4206913653849771549">"앱"</string>
     <string name="immediately_destroy_activities" msgid="8366775083630234121">"액티비티 유지 안함"</string>
-    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"사용자가 액티비티에서 떠나는 즉시 바로 제거"</string>
+    <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"사용자가 종료하는 즉시 바로 제거"</string>
     <string name="app_process_limit_title" msgid="4280600650253107163">"백그라운드 프로세스 수 제한"</string>
     <string name="show_all_anrs" msgid="28462979638729082">"모든 ANR 보기"</string>
     <string name="show_all_anrs_summary" msgid="641908614413544127">"백그라운드 앱에 대해 앱 응답 없음 대화상자 표시"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 572f13bd95f..d97e2c634a1 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -330,12 +330,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Tukar kunci skrin"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Tukar atau lumpuhkan corak, PIN atau keselamatan kata laluan"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Pilih kaedah untuk mengunci skrin"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Apabila Unlock Face tidak boleh melihat anda, bagaimana anda mahu membuka kunci?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Apabila Buka Kunci Wajah tidak dapath melihat anda, bagaimana anda mahu membuka kunci?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Tiada"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Slaid"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Tiada keselamatan"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Buka Kunci Wajah"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Keselamatan yang rendah, percubaan"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Corak"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Keselamatan sederhana"</string>
@@ -346,7 +346,7 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Dlumpuhkn pentadbir, dsr penyulitan/storan klayakn"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Tiada"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Slaid"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Buka Kunci Wajah"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Dilindungi dengan corak"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Dilindungi PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Dilindungi kata laluan"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 881588825a4..edcfd9d3b42 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -330,12 +330,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schermvergr. wijzigen"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Beveiliging via patroon, PIN of wachtwoord wijzigen of uitschakelen"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Kies een methode voor schermvergrendeling"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Hoe wilt u ontgrendelen als gezichtsherkenning niet mogelijk is?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Hoe wilt u ontgrendelen als Face Unlock niet mogelijk is?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Geen"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Vegen"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Geen beveiliging"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Gezichtsherkenning"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Face Unlock"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Lage beveiliging, experimenteel"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Patroon"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Gemiddelde beveiliging"</string>
@@ -346,7 +346,7 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Uitgeschakeld door beheerder, encryptiebeleid of referentieopslag"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Geen"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Vegen"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Ontgrendeling via gezichtsherkenning"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Face Unlock"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Beveiligd met patroon"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Beveiligd met een PIN-code"</string>
     <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Beveiligd met wachtwoord"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 52f8e934264..5c33ae471c4 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -330,7 +330,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Schimbaţi bloc.ecran."</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Modificaţi sau dezactivaţi modelul, codul PIN sau siguranţa prin parolă"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Alegeţi o metodă pentru a bloca ecranul"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Când aplicaţia Deblocare facială nu vă poate vedea, cum doriţi să deblocaţi?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Când funcţia Deblocare facială nu vă poate vedea, cum doriţi să deblocaţi?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Fără"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Glisare"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index d68870deb2e..5d93e6de00c 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -476,7 +476,7 @@
     <string name="bluetooth_dock_settings_headset" msgid="1001821426078644650">"Для громкой связи"</string>
     <string name="bluetooth_dock_settings_a2dp" msgid="8791004998846630574">"Для музыки и мультимедиа"</string>
     <string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Запомнить настройки"</string>
-    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"Включить NFC"</string>
+    <string name="nfc_quick_toggle_title" msgid="6769159366307299004">"NFC"</string>
     <string name="nfc_quick_toggle_summary" msgid="5237208142892767592">"Разрешить обмен данными при совмещении телефона с другим устройством"</string>
     <string name="android_beam_settings_title" msgid="7832812974600338649">"Android Beam"</string>
     <string name="android_beam_on_summary" msgid="3618057099355636830">"Можно обмениваться контентом по NFC"</string>
@@ -607,7 +607,7 @@
     <string name="dtmf_tone_enable_title" msgid="8533399267725365088">"Звук клавиш"</string>
     <string name="sound_effects_enable_title" msgid="1171590821131077296">"Звук нажатия на экран"</string>
     <string name="lock_sounds_enable_title" msgid="450098505659399520">"Звук блокировки экрана"</string>
-    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Виброотклик"</string>
+    <string name="haptic_feedback_enable_title" msgid="2438293710530828760">"Включить виброотклик"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Подавление шума"</string>
     <string name="volume_media_description" msgid="7949355934788807863">"Музыка, видео, игры и другие медиафайлы"</string>
     <string name="volume_ring_description" msgid="5936851631698298989">"Рингтон и уведомления"</string>
@@ -869,7 +869,7 @@
     <string name="location_network_based" msgid="5569673665032992664">"По координатам сети"</string>
     <string name="location_neighborhood_level" msgid="7473531167475623654">"Использовать Wi-Fi и мобильные сети для определения местоположения"</string>
     <string name="location_neighborhood_level_wifi" msgid="1477255106707542972">"Местоположение определено по Wi-Fi"</string>
-    <string name="location_gps" msgid="8392461023569708478">"Спутники GPS"</string>
+    <string name="location_gps" msgid="8392461023569708478">"По спутникам GPS"</string>
     <string name="location_street_level" msgid="4244496898967415234">"Разрешить приложениям использовать GPS для точного определения вашего местоположения"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Использовать A-GPS"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Использовать сервер для A-GPS (снимите флажок для менее интенсивного использования сети)"</string>
@@ -925,8 +925,8 @@
     <string name="lockpattern_settings_title" msgid="3207750489460466680">"Графический ключ разблокировки"</string>
     <string name="lockpattern_settings_enable_title" msgid="6920616873671115281">"Запрашивать ключ"</string>
     <string name="lockpattern_settings_enable_summary" msgid="1165707416664252167">"Использовать графический ключ для защиты телефона"</string>
-    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Показывать графический ключ"</string>
-    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Вибрировать при касании"</string>
+    <string name="lockpattern_settings_enable_visible_pattern_title" msgid="2615606088906120711">"Показывать ключ"</string>
+    <string name="lockpattern_settings_enable_tactile_feedback_title" msgid="8898518337442601027">"Включить виброотклик"</string>
     <string name="lockpattern_settings_choose_lock_pattern" msgid="1652352830005653447">"Установить ключ"</string>
     <string name="lockpattern_settings_change_lock_pattern" msgid="1123908306116495545">"Изменить ключ"</string>
     <string name="lockpattern_settings_help_how_to_record" msgid="2614673439060830433">"Как начертить графический ключ разблокировки"</string>
@@ -1444,7 +1444,7 @@
     <string name="pointer_location" msgid="6084434787496938001">"Местоположение указателя"</string>
     <string name="pointer_location_summary" msgid="840819275172753713">"Экран, показывающий данные о прикосновении"</string>
     <string name="show_touches" msgid="1356420386500834339">"Показывать нажатия"</string>
-    <string name="show_touches_summary" msgid="6684407913145150041">"Показывать графический ключ разблокировки экрана"</string>
+    <string name="show_touches_summary" msgid="6684407913145150041">"Показывать графический ключ"</string>
     <string name="show_screen_updates" msgid="8282711794220426931">"Показать обновления"</string>
     <string name="show_screen_updates_summary" msgid="1716122382094924596">"Подсвечивать области экрана при обновлении"</string>
     <string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
@@ -1462,9 +1462,9 @@
     <string name="data_usage_summary_title" msgid="3804110657238092929">"Передача данных"</string>
     <string name="data_usage_cycle" msgid="5652529796195787949">"Цикл использования данных"</string>
     <string name="data_usage_menu_roaming" msgid="8042359966835203296">"Интернет-роуминг"</string>
-    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ограничить исходные данные"</string>
+    <string name="data_usage_menu_restrict_background" msgid="1989394568592253331">"Ограничить фон. режим"</string>
     <string name="data_usage_menu_split_4g" msgid="5322857680792601899">"Только по каналу 4G"</string>
-    <string name="data_usage_menu_show_wifi" msgid="3872007281231638058">"Показывать трафик Wi-Fi"</string>
+    <string name="data_usage_menu_show_wifi" msgid="3872007281231638058">"Трафик Wi-Fi"</string>
     <string name="data_usage_menu_show_ethernet" msgid="5181361208532314097">"Показывать загрузку Ethernet"</string>
     <string name="data_usage_change_cycle" msgid="7776556448920114866">"Изменить цикл…"</string>
     <string name="data_usage_pick_cycle_day" msgid="4470796861757050966">"День месяца, когда сбрасывается цикл использования данных:"</string>
@@ -1485,11 +1485,11 @@
     <string name="data_usage_tab_3g" msgid="6092169523081538718">"2G/3G"</string>
     <string name="data_usage_list_mobile" msgid="8285167120931486089">"моб. сети"</string>
     <string name="data_usage_list_none" msgid="2899530183512542206">"нет"</string>
-    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Мобильная передача данных"</string>
+    <string name="data_usage_enable_mobile" msgid="986782622560157977">"Моб. трафик"</string>
     <string name="data_usage_enable_3g" msgid="6304006671869578254">"Передача данных по сетям 2G/3G"</string>
     <string name="data_usage_enable_4g" msgid="3635854097335036738">"Передача данных 4G"</string>
     <string name="data_usage_app_settings" msgid="8430240158135453271">"Настройки приложения"</string>
-    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ограничить фоновый режим"</string>
+    <string name="data_usage_app_restrict_background" msgid="9149728936265100841">"Ограничить фон. режим"</string>
     <string name="data_usage_app_restrict_background_summary" msgid="2942211576678233254">"Откл. фоновый режим только для моб. сетей (использовать Wi-Fi)."</string>
     <string name="data_usage_app_restrict_background_summary_disabled" msgid="7401927377070755054">"Сначала установите лимит для мобильного трафика."</string>
     <string name="data_usage_app_restrict_dialog_title" msgid="1613108390242737923">"Ограничение фонового режима"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 08505b3a157..3a7d0f9456c 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -330,7 +330,7 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"badilisha kufunga kwa skrini"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Badilisha au lemaza umbo, PIn, au usalama wa neniosiri"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Chagua mbinu ili kufunga skrini"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Wakati Kufungua kwa Uso hakuwezi kukuona wewe, je, utaifungua aje?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Wakati Kufungua kwa Uso hakuwezi kukuona wewe, je, utafungua aje?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Hamna"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Slaidi"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 791874d2f99..5d3493288aa 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -330,12 +330,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"更改锁定屏幕"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"更改或停用图案、PIN 或密码保护"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"选择锁定屏幕的方法"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"当“认脸解锁 ”识别不出您时，您希望如何解锁？"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"当人脸解锁识别不出您时，您希望如何解锁？"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"无"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"滑动"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"无安全措施"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"认脸解锁"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"人脸解锁"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"安全性低、实验性"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"图案"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"中等安全性"</string>
@@ -346,7 +346,7 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"已被管理员、加密政策或凭据存储停用"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"无"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"滑动"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"认脸解锁"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"人脸解锁"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"使用图案设置安全保护"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"使用 PIN 进行保护"</string>
     <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"通过密码设置安全保护"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index d4670ffbae9..69e92e17b7c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -273,7 +273,7 @@
     <string name="date_and_time_settings_title" msgid="3350640463596716780">"日期與時間"</string>
     <string name="date_and_time_settings_title_setup_wizard" msgid="2391530758339384324">"設定日期和時間"</string>
     <string name="date_and_time_settings_summary" msgid="7095318986757583584">"設定日期、時間、時區及時間格式"</string>
-    <string name="date_time_auto" msgid="7076906458515908345">"自動判定日期和時間"</string>
+    <string name="date_time_auto" msgid="7076906458515908345">"自動判斷日期和時間"</string>
     <string name="date_time_auto_summaryOn" msgid="4609619490075140381">"使用網路提供的時間"</string>
     <string name="date_time_auto_summaryOff" msgid="8698762649061882791">"使用網路提供的時間"</string>
     <string name="zone_auto" msgid="334783869352026648">"自動判定時區"</string>
@@ -693,7 +693,7 @@
     <string name="device_status_summary" product="default" msgid="2599162787451519618">"電話號碼、訊號等。"</string>
     <string name="storage_settings" msgid="4211799979832404953">"儲存空間"</string>
     <string name="storage_settings_title" msgid="8746016738388094064">"儲存設定"</string>
-    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"卸載 USB 儲存裝置，瀏覽可用的儲存裝置"</string>
+    <string name="storage_settings_summary" product="nosdcard" msgid="3543813623294870759">"卸載 USB 儲存裝置、查看可用的儲存空間"</string>
     <string name="storage_settings_summary" product="default" msgid="9176693537325988610">"卸載 SD 卡，檢視可用儲存媒體。"</string>
     <string name="status_number" product="tablet" msgid="1138837891091222272">"MDN"</string>
     <string name="status_number" product="default" msgid="5123197324870153205">"我的電話號碼"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index af5d2091050..cdd342b5441 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -114,7 +114,7 @@
     <string name="bluetooth_name_not_set" msgid="2653752006416027426">"Alikho igama elisethiwe, usebenzisa igama le-akhawunti"</string>
     <string name="bluetooth_scan_for_devices" msgid="9214184305566815727">"Skena amadivaysi"</string>
     <string name="bluetooth_rename_device" product="tablet" msgid="787970073150631155">"Qamba kabusha ithebhulethi"</string>
-    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Qama kabusha ifoni"</string>
+    <string name="bluetooth_rename_device" product="default" msgid="6267987985556136749">"Yetha kabusha ifoni"</string>
     <string name="bluetooth_rename_button" msgid="1648028693822994566">"Qamba kabusha"</string>
     <string name="bluetooth_disconnect_title" msgid="6026705382020027966">"Ungaxhumeki kwi-inthanethi?"</string>
     <string name="bluetooth_disconnect_all_profiles" msgid="9148530542956217908">"Lokhu kuzophelisa uxhumano nge:&lt;br&gt;&lt;b&gt;<xliff:g id="DEVICE_NAME">%1$s</xliff:g>&lt;/b&gt;"</string>
@@ -131,11 +131,11 @@
     <string name="bluetooth_pairing" msgid="1426882272690346242">"Iyabhangqa..."</string>
     <string name="bluetooth_device" msgid="5291950341750186887">"Idivayisi ye-Bluetooth engaqanjwanga igama"</string>
     <string name="progress_scanning" msgid="192587958424295789">"Iyasesha..."</string>
-    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Cindezela ukuze umatanise"</string>
+    <string name="progress_tap_to_pair" msgid="5655704645616731277">"Bhanqa"</string>
     <string name="bluetooth_no_devices_found" msgid="1085232930277181436">"Awekho amadivayisi e-Bluetooth atholakele."</string>
     <string name="bluetooth_notif_ticker" msgid="4726721390078512173">"Isicelo sokubhanqa i-Bluetooth"</string>
     <string name="bluetooth_notif_title" msgid="2485175521845371514">"Isicelo sokubhangqa"</string>
-    <string name="bluetooth_notif_message" msgid="1931617700075106801">"Khetha ukubhanqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+    <string name="bluetooth_notif_message" msgid="1931617700075106801">"Bhanqa ne-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
     <string name="bluetooth_show_received_files" msgid="5164787486105868895">"Bonisa amafayili atholiwe"</string>
     <string name="device_picker" msgid="8721012448931226323">"Isithathi sedivaysi ye-Bluetooth"</string>
     <string name="bluetooth_permission_request" msgid="1523129741266262748">"Isicelo semvume ye-Bluetooth"</string>
@@ -330,12 +330,12 @@
     <string name="unlock_set_unlock_launch_picker_change_title" msgid="5045866882028324941">"Shintsha ukuvala isikrini"</string>
     <string name="unlock_set_unlock_launch_picker_change_summary" msgid="2790960639554590668">"Shintsha noma vimbela iphathini, i-PIN, noma ukuphepha kwephasiwedi"</string>
     <string name="unlock_set_unlock_launch_picker_enable_summary" msgid="4791110798817242301">"Khetha indlela yokuvula isikrini"</string>
-    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Uma izimo ze-Face Unlock zingakuboni, ufuna ukuvula kanjani?"</string>
+    <string name="unlock_backup_info_summary" msgid="108524727803788172">"Uma izimo ze-Vula Ngobuso zingakuboni, ufuna ukuvula kanjani?"</string>
     <string name="unlock_set_unlock_off_title" msgid="7117155352183088342">"Lutho"</string>
     <string name="unlock_set_unlock_off_summary" msgid="94361581669110415"></string>
     <string name="unlock_set_unlock_none_title" msgid="2871898266296656162">"Islayidi"</string>
     <string name="unlock_set_unlock_none_summary" msgid="8914673583104628191">"Akukho ukuphepha"</string>
-    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"I-Face Unlock"</string>
+    <string name="unlock_set_unlock_biometric_weak_title" msgid="2227215291604628670">"Vula Ngobuso"</string>
     <string name="unlock_set_unlock_biometric_weak_summary" msgid="180083326982058964">"Ukuphepha okuphansi, ukulinga"</string>
     <string name="unlock_set_unlock_pattern_title" msgid="2912067603917311700">"Iphathini"</string>
     <string name="unlock_set_unlock_pattern_summary" msgid="7062696666227725593">"Ukuphepha Okuphakathi nendawo"</string>
@@ -346,7 +346,7 @@
     <string name="unlock_set_unlock_disabled_summary" msgid="2120729867788851674">"Khubaza umqondisi, ukubethela inqubomgomo, noma ukugcina ukuqinisekisa"</string>
     <string name="unlock_set_unlock_mode_off" msgid="5881952274566013651">"Lutho"</string>
     <string name="unlock_set_unlock_mode_none" msgid="5660014471997663139">"Islayidi"</string>
-    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"I-Face Unlock"</string>
+    <string name="unlock_set_unlock_mode_biometric_weak" msgid="3008473624490350142">"Vula Ngobuso"</string>
     <string name="unlock_set_unlock_mode_pattern" msgid="464022606293547390">"Ivikelwe ngephathini"</string>
     <string name="unlock_set_unlock_mode_pin" msgid="1379365142708807163">"Ivikelwe nge-PIN"</string>
     <string name="unlock_set_unlock_mode_password" msgid="6955742995327081060">"Ivikelwe ngephasiwedi"</string>
@@ -425,7 +425,7 @@
     <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"Ayaikwazi ukuxhumana ne- <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"Ukubhangqa kunqatshelwe i-<xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string>
     <string name="bluetooth_connecting_error_message" msgid="1779660510084746802">"Kube nenkinga yokuxhuma kwi<xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
-    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Thwebula amadivaysi"</string>
+    <string name="bluetooth_preference_scan_title" msgid="2277464653118896016">"Skena amadivaysi"</string>
     <string name="bluetooth_search_for_devices" msgid="5957007154213560390">"Sesha amadivayisi"</string>
     <string name="bluetooth_searching_for_devices" msgid="9203739709307871727">"Iyacinga..."</string>
     <string name="bluetooth_preference_device_settings" msgid="907776049862799122">"Izilungiselelo zedivaysi"</string>
@@ -494,16 +494,16 @@
     <string name="wifi_stopping" msgid="4344576443009704646">"Vala okungenantambo"</string>
     <string name="wifi_error" msgid="3207971103917128179">"Iphutha"</string>
     <string name="wifi_in_airplane_mode" msgid="8652520421778203796">"Kwimodi yendiza"</string>
-    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ayikwazi ukuhlola amanethiwekhi"</string>
+    <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Ayikwazi ukuskena amanethiwekhi"</string>
     <string name="wifi_notify_open_networks" msgid="3755768188029653293">"Isaziso senethiwekhi"</string>
     <string name="wifi_notify_open_networks_summary" msgid="3038290727701553612">"Ngazise lapho inethiwekhi evulekile itholakala"</string>
-    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Ukungaxhumeki okuhle okugwenyiwe"</string>
+    <string name="wifi_enable_watchdog_service" msgid="3808826765041243874">"Gwema uxhumo olubi"</string>
     <string name="wifi_enable_watchdog_service_summary" msgid="4248686597890494105">"Ungasebenzisi uhleloxhumano lwe-Wi-Fi ngaphandle uma unohleloxhumano lwe-inthanethi olukahle."</string>
     <string name="wifi_setting_sleep_policy_title" msgid="391381189748401988">"Gcina i-Wi-Fi isebenza ngesikhathi sokulala"</string>
     <string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"Kube khona inkinga yokushintsha ilungiselelo"</string>
     <string name="wifi_add_network" msgid="6234851776910938957">"Yengeza inethiwekhi"</string>
     <string name="wifi_access_points" msgid="6623468070878623378">"Uhleloxhumano lwe-WiFi"</string>
-    <string name="wifi_menu_scan" msgid="1470911530412095868">"Thwebula"</string>
+    <string name="wifi_menu_scan" msgid="1470911530412095868">"Skena"</string>
     <string name="wifi_menu_advanced" msgid="7522252991919573664">"Thuthukisiwe"</string>
     <string name="wifi_menu_connect" msgid="4996220309848349408">"Xhuma kwinethiwekhi"</string>
     <string name="wifi_menu_forget" msgid="8736964302477327114">"Khohlwa inethiwekhi"</string>
@@ -629,7 +629,7 @@
     <string name="dock_sounds_enable_summary_on" product="default" msgid="8491180514199743771">"Dlala umsindo lapho ufaka noma ukhipha ifoni kudokhi"</string>
     <string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ungadlali umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
     <string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ungadlali umsindo lapho ufaka noma ukhipha ifoni ekubekeni ingxenye"</string>
-    <string name="sync_settings" msgid="9186125469300013491">"Ama-akhawunti; nokukuvumelanisa"</string>
+    <string name="sync_settings" msgid="9186125469300013491">"Ama-akhawunti; ukuvumelanisa"</string>
     <string name="search_settings" msgid="1910951467596035063">"Sesha"</string>
     <string name="search_settings_summary" msgid="9205656546570654169">"Phatha izilungiselelo zokusesha nomlando"</string>
     <string name="display_settings" msgid="7965901687241669598">"Bonisa"</string>
@@ -1165,7 +1165,7 @@
     <string name="accessibility_script_injection_title" msgid="3264723681038625967">"Faka imibhalo yewebhu"</string>
     <string name="accessibility_menu_item_settings" msgid="3344942964710773365">"Izilungiselelo"</string>
     <string name="accessibility_menu_item_tutorial" msgid="567989492004682307">"Okokufundisa"</string>
-    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Ngomhla ka"</string>
+    <string name="accessibility_service_state_on" msgid="8791337599927106344">"Vuliwe"</string>
     <string name="accessibility_service_state_off" msgid="2458594460762620776">"Valiwe"</string>
     <string name="accessibility_script_injection_allowed" msgid="7624804397748427621">"Kuvumelekile"</string>
     <string name="accessibility_script_injection_disallowed" msgid="8639525487720429182">"Akuvumelekile"</string>
@@ -1472,8 +1472,8 @@
     <string name="data_usage_empty" msgid="8621855507876539282">"Azikho izinhlelo zokusebenza ezisebenzise idatha phakathi nalesi sikhathi."</string>
     <string name="data_usage_label_foreground" msgid="4938034231928628164">"Ingaphambili"</string>
     <string name="data_usage_label_background" msgid="3225844085975764519">"Ingemuva"</string>
-    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Ikalwe ikhompyutha yakho yepeni. I-akhawuntingi Yokusetshenziswa kwe-data kwesiphathi sakho ingehluka."</string>
-    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Ikalwe ucingo lwakho. I-akhawuntingi Yokusetshenziswa kwe-data kwesiphathi sakho ingehluka."</string>
+    <string name="data_usage_disclaimer" product="tablet" msgid="2591250607795265503">"Ikalwe yithebulethi yakho. Ukubala kwenkampani yakho yenethiwekhi kungehluka."</string>
+    <string name="data_usage_disclaimer" product="default" msgid="4735170480663491977">"Ikalwe ngefoni yakho. Ukubala kwenkampani yakho yenethiwekhi kungehluka."</string>
     <string name="data_usage_disable_mobile" msgid="5211007048880167438">"Yenza imininingwane kamakhalekhukhwini ingasebenzi?"</string>
     <string name="data_usage_disable_mobile_limit" msgid="4644364396844393848">"Setha umkhawulo we-data yezinto eziphathwayo"</string>
     <string name="data_usage_disable_4g_limit" msgid="6233554774946681175">"Setha umkhawulo we-data ube ngu-4G"</string>
@@ -1499,11 +1499,11 @@
     <string name="data_usage_cycle_editor_title" msgid="1373797281540188533">"Usuku lokuhlela kabusha umjikelezo wokusebenza"</string>
     <string name="data_usage_cycle_editor_subtitle" msgid="5512903797979928416">"Idethi yenyanga ngayinye:"</string>
     <string name="data_usage_cycle_editor_positive" msgid="8821760330497941117">"Hlela"</string>
-    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setha isexwayiso sokusebenziseka kwe-data"</string>
-    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setha umkhawulo wokusetshenziswa kwe-data"</string>
+    <string name="data_usage_warning_editor_title" msgid="3704136912240060339">"Setha isexwayiso sokusebenziseka kwedatha"</string>
+    <string name="data_usage_limit_editor_title" msgid="9153595142385030015">"Setha umkhawulo wokusetshenziswa kwedatha"</string>
     <string name="data_usage_limit_dialog_title" msgid="3023111643632996097">"Ilinganisela ukusebenza kwedatha"</string>
-    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Uku <xliff:g id="NETWORKS">%1$s</xliff:g> xhumaniseka kwakho kwi-data kuyonqanyulwa uma ufika emkhawulweni obaluliwe. "\n\n"Njengoba ukusetshenziswa kwe-data kukalwa ngekhompyutha yakho yepeni, kanti nomgodla wakho ungabhekana nokusetshenziswa ngokwehlukile, kucabange ukusebenzisa umkhawulo olandelanayo."</string>
-    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Uku <xliff:g id="NETWORKS">%1$s</xliff:g> xhumaniseka kwakho kwi-data kuyonqanyulwa uma ufika emkhawulweni obaluliwe. "\n\n"Njengoba ukusetshenziswa kwe-data kukalwa ngocingo lwakho, kanti nomgodla wakho ungabhekana nokusetshenziswa ngokwehlukile, kucabange ukusebenzisa umkhawulo olandelanayo."</string>
+    <string name="data_usage_limit_dialog" product="tablet" msgid="6401600837858297985">"Ukuxhumaniseka kwakho ku<xliff:g id="NETWORKS">%1$s</xliff:g> wedatha kuyonqanyulwa uma ufika emkhawulweni obaluliwe. "\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngethebulethi yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, kucabange ukusebenzisa umkhawulo ngokonga."</string>
+    <string name="data_usage_limit_dialog" product="default" msgid="5996407024898469862">"Uku <xliff:g id="NETWORKS">%1$s</xliff:g> xhumaniseka kwakho kwidatha kuyonqanyulwa uma ufika emkhawulweni obaluliwe. "\n\n"Njengoba ukusetshenziswa kwedatha kukalwa ngefoni yakho, kanti nenkampani yakho yenethiwekhi ungabhekana nokusetshenziswa ngokwehlukile, kucabange ukusebenzisa umkhawulo olandelanayo."</string>
     <string name="data_usage_restrict_background_title" msgid="2201315502223035062">"Beka isivimbelo kwimininingo yemininingo egciniwe?"</string>
     <string name="data_usage_restrict_background" msgid="8313061232498519610">"Uma ubeka izivimbelo kwimininingo yeselula yangemuva. ezinye izinhlelo zokusebenza ezisebenzisa le nsizakalo angeke zisebenze ngaphandle uma uxhumeke kuhleloxhumano lwe-WiFi."</string>
     <string name="data_usage_sweep_warning" msgid="6387081852568846982"><font size="21">"<xliff:g id="NUMBER">^1</xliff:g>"</font>" "<font size="9">"<xliff:g id="UNIT">^2</xliff:g>"</font>\n<font size="12">"isexwayiso"</font></string>
diff --git a/tests/res/values-ko/strings.xml b/tests/res/values-ko/strings.xml
index 2fde7ac1e4d..f20f3d5ffb5 100644
--- a/tests/res/values-ko/strings.xml
+++ b/tests/res/values-ko/strings.xml
@@ -21,8 +21,8 @@
     <string name="stop_scan" msgid="527546916633745779">"검색 중지"</string>
     <string name="operator_hello" msgid="292208161864910159">"운영자님, 안녕하세요."</string>
     <string name="operator_settings_title" msgid="1410094511974808567">"운영자"</string>
-    <string name="operator_settings_summary" msgid="5916597343019392258">"선택한 활동을 시작하는 데 사용할 수 있는 운영자 판촉물"</string>
+    <string name="operator_settings_summary" msgid="5916597343019392258">"선택한 작업을 시작하는 데 사용할 수 있는 통신사 훅(hook)"</string>
     <string name="manufacturer_hello" msgid="7525744633645544137">"제조업자님, 안녕하세요."</string>
     <string name="manufacturer_settings_title" msgid="2503105049808838612">"제조업체"</string>
-    <string name="manufacturer_settings_summary" msgid="766746044826063472">"선택한 활동을 시작하는 데 사용할 수 있는 제조업체 판촉물"</string>
+    <string name="manufacturer_settings_summary" msgid="766746044826063472">"선택한 작업을 시작하는 데 사용할 수 있는 제조사 훅(hook)"</string>
 </resources>
diff --git a/tests/res/values-zu/strings.xml b/tests/res/values-zu/strings.xml
index ea50f26de0f..8b313198a6f 100644
--- a/tests/res/values-zu/strings.xml
+++ b/tests/res/values-zu/strings.xml
@@ -17,8 +17,8 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="discoverable" msgid="3169265480789026010">"Iyatholakala"</string>
-    <string name="start_scan" msgid="6035699220942169744">"Qala ukuthwebula"</string>
-    <string name="stop_scan" msgid="527546916633745779">"Misa ukuthwebula"</string>
+    <string name="start_scan" msgid="6035699220942169744">"Qala ukuskena"</string>
+    <string name="stop_scan" msgid="527546916633745779">"Misa ukuskena"</string>
     <string name="operator_hello" msgid="292208161864910159">"Sawubona Opheretha!"</string>
     <string name="operator_settings_title" msgid="1410094511974808567">"u-Opheretha"</string>
     <string name="operator_settings_summary" msgid="5916597343019392258">"Isihlanganisi so-opheretha esingasetshenziselwa ukuqalisa umsebenzi owuthandayo"</string>